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 68509e434266cab9d2e7e49bfd870a047b2d0076..beaba7d4c0ff071ae318f2f94a34b3dcfb475c94 100644 (file)
--- a/source3/auth/auth_winbind.c
+++ b/source3/auth/auth_winbind.c
@@ -43,25 +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->internal_username));
+       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;
@@ -114,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)) {