svn commit: samba r21098 - in branches: SAMBA_3_0/source/nsswitch SAMBA_3_0_24/source/nsswitch

[gd at samba.org]

Author: gd
Date: 2007-01-31 20:05:48 +0000 (Wed, 31 Jan 2007)
New Revision: 21098

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

Log:
When get_dc_name_via_netlogon() in get_dcs() fails to find a trusted DC
we may not just assume that we look for our own realm's dcs next.

Guenther


Modified:
   branches/SAMBA_3_0/source/nsswitch/winbindd_cm.c
   branches/SAMBA_3_0_24/source/nsswitch/winbindd_cm.c


Changeset:
Modified: branches/SAMBA_3_0/source/nsswitch/winbindd_cm.c
===================================================================
--- branches/SAMBA_3_0/source/nsswitch/winbindd_cm.c	2007-01-31 19:26:46 UTC (rev 21097)
+++ branches/SAMBA_3_0/source/nsswitch/winbindd_cm.c	2007-01-31 20:05:48 UTC (rev 21098)
@@ -1126,9 +1126,9 @@
 		   We deliberately don't care about the
 		   return here. */
 
-		get_dc_name(domain->name, lp_realm(), dcname, &ip);
+		get_dc_name(domain->name, domain->alt_name, dcname, &ip);
 
-		sitename = sitename_fetch(lp_realm());
+		sitename = sitename_fetch(domain->alt_name);
 		if (sitename) {
 
 			/* Do the site-specific AD dns lookup first. */

Modified: branches/SAMBA_3_0_24/source/nsswitch/winbindd_cm.c
===================================================================
--- branches/SAMBA_3_0_24/source/nsswitch/winbindd_cm.c	2007-01-31 19:26:46 UTC (rev 21097)
+++ branches/SAMBA_3_0_24/source/nsswitch/winbindd_cm.c	2007-01-31 20:05:48 UTC (rev 21098)
@@ -1117,9 +1117,9 @@
 		   We deliberately don't care about the
 		   return here. */
 
-		get_dc_name(domain->name, lp_realm(), dcname, &ip);
+		get_dc_name(domain->name, domain->alt_name, dcname, &ip);
 
-		sitename = sitename_fetch(lp_realm());
+		sitename = sitename_fetch(domain->alt_name);
 		if (sitename) {
 
 			/* Do the site-specific AD dns lookup first. */