Changeset 596 for trunk/server/source3/winbindd/winbindd_rpc.c

Timestamp:

Jul 2, 2011, 3:35:33 PM (14 years ago)

Author:

Herwig Bauernfeind

Message:

Samba 3.5: Update trunk to 3.5.8

File:

• trunk/server/source3/winbindd/winbindd_rpc.c (modified) (3 diffs)

trunk/server/source3/winbindd/winbindd_rpc.c

@@ -85 +85 @@
                                                       &returned_size,
                                                       &disp_info);
+
+                if (!NT_STATUS_IS_OK(result)) {
+                        if (!NT_STATUS_EQUAL(result, STATUS_MORE_ENTRIES)) {
+                                return result;
+                        }
+                }
+
                 num_dom_users = disp_info.info1.count;
                 start_idx += disp_info.info1.count;
@@ -1231 +1238 @@
         rpccli_set_timeout(cli, orig_timeout);
 
+        if (NT_STATUS_V(status) == DCERPC_FAULT_ACCESS_DENIED ||
+            NT_STATUS_V(status) == DCERPC_FAULT_SEC_PKG_ERROR) {
+                /*
+                 * This can happen if the schannel key is not
+                 * valid anymore, we need to invalidate the
+                 * all connections to the dc and reestablish
+                 * a netlogon connection first.
+                 */
+                invalidate_cm_connection(&domain->conn);
+                status = NT_STATUS_ACCESS_DENIED;
+        }
+
         if (!NT_STATUS_IS_OK(status)) {
                 return status;
@@ -1297 +1316 @@
         /* And restore our original timeout. */
         rpccli_set_timeout(cli, orig_timeout);
+
+        if (NT_STATUS_V(status) == DCERPC_FAULT_ACCESS_DENIED ||
+            NT_STATUS_V(status) == DCERPC_FAULT_SEC_PKG_ERROR) {
+                /*
+                 * This can happen if the schannel key is not
+                 * valid anymore, we need to invalidate the
+                 * all connections to the dc and reestablish
+                 * a netlogon connection first.
+                 */
+                invalidate_cm_connection(&domain->conn);
+                status = NT_STATUS_ACCESS_DENIED;
+        }
 
         if (!NT_STATUS_IS_OK(status)) {