Changeset 745 for trunk/server/source3/auth/auth_winbind.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_winbind.c (modified) (10 diffs)

trunk/server/source3/auth/auth_winbind.c

@@ -6 +6 @@
    Copyright (C) Tim Potter 2000
    Copyright (C) Andrew Bartlett 2001 - 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/>.
@@ -22 +22 @@
 
 #include "includes.h"
+#include "auth.h"
+#include "nsswitch/libwbclient/wbclient.h"
 
 #undef DBGC_CLASS
@@ -31 +33 @@
                                        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;
@@ -40 +42 @@
         struct wbcAuthErrorInfo *err = NULL;
 
+        ZERO_STRUCT(params);
+
         if (!user_info) {
                 return NT_STATUS_INVALID_PARAMETER;
         }
 
+        DEBUG(10, ("Check auth for: [%s]\n", user_info->mapped.account_name));
+
         if (!auth_context) {
                 DEBUG(3,("Password for user %s cannot be checked because we have no auth_info to get the challenge from.\n", 
-                         user_info->internal_username));
+                         user_info->mapped.account_name));
                 return NT_STATUS_INVALID_PARAMETER;
         }               
 
-        if (strequal(user_info->domain, get_global_sam_name())) {
+        if (strequal(user_info->mapped.domain_name, get_global_sam_name())) {
                 DEBUG(3,("check_winbind_security: Not using winbind, requested domain [%s] was for this SAM.\n",
-                        user_info->domain));
+                        user_info->mapped.domain_name));
                 return NT_STATUS_NOT_IMPLEMENTED;
         }
@@ -58 +64 @@
         /* Send off request */
 
-        params.account_name     = user_info->smb_name;
-        params.domain_name      = user_info->domain;
-        params.workstation_name = user_info->wksta_name;
+        params.account_name     = user_info->client.account_name;
+        params.domain_name      = user_info->mapped.domain_name;
+        params.workstation_name = user_info->workstation_name;
 
         params.flags            = 0;
@@ -71 +77 @@
                sizeof(params.password.response.challenge));
 
-        params.password.response.nt_length      = user_info->nt_resp.length;
-        params.password.response.nt_data        = user_info->nt_resp.data;
-        params.password.response.lm_length      = user_info->lm_resp.length;
-        params.password.response.lm_data        = user_info->lm_resp.data;
+        if (user_info->password.response.nt.length != 0) {
+                params.password.response.nt_length =
+                        user_info->password.response.nt.length;
+                params.password.response.nt_data =
+                        user_info->password.response.nt.data;
+        }
+        if (user_info->password.response.lanman.length != 0) {
+                params.password.response.lm_length =
+                        user_info->password.response.lanman.length;
+                params.password.response.lm_data =
+                        user_info->password.response.lanman.data;
+        }
 
         /* we are contacting the privileged pipe */
@@ -97 +111 @@
                         return auth_method->auth(auth_context, auth_method->private_data, 
                                 mem_ctx, user_info, server_info);
-                else
-                        /* log an error since this should not happen */
-                        DEBUG(0,("check_winbind_security: ERROR!  my_private_data == NULL!\n"));
+                return NT_STATUS_LOGON_FAILURE;
         }
 
@@ -113 +125 @@
 
         nt_status = make_server_info_wbcAuthUserInfo(mem_ctx,
-                                                     user_info->smb_name,
-                                                     user_info->domain,
+                                                     user_info->client.account_name,
+                                                     user_info->mapped.domain_name,
                                                      info, server_info);
         wbcFreeMemory(info);
@@ -129 +141 @@
 static NTSTATUS auth_init_winbind(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 = "winbind";
-        (*auth_method)->auth = check_winbind_security;
+        result->name = "winbind";
+        result->auth = check_winbind_security;
 
         if (param && *param) {
@@ -143 +157 @@
                         return NT_STATUS_UNSUCCESSFUL;
                 }
-                (*auth_method)->private_data = (void *)priv;
+                result->private_data = (void *)priv;
         }
+
+        *auth_method = result;
         return NT_STATUS_OK;
 }