svn commit: samba r17994 - in branches/SAMBA_3_0/source: libads nsswitch

[jra at samba.org]

Author: jra
Date: 2006-09-02 01:23:08 +0000 (Sat, 02 Sep 2006)
New Revision: 17994

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

Log:
Add debugs that showed me why my site code wasn't
working right. Don't update the server site when we
have a client one...
Jeremy.

Modified:
   branches/SAMBA_3_0/source/libads/kerberos.c
   branches/SAMBA_3_0/source/libads/ldap.c
   branches/SAMBA_3_0/source/nsswitch/winbindd_cm.c


Changeset:
Modified: branches/SAMBA_3_0/source/libads/kerberos.c
===================================================================
--- branches/SAMBA_3_0/source/libads/kerberos.c	2006-09-01 14:23:17 UTC (rev 17993)
+++ branches/SAMBA_3_0/source/libads/kerberos.c	2006-09-02 01:23:08 UTC (rev 17994)
@@ -484,6 +484,9 @@
 		return False;
 	}
 
+	DEBUG(10,("create_local_private_krb5_conf_for_domain: fname = %s, realm = %s, domain = %s\n",
+		fname, realm, domain ));
+
 	realm_upper = talloc_strdup(fname, realm);
 	strupper_m(realm_upper);
 

Modified: branches/SAMBA_3_0/source/libads/ldap.c
===================================================================
--- branches/SAMBA_3_0/source/libads/ldap.c	2006-09-01 14:23:17 UTC (rev 17993)
+++ branches/SAMBA_3_0/source/libads/ldap.c	2006-09-02 01:23:08 UTC (rev 17994)
@@ -124,14 +124,19 @@
 {
 	if (ads->config.server_site_name == NULL &&
 	    ads->config.client_site_name == NULL ) {
+		DEBUG(10,("ads_sitename_match: both null\n"));
 		return True;
 	}
 	if (ads->config.server_site_name &&
 	    ads->config.client_site_name &&
 	    strequal(ads->config.server_site_name,
 		     ads->config.client_site_name)) {
+		DEBUG(10,("ads_sitename_match: name %s match\n", ads->config.server_site_name));
 		return True;
 	}
+	DEBUG(10,("ads_sitename_match: no match %s %s\n",
+		ads->config.server_site_name ? ads->config.server_site_name : "NULL",
+		ads->config.client_site_name ? ads->config.client_site_name : "NULL"));
 	return False;
 }
 #endif
@@ -192,8 +197,8 @@
 			SMB_STRDUP(cldap_reply.server_site_name);
 	}
 	if (*cldap_reply.client_site_name) {
-		ads->config.server_site_name =
-			SMB_STRDUP(cldap_reply.server_site_name);
+		ads->config.client_site_name =
+			SMB_STRDUP(cldap_reply.client_site_name);
 	}
 		
 	ads->server.workgroup          = SMB_STRDUP(cldap_reply.netbios_domain);

Modified: branches/SAMBA_3_0/source/nsswitch/winbindd_cm.c
===================================================================
--- branches/SAMBA_3_0/source/nsswitch/winbindd_cm.c	2006-09-01 14:23:17 UTC (rev 17993)
+++ branches/SAMBA_3_0/source/nsswitch/winbindd_cm.c	2006-09-02 01:23:08 UTC (rev 17994)
@@ -606,6 +606,7 @@
 			fstrcpy(name, ads->config.ldap_server_name);
 			namecache_store(name, 0x20, 1, &ip_list);
 
+			DEBUG(10,("dcip_to_name: flags = 0x%x\n", (unsigned int)ads->config.flags));
 #ifdef HAVE_KRB5
 			if ((ads->config.flags & ADS_KDC) && ads_sitename_match(ads)) {
 				/* We're going to use this KDC for this realm/domain.