svn commit: samba r25072 - in branches/SAMBA_3_0_MAINT/source/nsswitch: .

[gd at samba.org]

Author: gd
Date: 2007-09-11 00:26:46 +0000 (Tue, 11 Sep 2007)
New Revision: 25072

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=25072

Log:
Merge to 3_0_MAINT.

Guenther

Modified:
   branches/SAMBA_3_0_MAINT/source/nsswitch/winbindd_cm.c


Changeset:
Modified: branches/SAMBA_3_0_MAINT/source/nsswitch/winbindd_cm.c
===================================================================
--- branches/SAMBA_3_0_MAINT/source/nsswitch/winbindd_cm.c	2007-09-11 00:19:10 UTC (rev 25071)
+++ branches/SAMBA_3_0_MAINT/source/nsswitch/winbindd_cm.c	2007-09-11 00:26:46 UTC (rev 25072)
@@ -1558,6 +1558,16 @@
 		DEBUG(5, ("set_dc_type_and_flags: 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;
 	}