static-cm_dnsEnabled-20040323

Make cm_dns.c cm_dnsEnabled static to prevent potential
conflict (not really) with a variable of the same name
in afsd_init.c

diff --git a/src/WINNT/afsd/afsd_init.c b/src/WINNT/afsd/afsd_init.c
index c6cfb30791e753b6e7cc41398330509573acb826..5094885d9dbfc7fb2e1d6eaa833357a78d3b4e2d 100644 (file)
--- a/src/WINNT/afsd/afsd_init.c
+++ b/src/WINNT/afsd/afsd_init.c
@@ -89,7 +89,7 @@ cm_initparams_v1 cm_initParams;
 HANDLE afsi_file;
 
 #ifdef AFS_AFSDB_ENV
-extern int cm_dnsEnabled;
+int cm_dnsEnabled = 1;
 #endif
 
 char cm_NetBiosName[32];

diff --git a/src/WINNT/afsd/cm_dns.c b/src/WINNT/afsd/cm_dns.c
index 0d53e512ea547a4026f6d718095c2ca0309ad5cd..e817fc294ca3d1b37f4c4d59550c2240d46fe967 100644 (file)
--- a/src/WINNT/afsd/cm_dns.c
+++ b/src/WINNT/afsd/cm_dns.c
@@ -26,11 +26,7 @@ static char dns_addr[30];
 #ifdef DJGPP
 extern char cm_confDir[];
 #endif
-#if !defined(_WIN32_WINNT) || _WIN32_WINNT < 0x500
-int cm_dnsEnabled = -1;
-#else
-int cm_dnsEnabled = 1;  /* assume on */
-#endif
+static int cm_dnsEnabled = -1;
 
 void DNSlowerCase(char *str)
 {