Revert "s3: These assignments are overwritten immediately"

This reverts commit 18962ea3852d0d0fc7371e99813bebd54fae0a19.

diff --git a/source3/winbindd/winbindd_pam.c b/source3/winbindd/winbindd_pam.c
index cbdd8f3f067acbad13c1a30e0a972e6a101073bf..c208b27b064c5a2695974aefec70c2d86c299099 100644 (file)
--- 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;
                }