r17970: 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.
(This used to be commit 5ae3564d6844f44a6943b2028917bd457371af1e)

diff --git a/source3/include/ads.h b/source3/include/ads.h
index f200df5d22dd7544929610f854adde9e51774e83..f70c5a6f12a7d99d56265d7f20f88053c477bd49 100644 (file)
--- a/source3/include/ads.h
+++ b/source3/include/ads.h
@@ -1,3 +1,5 @@
+#ifndef _INCLUDE_ADS_H_
+#define _INCLUDE_ADS_H_
 /*
   header for ads (active directory) library routines
 
@@ -312,3 +314,4 @@ typedef struct {
        int val;
        int critical;
 } ads_control;
+#endif

diff --git a/source3/include/ads_cldap.h b/source3/include/ads_cldap.h
index 0108363c1b1c3b8dff57b4ba057f4f9c0b76642e..fd227c895dbe14b5787ec4aa7b8cebdf7e4e59a9 100644 (file)
--- a/source3/include/ads_cldap.h
+++ b/source3/include/ads_cldap.h
@@ -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 @@ struct cldap_netlogon_reply {
        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 @@ struct cldap_netlogon_reply {
 #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_ */

diff --git a/source3/libads/dns.c b/source3/libads/dns.c
index 3f99a73a3394f720fc40f59e200af10d1a1f9e2f..579296ea1fbf700b6c47756c4033d403a90c363e 100644 (file)
--- a/source3/libads/dns.c
+++ b/source3/libads/dns.c
@@ -590,10 +590,6 @@ BOOL sitename_store(const char *sitename)
        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 stored_sitename_changed(const char *sitename)
        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) ||