svn commit: samba r21636 - in branches: SAMBA_3_0/source/nsswitch SAMBA_3_0_25/source/nsswitch

[jerry at samba.org]

Author: jerry
Date: 2007-03-01 19:22:31 +0000 (Thu, 01 Mar 2007)
New Revision: 21636

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

Log:
Was almost right before.  We have to specify the short domain name to get the 
Krb5 config stuff to work in the server affinity settings.


Modified:
   branches/SAMBA_3_0/source/nsswitch/winbindd_ads.c
   branches/SAMBA_3_0_25/source/nsswitch/winbindd_ads.c


Changeset:
Modified: branches/SAMBA_3_0/source/nsswitch/winbindd_ads.c
===================================================================
--- branches/SAMBA_3_0/source/nsswitch/winbindd_ads.c	2007-03-01 18:48:52 UTC (rev 21635)
+++ branches/SAMBA_3_0/source/nsswitch/winbindd_ads.c	2007-03-01 19:22:31 UTC (rev 21636)
@@ -120,7 +120,7 @@
 	   about the name.  Just setup affinity and the KRB5_CONFIG 
 	   file. */
 
-	get_dc_name( "", ads->auth.realm, dc_name, &dc_ip );
+	get_dc_name( ads->server.workgroup, ads->server.realm, dc_name, &dc_ip );
 	
 	status = ads_connect(ads);
 	if (!ADS_ERR_OK(status) || !ads->config.realm) {

Modified: branches/SAMBA_3_0_25/source/nsswitch/winbindd_ads.c
===================================================================
--- branches/SAMBA_3_0_25/source/nsswitch/winbindd_ads.c	2007-03-01 18:48:52 UTC (rev 21635)
+++ branches/SAMBA_3_0_25/source/nsswitch/winbindd_ads.c	2007-03-01 19:22:31 UTC (rev 21636)
@@ -120,7 +120,7 @@
 	   about the name.  Just setup affinity and the KRB5_CONFIG 
 	   file. */
 
-	get_dc_name( "", ads->auth.realm, dc_name, &dc_ip );
+	get_dc_name( ads->server.workgroup, ads->server.realm, dc_name, &dc_ip );
 	
 	status = ads_connect(ads);
 	if (!ADS_ERR_OK(status) || !ads->config.realm) {