From: Jeffrey Altman Date: Tue, 3 Jul 2007 01:33:47 +0000 (+0000) Subject: windows-get-cellinfo-afsdb-20070702 X-Git-Tag: BP-openafs-windows-kdfs-ifs~623 X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=8edfefbb9de23f7b1d1b23f6ce73c3310230e034;p=packages%2Fo%2Fopenafs.git windows-get-cellinfo-afsdb-20070702 enable afsdb records for get cellinfo lookup outside of afsd_service.exe ==================== This delta was composed from multiple commits as part of the CVS->Git migration. The checkin message with each commit was inconsistent. The following are the additional commit messages. ==================== do not perform afsdb lookup for Freelance.Local.Root cell --- diff --git a/src/WINNT/afsd/cm_dns.c b/src/WINNT/afsd/cm_dns.c index 6c09e05fd..5cf72ad88 100644 --- a/src/WINNT/afsd/cm_dns.c +++ b/src/WINNT/afsd/cm_dns.c @@ -686,6 +686,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 fafeacd37..960d0b944 100644 --- 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 b27d747a9..ebe6ca271 100644 --- 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 624a9772f..71893b865 100644 --- 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 c8635cec5..7398c03f0 100644 --- a/src/auth/cellconfig.c +++ b/src/auth/cellconfig.c @@ -532,7 +532,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