diff options
| author | Günther Deschner <gd@samba.org> | 2014-07-15 08:29:55 +0200 |
|---|---|---|
| committer | Günther Deschner <gd@samba.org> | 2014-07-15 16:00:40 +0200 |
| commit | c735823f68ab3e0553e982ac3e5e90a7cc43db16 (patch) | |
| tree | aeafff045eccfee926f8a2d40e025c51f0809e67 | |
| parent | b722167b2c7435dbd14684261002522808eb7aaf (diff) | |
| download | samba-c735823f68ab3e0553e982ac3e5e90a7cc43db16.tar.gz samba-c735823f68ab3e0553e982ac3e5e90a7cc43db16.tar.xz samba-c735823f68ab3e0553e982ac3e5e90a7cc43db16.zip | |
s3-winbindd: call interactive samlogon via rpccli_netlogon_password_logon.
Guenther
Signed-off-by: Guenther Deschner <gd@samba.org>
Pair-Programmed-With: Andreas Schneider <asn@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
| -rw-r--r-- | source3/winbindd/winbindd_pam.c | 45 |
1 files changed, 32 insertions, 13 deletions
diff --git a/source3/winbindd/winbindd_pam.c b/source3/winbindd/winbindd_pam.c index 8387bdc758..1fb7e3c35f 100644 --- a/source3/winbindd/winbindd_pam.c +++ b/source3/winbindd/winbindd_pam.c @@ -1292,11 +1292,13 @@ static NTSTATUS winbind_samlogon_retry_loop(struct winbindd_domain *domain, uint32_t logon_parameters, const char *server, const char *username, + const char *password, const char *domainname, const char *workstation, const uint8_t chal[8], DATA_BLOB lm_response, DATA_BLOB nt_response, + bool interactive, struct netr_SamInfo3 **info3) { int attempts = 0; @@ -1356,19 +1358,32 @@ static NTSTATUS winbind_samlogon_retry_loop(struct winbindd_domain *domain, } netr_attempts = 0; - result = rpccli_netlogon_network_logon(domain->conn.netlogon_creds, - netlogon_pipe->binding_handle, - mem_ctx, - logon_parameters, - username, - domainname, - workstation, - chal, - lm_response, - nt_response, - &authoritative, - &flags, - info3); + if (interactive && username != NULL && password != NULL) { + result = rpccli_netlogon_password_logon(domain->conn.netlogon_creds, + netlogon_pipe->binding_handle, + mem_ctx, + logon_parameters, + domainname, + username, + password, + workstation, + NetlogonInteractiveInformation, + info3); + } else { + result = rpccli_netlogon_network_logon(domain->conn.netlogon_creds, + netlogon_pipe->binding_handle, + mem_ctx, + logon_parameters, + username, + domainname, + workstation, + chal, + lm_response, + nt_response, + &authoritative, + &flags, + info3); + } /* * we increment this after the "feature negotiation" @@ -1517,11 +1532,13 @@ static NTSTATUS winbindd_dual_pam_auth_samlogon(TALLOC_CTX *mem_ctx, 0, domain->dcname, name_user, + pass, name_domain, lp_netbios_name(), chal, lm_resp, nt_resp, + true, /* interactive */ &my_info3); if (!NT_STATUS_IS_OK(result)) { goto done; @@ -1908,12 +1925,14 @@ NTSTATUS winbind_dual_SamLogon(struct winbindd_domain *domain, logon_parameters, domain->dcname, name_user, + NULL, /* password */ name_domain, /* Bug #3248 - found by Stefan Burkei. */ workstation, /* We carefully set this above so use it... */ chal, lm_response, nt_response, + false, /* interactive */ info3); if (!NT_STATUS_IS_OK(result)) { goto done; |