summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGünther Deschner <gd@samba.org>2007-09-10 23:12:27 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:30:38 -0500
commit2569a25433779279327fde979065518604227fdc (patch)
tree2521c7f0fe14931170c972dee4204f5e8a8e273b
parentbd45eab008c79d944e44b6e93ee40572b9932ce0 (diff)
downloadsamba-2569a25433779279327fde979065518604227fdc.tar.gz
samba-2569a25433779279327fde979065518604227fdc.tar.bz2
samba-2569a25433779279327fde979065518604227fdc.zip
r25068: Older samba3 DCs will return DCERPC_FAULT_OP_RNG_ERROR for every opcode on the
LSARPC_DS pipe, continue with no_lsarpc_ds mode here as well to get domain->initialized set to True. This avoids permanent scanning of Samba3 DCs in winbindd. Thanks Michael, for pointing this out. Guenther (This used to be commit 9b85f7ca43896ddd40dd8cb4a52969e94914db43)
-rw-r--r--source3/nsswitch/winbindd_cm.c10
1 files changed, 10 insertions, 0 deletions
diff --git a/source3/nsswitch/winbindd_cm.c b/source3/nsswitch/winbindd_cm.c
index 28d8179cb6..1a9d2bbeff 100644
--- a/source3/nsswitch/winbindd_cm.c
+++ b/source3/nsswitch/winbindd_cm.c
@@ -1715,6 +1715,16 @@ static void set_dc_type_and_flags_connect( struct winbindd_domain *domain )
DEBUG(5, ("set_dc_type_and_flags_connect: rpccli_ds_getprimarydominfo "
"on domain %s failed: (%s)\n",
domain->name, nt_errstr(result)));
+
+ /* older samba3 DCs will return DCERPC_FAULT_OP_RNG_ERROR for
+ * every opcode on the LSARPC_DS pipe, continue with
+ * no_lsarpc_ds mode here as well to get domain->initialized
+ * set - gd */
+
+ if (NT_STATUS_V(result) == DCERPC_FAULT_OP_RNG_ERROR) {
+ goto no_lsarpc_ds;
+ }
+
return;
}