Changeset 732 for branches/samba-3.5.x/source3/winbindd/winbindd_pam.c

Timestamp:

Nov 12, 2012, 4:35:55 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server 3.5: update branche to 3.5.12

File:

• branches/samba-3.5.x/source3/winbindd/winbindd_pam.c (modified) (4 diffs)

branches/samba-3.5.x/source3/winbindd/winbindd_pam.c

@@ -1383 +1383 @@
                                   &my_info3);
 
-                if ((NT_STATUS_V(result) == DCERPC_FAULT_OP_RNG_ERROR)
-                    && contact_domain->can_do_samlogon_ex) {
-                        DEBUG(3, ("Got a DC that can not do NetSamLogonEx, "
-                                  "retrying with NetSamLogon\n"));
-                        contact_domain->can_do_samlogon_ex = false;
+                if (NT_STATUS_V(result) == DCERPC_FAULT_OP_RNG_ERROR) {
+
                         /*
                          * It's likely that the server also does not support
@@ -1393 +1390 @@
                          */
                         domain->can_do_validation6 = false;
-                        retry = true;
-                        continue;
+
+                        if (contact_domain->can_do_samlogon_ex) {
+                                DEBUG(3, ("Got a DC that can not do NetSamLogonEx, "
+                                          "retrying with NetSamLogon\n"));
+                                contact_domain->can_do_samlogon_ex = false;
+                                retry = true;
+                                continue;
+                        }
+
+                        /* Got DCERPC_FAULT_OP_RNG_ERROR for SamLogon
+                         * (no Ex). This happens against old Samba
+                         * DCs. Drop the connection.
+                         */
+                        invalidate_cm_connection(&contact_domain->conn);
+                        result = NT_STATUS_LOGON_FAILURE;
+                        break;
                 }
 
@@ -1997 +2008 @@
                                   &info3);
 
-                if ((NT_STATUS_V(result) == DCERPC_FAULT_OP_RNG_ERROR)
-                    && contact_domain->can_do_samlogon_ex) {
-                        DEBUG(3, ("Got a DC that can not do NetSamLogonEx, "
-                                  "retrying with NetSamLogon\n"));
-                        contact_domain->can_do_samlogon_ex = false;
+                if (NT_STATUS_V(result) == DCERPC_FAULT_OP_RNG_ERROR) {
+
                         /*
                          * It's likely that the server also does not support
@@ -2007 +2015 @@
                          */
                         domain->can_do_validation6 = false;
-                        retry = true;
-                        continue;
+
+                        if (contact_domain->can_do_samlogon_ex) {
+                                DEBUG(3, ("Got a DC that can not do NetSamLogonEx, "
+                                          "retrying with NetSamLogon\n"));
+                                contact_domain->can_do_samlogon_ex = false;
+                                retry = true;
+                                continue;
+                        }
+
+                        /* Got DCERPC_FAULT_OP_RNG_ERROR for SamLogon
+                         * (no Ex). This happens against old Samba
+                         * DCs. Drop the connection.
+                         */
+                        invalidate_cm_connection(&contact_domain->conn);
+                        result = NT_STATUS_LOGON_FAILURE;
+                        break;
                 }