Revert "s4-smbtorture: only pull info when status code indicates success in smbcli_ra...

[kamenim/samba.git] / source3 / auth / auth_winbind.c

diff --git a/source3/auth/auth_winbind.c b/source3/auth/auth_winbind.c
index d1b00a32686495447c5fa0bb635ea15d32a886d8..beaba7d4c0ff071ae318f2f94a34b3dcfb475c94 100644 (file)
--- a/source3/auth/auth_winbind.c
+++ b/source3/auth/auth_winbind.c
@@ -5,17 +5,17 @@
 
    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/>.
 */
@@ -30,8 +30,8 @@
 static NTSTATUS check_winbind_security(const struct auth_context *auth_context,
                                       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;
        wbcErr wbc_status;
@@ -43,23 +43,25 @@ static NTSTATUS check_winbind_security(const struct auth_context *auth_context,
                return NT_STATUS_INVALID_PARAMETER;
        }
 
+       DEBUG(10, ("Check auth for: [%s]", 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;
        }
 
        /* 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;
        params.parameter_control= user_info->logon_parameters;
@@ -112,8 +114,8 @@ static NTSTATUS check_winbind_security(const struct auth_context *auth_context,
        }
 
        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);
        if (!NT_STATUS_IS_OK(nt_status)) {
@@ -128,12 +130,14 @@ static NTSTATUS check_winbind_security(const struct auth_context *auth_context,
 /* module initialisation */
 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) {
                /* we load the 'fallback' module - if winbind isn't here, call this
@@ -142,8 +146,10 @@ static NTSTATUS auth_init_winbind(struct auth_context *auth_context, const char
                if (!load_auth_module(auth_context, param, &priv)) {
                        return NT_STATUS_UNSUCCESSFUL;
                }
-               (*auth_method)->private_data = (void *)priv;
+               result->private_data = (void *)priv;
        }
+
+       *auth_method = result;
        return NT_STATUS_OK;
 }