DEVEL15-windows-get-cellinfo-afsdb-20070702

do not perform afsdb lookup for Freelance.Local.Root cell

(cherry picked from commit 8edfefbb9de23f7b1d1b23f6ce73c3310230e034)

diff --git a/src/WINNT/afsd/cm_dns.c b/src/WINNT/afsd/cm_dns.c
index f4e1b9db922d2eead637693346cde7b5c70a49bc..0e92606933591e42d28413e5eb8e0e928db98623 100644 (file)
--- a/src/WINNT/afsd/cm_dns.c
+++ b/src/WINNT/afsd/cm_dns.c
@@ -707,6 +707,11 @@ int getAFSServer(char *cellName, int *cellHostAddrs, char cellHostNames[][MAXHOS
     struct sockaddr_in vlSockAddr;
     char query[1024];
 
+#ifdef AFS_FREELANCE_CLIENT
+    if ( stricmp(cellName, "Freelance.Local.Root") == 0 )
+        return -1;
+#endif /* AFS_FREELANCE_CLIENT */
+
     *numServers = 0; 
     *ttl = 0;
 

diff --git a/src/WINNT/afsd/fs.c b/src/WINNT/afsd/fs.c
index fafeacd37cec79f701720432a580602c238eef45..960d0b944c46b23848cc4a1688ea9ee916ece0ae 100644 (file)
--- a/src/WINNT/afsd/fs.c
+++ b/src/WINNT/afsd/fs.c
@@ -271,7 +271,7 @@ IsFreelanceRoot(char *apath)
 
     code = pioctl(apath, VIOC_FILE_CELL_NAME, &blob, 1);
     if (code == 0)
-        return !strcmp("Freelance.Local.Root",space);
+        return !stricmp("Freelance.Local.Root",space);
     return 1;   /* assume it is because it is more restrictive that way */
 }
 

diff --git a/src/WINNT/afsd/symlink.c b/src/WINNT/afsd/symlink.c
index b27d747a9742ff3590ea20cf4219e6a3787fb23a..ebe6ca2710f9ad9219c5ed707b6f84d23caa344a 100644 (file)
--- a/src/WINNT/afsd/symlink.c
+++ b/src/WINNT/afsd/symlink.c
@@ -88,7 +88,7 @@ IsFreelanceRoot(char *apath)
 
     code = pioctl(apath, VIOC_FILE_CELL_NAME, &blob, 1);
     if (code == 0)
-        return !strcmp("Freelance.Local.Root",space);
+        return !stricmp("Freelance.Local.Root",space);
     return 1;   /* assume it is because it is more restrictive that way */
 }
 

diff --git a/src/auth/NTMakefile b/src/auth/NTMakefile
index 624a9772fa265bf2516abb0d5701174e3acb0c24..71893b865c7e30e85d87fc7a9a6ff9b6727b946a 100644 (file)
--- a/src/auth/NTMakefile
+++ b/src/auth/NTMakefile
@@ -8,6 +8,7 @@
 RELDIR=auth
 !INCLUDE ..\config\NTMakefile.$(SYS_NAME)
 !INCLUDE ..\config\NTMakefile.version
+AFSDEV_AUXCDEFINES = -DAFS_AFSDB_ENV
 
 INCFILEDIR = $(DESTDIR)\include\afs  # header file install directory
 

diff --git a/src/auth/cellconfig.c b/src/auth/cellconfig.c
index 1726819cefd3faa6e7db83222b57239e6eeabf01..6757a38fa12a47cac02696c203d701f7cb6cc85b 100644 (file)
--- a/src/auth/cellconfig.c
+++ b/src/auth/cellconfig.c
@@ -534,7 +534,7 @@ afsconf_OpenInternal(register struct afsconf_dir *adir, char *cell,
     char tbuffer[256], tbuf1[256];
     struct stat tstat;
 
-    /* figure out the cell name */
+    /* figure out the local cell name */
 #ifdef AFS_NT40_ENV
     i = GetCellNT(adir);
 #else