summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGünther Deschner <gd@samba.org>2011-01-24 20:45:35 +0100
committerGünther Deschner <gd@samba.org>2011-01-26 11:55:37 +0100
commit035a0d2fb36af2be655a19103bc3e01e036375a4 (patch)
treea3a5f2864e32db977ca1b0625c0a2cbd9f69c269
parent36cfa1792ed1d13268de792cb4df20d6743d1e55 (diff)
downloadsamba-035a0d2fb36af2be655a19103bc3e01e036375a4.tar.gz
samba-035a0d2fb36af2be655a19103bc3e01e036375a4.tar.bz2
samba-035a0d2fb36af2be655a19103bc3e01e036375a4.zip
Revert "s3: These assignments are overwritten immediately"
This reverts commit 18962ea3852d0d0fc7371e99813bebd54fae0a19.
-rw-r--r--source3/winbindd/winbindd_pam.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/source3/winbindd/winbindd_pam.c b/source3/winbindd/winbindd_pam.c
index cbdd8f3f06..c208b27b06 100644
--- a/source3/winbindd/winbindd_pam.c
+++ b/source3/winbindd/winbindd_pam.c
@@ -1263,6 +1263,7 @@ static NTSTATUS winbindd_dual_pam_auth_samlogon(struct winbindd_domain *domain,
DEBUG(3, ("Got a DC that can not do NetSamLogonEx, "
"retrying with NetSamLogon\n"));
domain->can_do_samlogon_ex = false;
+ retry = true;
continue;
}
@@ -1271,6 +1272,7 @@ static NTSTATUS winbindd_dual_pam_auth_samlogon(struct winbindd_domain *domain,
our connection. */
if (!rpccli_is_connected(netlogon_pipe)) {
+ retry = true;
continue;
}
@@ -1714,6 +1716,7 @@ enum winbindd_result winbindd_dual_pam_auth_crap(struct winbindd_domain *domain,
DEBUG(3, ("Got a DC that can not do NetSamLogonEx, "
"retrying with NetSamLogon\n"));
domain->can_do_samlogon_ex = false;
+ retry = true;
continue;
}
@@ -1724,6 +1727,7 @@ enum winbindd_result winbindd_dual_pam_auth_crap(struct winbindd_domain *domain,
our connection. */
if (!rpccli_is_connected(netlogon_pipe)) {
+ retry = true;
continue;
}