diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2010-05-17 19:04:31 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2010-08-14 11:58:13 +1000 |
| commit | 70211ea6a3517cb64f18fe7768078e7d51c51ca1 (patch) | |
| tree | 1173ab9a51b1813facb2b2bff5acea4fa7e07865 /source3/winbindd | |
| parent | b1b9752506e73766ec66c3c5d26797e9f0112527 (diff) | |
| download | samba-70211ea6a3517cb64f18fe7768078e7d51c51ca1.tar.gz samba-70211ea6a3517cb64f18fe7768078e7d51c51ca1.tar.bz2 samba-70211ea6a3517cb64f18fe7768078e7d51c51ca1.zip | |
s3:auth Change winbindd -> auth interface to more standard structures
This removes conversions to and from the source3 varient of the
server_info structure when replaced in s3compat, and presents a tidier
interface to winbindd in any case.
Andrew Bartlett
Signed-off-by: Andrew Tridgell <tridge@samba.org>
Diffstat (limited to 'source3/winbindd')
| -rw-r--r-- | source3/winbindd/winbindd_pam.c | 29 |
1 files changed, 5 insertions, 24 deletions
diff --git a/source3/winbindd/winbindd_pam.c b/source3/winbindd/winbindd_pam.c index e2c1d0d1b9..be3b2a5c77 100644 --- a/source3/winbindd/winbindd_pam.c +++ b/source3/winbindd/winbindd_pam.c @@ -1133,8 +1133,6 @@ static NTSTATUS winbindd_dual_auth_passdb(TALLOC_CTX *mem_ctx, struct netr_SamInfo3 **pinfo3) { struct auth_usersupplied_info *user_info = NULL; - struct auth_serversupplied_info *server_info = NULL; - struct netr_SamInfo3 *info3; NTSTATUS status; status = make_user_info(&user_info, user, user, domain, domain, @@ -1145,30 +1143,13 @@ static NTSTATUS winbindd_dual_auth_passdb(TALLOC_CTX *mem_ctx, return status; } - status = check_sam_security(challenge, talloc_tos(), user_info, - &server_info); - free_user_info(&user_info); - - if (!NT_STATUS_IS_OK(status)) { - DEBUG(10, ("check_ntlm_password failed: %s\n", - nt_errstr(status))); - return status; - } - - info3 = TALLOC_ZERO_P(mem_ctx, struct netr_SamInfo3); - if (info3 == NULL) { - return NT_STATUS_NO_MEMORY; - } - - status = serverinfo_to_SamInfo3(server_info, NULL, 0, info3); - if (!NT_STATUS_IS_OK(status)) { - DEBUG(10, ("serverinfo_to_SamInfo3 failed: %s\n", - nt_errstr(status))); - return status; - } + /* We don't want any more mapping of the username */ + user_info->mapped_state = True; + status = check_sam_security_info3(challenge, talloc_tos(), user_info, + pinfo3); + free_user_info(&user_info); DEBUG(10, ("Authenticated user %s\\%s successfully\n", domain, user)); - *pinfo3 = info3; return NT_STATUS_OK; } |