svn commit: samba r17970 - in branches/SAMBA_3_0/source: include libads

[jra at samba.org]

Author: jra
Date: 2006-08-31 16:26:32 +0000 (Thu, 31 Aug 2006)
New Revision: 17970

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

Log:
Add missing include-guards around ads.h and ads_cldap.h.
Remove all reference to "Default-First-Site-Name" and
treat it like any other site.
Jeremy.

Modified:
   branches/SAMBA_3_0/source/include/ads.h
   branches/SAMBA_3_0/source/include/ads_cldap.h
   branches/SAMBA_3_0/source/libads/dns.c


Changeset:
Modified: branches/SAMBA_3_0/source/include/ads.h
===================================================================
--- branches/SAMBA_3_0/source/include/ads.h	2006-08-31 16:15:07 UTC (rev 17969)
+++ branches/SAMBA_3_0/source/include/ads.h	2006-08-31 16:26:32 UTC (rev 17970)
@@ -1,3 +1,5 @@
+#ifndef _INCLUDE_ADS_H_
+#define _INCLUDE_ADS_H_
 /*
   header for ads (active directory) library routines
 
@@ -312,3 +314,4 @@
 	int val;
 	int critical;
 } ads_control;
+#endif

Modified: branches/SAMBA_3_0/source/include/ads_cldap.h
===================================================================
--- branches/SAMBA_3_0/source/include/ads_cldap.h	2006-08-31 16:15:07 UTC (rev 17969)
+++ branches/SAMBA_3_0/source/include/ads_cldap.h	2006-08-31 16:26:32 UTC (rev 17970)
@@ -19,6 +19,9 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  
 */
 
+#ifndef _INCLUDE_ADS_CLDAP_H_
+#define _INCLUDE_ADS_CLDAP_H_
+
 #define MAX_DNS_LABEL 255 + 1
 
 struct cldap_netlogon_reply {
@@ -43,8 +46,6 @@
 	uint16 lm20_token;
 };
 
-#define DEFAULT_SITE_NAME "Default-First-Site-Name"
-
 /* Mailslot or cldap getdcname response flags */
 #define ADS_PDC            0x00000001  /* DC is PDC */
 #define ADS_GC             0x00000004  /* DC is a GC of forest */
@@ -57,4 +58,4 @@
 #define ADS_GOOD_TIMESERV  0x00000200  /* DC has hardware clock (and running time) */
 #define ADS_NDNC           0x00000400  /* DomainName is non-domain NC serviced by LDAP server */
 
-
+#endif /* _INCLUDE_CLDAP_H_ */

Modified: branches/SAMBA_3_0/source/libads/dns.c
===================================================================
--- branches/SAMBA_3_0/source/libads/dns.c	2006-08-31 16:15:07 UTC (rev 17969)
+++ branches/SAMBA_3_0/source/libads/dns.c	2006-08-31 16:26:32 UTC (rev 17970)
@@ -590,10 +590,6 @@
 	if (!sitename || (sitename && !*sitename)) {
 		DEBUG(5,("sitename_store: deleting empty sitename!\n"));
 		return gencache_del(SITENAME_KEY);
-	} else if (sitename && strequal(sitename, DEFAULT_SITE_NAME)) {
-		DEBUG(5,("sitename_store: delete default sitename %s\n",
-			DEFAULT_SITE_NAME));
-		return gencache_del(SITENAME_KEY);
 	}
 
 	expire = get_time_t_max(); /* Store indefinately. */
@@ -639,11 +635,6 @@
 	BOOL ret = False;
 	char *new_sitename = sitename_fetch();
 
-	/* Treat default site as no name. */
-	if (strequal(sitename, DEFAULT_SITE_NAME)) {
-		sitename = NULL;
-	}
-
 	if (sitename && new_sitename && !strequal(sitename, new_sitename)) {
 		ret = True;
 	} else if ((sitename && !new_sitename) ||