From: Jeffrey Altman <jaltman@your-file-system.com>
Date: Fri, 22 Jan 2010 01:05:25 +0000 (-0500)
Subject: Windows: AFS_AFSDB_ENV preprocessor symbol no longer exists
X-Git-Tag: openafs-devel-1_5_70~11
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=14ffee4bbc1c8df93110ae1b86edb2a172aae091;p=packages%2Fo%2Fopenafs.git

Windows: AFS_AFSDB_ENV preprocessor symbol no longer exists

The decision to add AFS_AFSDB_ENV to make code consistent was
a mistake.  The preprocessor symbol no longer exists.  AFSDB
is broken in 1.5.69.

Change-Id: I7ea147b824f3a67e2039abee8b2513af175fcc5d
Reviewed-on: http://gerrit.openafs.org/1142
Reviewed-by: Jeffrey Altman <jaltman@openafs.org>
Tested-by: Jeffrey Altman <jaltman@openafs.org>
---

diff --git a/src/WINNT/afsd/cm_cell.c b/src/WINNT/afsd/cm_cell.c
index 7c0d989b9..bb08f7a92 100644
--- a/src/WINNT/afsd/cm_cell.c
+++ b/src/WINNT/afsd/cm_cell.c
@@ -288,7 +288,6 @@ cm_cell_t *cm_GetCell_Gen(char *namep, char *newnamep, afs_uint32 flags)
                       osi_LogSaveString(afsd_logp,namep), code, osi_LogSaveString(afsd_logp,fullname),
                       osi_LogSaveString(afsd_logp,linkedName));
 
-#ifdef AFS_AFSDB_ENV
             if (cm_dnsEnabled) {
                 int ttl;
 
@@ -314,7 +313,6 @@ cm_cell_t *cm_GetCell_Gen(char *namep, char *newnamep, afs_uint32 flags)
                 }
             } 
             else 
-#endif
             {
                 lock_ObtainMutex(&cp->mx);
                 lock_ObtainWrite(&cm_cellLock);
diff --git a/src/WINNT/afsd/smb.c b/src/WINNT/afsd/smb.c
index 3f80f69b2..44958911e 100644
--- a/src/WINNT/afsd/smb.c
+++ b/src/WINNT/afsd/smb.c
@@ -1945,12 +1945,10 @@ int smb_FindShare(smb_vc_t *vcp, smb_user_t *uidp,
         code = cm_SearchCellRegistry(1, cellname, ftemp, 0, 0, 0);
         if (code && code != CM_ERROR_FORCE_DNS_LOOKUP)
             code = cm_SearchCellFile(cellname, ftemp, 0, 0);
-#ifdef AFS_AFSDB_ENV
         if (code && cm_dnsEnabled) {
             int ttl;
             code = cm_SearchCellByDNS(cellname, ftemp, &ttl, 0, 0);
         }
-#endif /* AFS_AFSDB_ENV */
         if (cellname)
             free(cellname);