Changeset 745 for trunk/server/source3/auth/auth_builtin.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_builtin.c (modified) (9 diffs)

trunk/server/source3/auth/auth_builtin.c

@@ -4 +4 @@
    Copyright (C) Andrew Bartlett         2001-2002
    Copyright (C) Jelmer Vernooij              2002
-   
+
    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/>.
@@ -20 +20 @@
 
 #include "includes.h"
+#include "auth.h"
 
 #undef DBGC_CLASS
@@ -35 +36 @@
                                      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)
 {
         /* mark this as 'not for me' */
         NTSTATUS nt_status = NT_STATUS_NOT_IMPLEMENTED;
 
-        if (!(user_info->internal_username 
-              && *user_info->internal_username)) {
+        DEBUG(10, ("Check auth for: [%s]\n", user_info->mapped.account_name));
+
+        if (!(user_info->mapped.account_name
+              && *user_info->mapped.account_name)) {
                 nt_status = make_server_info_guest(NULL, server_info);
         }
@@ -53 +56 @@
 static NTSTATUS auth_init_guest(struct auth_context *auth_context, const char *options, 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;
+        }
+        result->auth = check_guest_security;
+        result->name = "guest";
 
-        (*auth_method)->auth = check_guest_security;
-        (*auth_method)->name = "guest";
+        *auth_method = result;
         return NT_STATUS_OK;
 }
@@ -78 +86 @@
                                                 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)
 {
         NTSTATUS nt_status;
         fstring user;
         long error_num;
-        fstrcpy(user, user_info->smb_name);
-        
+
+        DEBUG(10, ("Check auth for: [%s]\n", user_info->mapped.account_name));
+
+        fstrcpy(user, user_info->client.account_name);
+
         if (strnequal("NT_STATUS", user, strlen("NT_STATUS"))) {
                 strupper_m(user);
@@ -93 +104 @@
         strlower_m(user);
         error_num = strtoul(user, NULL, 16);
-        
+
         DEBUG(5,("check_name_to_ntstatus_security: Error for user %s was %lx\n", user, error_num));
 
         nt_status = NT_STATUS(error_num);
-        
+
         return nt_status;
 }
@@ -105 +116 @@
 static NTSTATUS auth_init_name_to_ntstatus(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;
+        }
+        result->auth = check_name_to_ntstatus_security;
+        result->name = "name_to_ntstatus";
 
-        (*auth_method)->auth = check_name_to_ntstatus_security;
-        (*auth_method)->name = "name_to_ntstatus";
+        *auth_method = result;
         return NT_STATUS_OK;
 }
@@ -131 +147 @@
                                                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)
 {
         return NT_STATUS_NOT_IMPLEMENTED;
@@ -150 +166 @@
 
 
-/** Module initailisation function */
+/** Module initialisation function */
 
 static NTSTATUS auth_init_fixed_challenge(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;
+        }
+        result->auth = check_fixed_challenge_security;
+        result->get_chal = auth_get_fixed_challenge;
+        result->name = "fixed_challenge";
 
-        (*auth_method)->auth = check_fixed_challenge_security;
-        (*auth_method)->get_chal = auth_get_fixed_challenge;
-        (*auth_method)->name = "fixed_challenge";
+        *auth_method = result;
         return NT_STATUS_OK;
 }