svn commit: samba r2108 - in trunk/source/nsswitch: .

[vlendec at samba.org]

Author: vlendec
Date: 2004-08-30 17:05:51 +0000 (Mon, 30 Aug 2004)
New Revision: 2108

WebSVN: http://websvn.samba.org/websvn/changeset.php?rep=samba&path=/trunk/source/nsswitch&rev=2108&nolog=1

Log:
Partial bugfix: When no nmbd is around, directly fall back to the old nbtstat
method of finding a DC's name.

There is another bug however (to be fixed later): When no reply comes back,
the ip addresses have been wiped out. So no nbtstat packet will reach its
destination.

Volker


Modified:
   trunk/source/nsswitch/winbindd_cm.c


Changeset:
Modified: trunk/source/nsswitch/winbindd_cm.c
===================================================================
--- trunk/source/nsswitch/winbindd_cm.c	2004-08-30 13:05:03 UTC (rev 2107)
+++ trunk/source/nsswitch/winbindd_cm.c	2004-08-30 17:05:51 UTC (rev 2108)
@@ -598,8 +598,13 @@
 				   lp_name_resolve_order()))
 		return False;
 
-	for (i=0; i<num; i++)
-		send_getdc_request(iplist[i].ip, domain->name, &domain->sid);
+	for (i=0; i<num; i++) {
+		if (!send_getdc_request(iplist[i].ip, domain->name,
+					&domain->sid)) {
+			DEBUG(10, ("Defaulting to nbtstat method\n"));
+			goto nbtstat;
+		}
+	}
 
 	for (i=0; i<5; i++) {
 		int j;
@@ -633,6 +638,8 @@
 	if (*num_dcs > 0)
 		return True;
 
+ nbtstat:
+
 	/* Fall back to the old method with the name status request */
 
 	for (i=0; i<num; i++) {