Changeset 745 for trunk/server/source3/auth/auth_script.c

Timestamp:

Nov 27, 2012, 4:43:17 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: updated trunk to 3.6.0

Location:

trunk/server

Files:

• . (modified) (1 prop)
• source3/auth/auth_script.c (modified) (10 diffs)

trunk/server/source3/auth/auth_script.c

@@ -5 +5 @@
 
    Copyright (C) Jeremy Allison 2005.
-   
+
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
-   
+
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
-   
+
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
@@ -21 +21 @@
 
 #include "includes.h"
+#include "auth.h"
 
 #undef malloc
@@ -41 +42 @@
                                         void *my_private_data, 
                                         TALLOC_CTX *mem_ctx,
-                                        const auth_usersupplied_info *user_info, 
-                                        auth_serversupplied_info **server_info)
+                                        const struct auth_usersupplied_info *user_info,
+                                        struct auth_serversupplied_info **server_info)
 {
         const char *script = lp_parm_const_string( GLOBAL_SECTION_SNUM, "auth_script", "script", NULL);
@@ -63 +64 @@
         }               
 
-        secret_str_len = strlen(user_info->domain) + 1 +
-                        strlen(user_info->smb_name) + 1 +
+        secret_str_len = strlen(user_info->mapped.domain_name) + 1 +
+                        strlen(user_info->client.account_name) + 1 +
                         16 + 1 + /* 8 bytes of challenge going to 16 */
                         48 + 1 + /* 24 bytes of challenge going to 48 */
@@ -74 +75 @@
         }
 
-        safe_strcpy( secret_str, user_info->domain, secret_str_len - 1);
+        safe_strcpy( secret_str, user_info->mapped.domain_name, secret_str_len - 1);
         safe_strcat( secret_str, "\n", secret_str_len - 1);
-        safe_strcat( secret_str, user_info->smb_name, secret_str_len - 1);
+        safe_strcat( secret_str, user_info->client.account_name, secret_str_len - 1);
         safe_strcat( secret_str, "\n", secret_str_len - 1);
 
@@ -85 +86 @@
         safe_strcat( secret_str, "\n", secret_str_len - 1);
 
-        if (user_info->lm_resp.data) {
+        if (user_info->password.response.lanman.data) {
                 for (i = 0; i < 24; i++) {
-                        slprintf(&hex_str[i*2], 3, "%02X", user_info->lm_resp.data[i]);
+                        slprintf(&hex_str[i*2], 3, "%02X", user_info->password.response.lanman.data[i]);
                 }
                 safe_strcat( secret_str, hex_str, secret_str_len - 1);
@@ -93 +94 @@
         safe_strcat( secret_str, "\n", secret_str_len - 1);
 
-        if (user_info->nt_resp.data) {
+        if (user_info->password.response.nt.data) {
                 for (i = 0; i < 24; i++) {
-                        slprintf(&hex_str[i*2], 3, "%02X", user_info->nt_resp.data[i]);
+                        slprintf(&hex_str[i*2], 3, "%02X", user_info->password.response.nt.data[i]);
                 }
                 safe_strcat( secret_str, hex_str, secret_str_len - 1);
@@ -110 +111 @@
         if (ret) {
                 DEBUG(1,("script_check_user_credentials: failed to authenticate %s\\%s\n",
-                        user_info->domain, user_info->smb_name ));
+                        user_info->mapped.domain_name, user_info->client.account_name ));
                 /* auth failed. */
                 return NT_STATUS_NO_SUCH_USER;
@@ -122 +123 @@
 static NTSTATUS auth_init_script(struct auth_context *auth_context, const char *param, auth_methods **auth_method) 
 {
-        if (!make_auth_methods(auth_context, auth_method)) {
+        struct auth_methods *result;
+
+        result = TALLOC_ZERO_P(auth_context, struct auth_methods);
+        if (result == NULL) {
                 return NT_STATUS_NO_MEMORY;
         }
-
-        (*auth_method)->name = "script";
-        (*auth_method)->auth = script_check_user_credentials;
+        result->name = "script";
+        result->auth = script_check_user_credentials;
 
         if (param && *param) {
@@ -136 +139 @@
                         return NT_STATUS_UNSUCCESSFUL;
                 }
-                (*auth_method)->private_data = (void *)priv;
+                result->private_data = (void *)priv;
         }
+
+        *auth_method = result;
         return NT_STATUS_OK;
 }