svn commit: samba r17942 - in branches/SAMBA_3_0/source/libads: .

[jra at samba.org]

Author: jra
Date: 2006-08-31 00:07:24 +0000 (Thu, 31 Aug 2006)
New Revision: 17942

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

Log:
Jerry is right - when no site support is enabled
the client sitename is "Default-First-Site-Name".
Treat this as a blank site (no site configured).
Jeremy.

Modified:
   branches/SAMBA_3_0/source/libads/dns.c


Changeset:
Modified: branches/SAMBA_3_0/source/libads/dns.c
===================================================================
--- branches/SAMBA_3_0/source/libads/dns.c	2006-08-30 23:56:40 UTC (rev 17941)
+++ branches/SAMBA_3_0/source/libads/dns.c	2006-08-31 00:07:24 UTC (rev 17942)
@@ -574,22 +574,27 @@
 /****************************************************************************
  Store the AD client sitename.
  We store indefinately as every new CLDAP query will re-write this.
+ If the sitename is "Default-First-Site-Name" we don't store it
+ as this isn't a valid DNS name.
 ****************************************************************************/
 
 BOOL sitename_store(const char *sitename)
 {
 	time_t expire;
 	BOOL ret = False;
-	
-	if ( !sitename || (sitename && !*sitename)) {
-		DEBUG(2,("sitename_store: deleting empty sitename!\n"));
-		return gencache_del(SITENAME_KEY);
-	}
-	
+
 	if (!gencache_init()) {
 		return False;
 	}
 	
+	if (!sitename || (sitename && !*sitename)) {
+		DEBUG(5,("sitename_store: deleting empty sitename!\n"));
+		return gencache_del(SITENAME_KEY);
+	} else if (sitename && strequal(sitename, "Default-First-Site-Name")) {
+		DEBUG(5,("sitename_store: delete default sitename Default-First-Site-Name\n"));
+		return gencache_del(SITENAME_KEY);
+	}
+
 	expire = get_time_t_max(); /* Store indefinately. */
 	
 	DEBUG(10,("sitename_store: sitename = [%s], expire = [%u]\n",