diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2012-02-03 17:09:37 +1100 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2012-03-08 10:14:05 +0100 |
| commit | 50547a9950062311a4952846960b15e1d6cdfdf5 (patch) | |
| tree | 9ea17788d4f7fed7df3dc6d32fe6ddd8ecf599e5 /source3/auth | |
| parent | 79753ec02c8315a55557c418f3a802fd2631878f (diff) | |
| download | samba-50547a9950062311a4952846960b15e1d6cdfdf5.tar.gz samba-50547a9950062311a4952846960b15e1d6cdfdf5.tar.bz2 samba-50547a9950062311a4952846960b15e1d6cdfdf5.zip | |
s3-auth: Follow auth_ntlmssp and use auth4_context for Session Setup
This patch ensures consistency in behaviour between NTLMSSP and NTLM
session setup handlers. By calling the same layer that auth_ntlmssp
calls, we can not only allow redirection of all authentication to the
AD DC, we ensure that map to guest and username map handling is
consistent, even in the file server alone.
Andrew Bartlett
Diffstat (limited to 'source3/auth')
| -rw-r--r-- | source3/auth/auth_util.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/source3/auth/auth_util.c b/source3/auth/auth_util.c index 06aa9c5108..21a8642751 100644 --- a/source3/auth/auth_util.c +++ b/source3/auth/auth_util.c @@ -347,8 +347,8 @@ bool make_user_info_for_reply(struct auth_usersupplied_info **user_info, return false; } - ret = make_user_info_map( - user_info, smb_name, client_domain, + ret = make_user_info( + user_info, smb_name, smb_name, client_domain, client_domain, get_remote_machine_name(), remote_address, local_lm_blob.data ? &local_lm_blob : NULL, @@ -376,14 +376,14 @@ NTSTATUS make_user_info_for_reply_enc(struct auth_usersupplied_info **user_info, const struct tsocket_address *remote_address, DATA_BLOB lm_resp, DATA_BLOB nt_resp) { - return make_user_info_map(user_info, smb_name, - client_domain, - get_remote_machine_name(), - remote_address, - lm_resp.data && (lm_resp.length > 0) ? &lm_resp : NULL, - nt_resp.data && (nt_resp.length > 0) ? &nt_resp : NULL, - NULL, NULL, NULL, - AUTH_PASSWORD_RESPONSE); + return make_user_info(user_info, smb_name, smb_name, + client_domain, client_domain, + get_remote_machine_name(), + remote_address, + lm_resp.data && (lm_resp.length > 0) ? &lm_resp : NULL, + nt_resp.data && (nt_resp.length > 0) ? &nt_resp : NULL, + NULL, NULL, NULL, + AUTH_PASSWORD_RESPONSE); } /**************************************************************************** |