summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2015-06-24 11:46:33 +0200
committerKarolin Seeger <kseeger@samba.org>2015-06-30 02:06:28 +0200
commit81dde5e1e3692b86d04084f1a5ca9c842172f7d3 (patch)
tree9920f0f9a9ad0930d0c0612be8e5ba416fa2c3d2
parente700e9d4312a77066b344a763b2f05be7190e257 (diff)
downloadsamba-81dde5e1e3692b86d04084f1a5ca9c842172f7d3.tar.gz
s3:winbindd: make sure we pass a valid server to rpccli_netlogon_sam_network_logon*()
BUG: https://bugzilla.samba.org/show_bug.cgi?id=11081 Signed-off-by: Stefan Metzmacher <metze@samba.org>
-rw-r--r--source3/winbindd/winbindd_pam.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/source3/winbindd/winbindd_pam.c b/source3/winbindd/winbindd_pam.c
index c356686488a..10d30d26831 100644
--- a/source3/winbindd/winbindd_pam.c
+++ b/source3/winbindd/winbindd_pam.c
@@ -1212,7 +1212,6 @@ static NTSTATUS winbindd_dual_auth_passdb(TALLOC_CTX *mem_ctx,
static NTSTATUS winbind_samlogon_retry_loop(struct winbindd_domain *domain,
TALLOC_CTX *mem_ctx,
uint32_t logon_parameters,
- const char *server,
const char *username,
const char *domainname,
const char *workstation,
@@ -1336,7 +1335,7 @@ static NTSTATUS winbind_samlogon_retry_loop(struct winbindd_domain *domain,
netlogon_pipe,
mem_ctx,
logon_parameters,
- server, /* server name */
+ domain->dcname, /* server name */
username, /* user name */
domainname, /* target domain */
workstation, /* workstation */
@@ -1350,7 +1349,7 @@ static NTSTATUS winbind_samlogon_retry_loop(struct winbindd_domain *domain,
netlogon_pipe,
mem_ctx,
logon_parameters,
- server, /* server name */
+ domain->dcname, /* server name */
username, /* user name */
domainname, /* target domain */
workstation, /* workstation */
@@ -1513,7 +1512,6 @@ static NTSTATUS winbindd_dual_pam_auth_samlogon(TALLOC_CTX *mem_ctx,
result = winbind_samlogon_retry_loop(domain,
mem_ctx,
0,
- domain->dcname,
name_user,
name_domain,
lp_netbios_name(),
@@ -1936,7 +1934,6 @@ enum winbindd_result winbindd_dual_pam_auth_crap(struct winbindd_domain *domain,
result = winbind_samlogon_retry_loop(domain,
state->mem_ctx,
state->request->data.auth_crap.logon_parameters,
- domain->dcname,
name_user,
name_domain,
/* Bug #3248 - found by Stefan Burkei. */