From 5364fada4e4eb48dcb72cd0802b8486bee3228c9 Mon Sep 17 00:00:00 2001 From: Simon Wilkinson Date: Thu, 24 Dec 2009 15:14:46 +0000 Subject: [PATCH] Remove --disable-afsdb Remove the --disable-afsdb option from configure, and the corresponding AFS_AFSDB_ENV #ifdefs from the code. This means that the AFSDB code will always be built, but whether it used or not can still be controlled by runtime options in the cache manager. Change-Id: I1378c4626568e02345c7c400804747c446078c7e Reviewed-on: http://gerrit.openafs.org/1030 Reviewed-by: Derrick Brashear Tested-by: Derrick Brashear --- acinclude.m4 | 12 +----------- src/WINNT/afsd/afsd_init.c | 8 -------- src/WINNT/afsd/afskfw.c | 2 -- src/WINNT/afsd/cm_cell.c | 4 ---- src/WINNT/afsd/cm_config.c | 6 ------ src/WINNT/afsd/cm_dns.c | 3 --- src/WINNT/afsd/cm_ioctl.c | 2 -- src/WINNT/afsd/smb.c | 2 -- src/WINNT/client_config/tab_general.cpp | 12 +++++------- src/WINNT/client_config/tab_hosts.cpp | 2 -- src/afs/UKERNEL/sysincludes.h | 2 -- src/afs/afs_call.c | 4 ---- src/afs/afs_callback.c | 2 -- src/afs/afs_cell.c | 6 ------ src/afs/afs_dcache.c | 4 ---- src/afs/afs_prototypes.h | 2 -- src/afsd/afsd.c | 17 ++--------------- src/auth/NTMakefile | 1 - src/auth/cellconfig.c | 10 ---------- src/config/NTMakefile.amd64_w2k | 1 - src/config/NTMakefile.i386_nt40 | 1 - src/config/NTMakefile.i386_w2k | 1 - src/config/afsconfig-windows.h | 2 -- 23 files changed, 8 insertions(+), 98 deletions(-) diff --git a/acinclude.m4 b/acinclude.m4 index 6db335beb..b2ba46135 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -47,7 +47,6 @@ AH_VERBATIM([OPENAFS_HEADER], #define _FILE_OFFSET_BITS 64 #endif -#undef AFS_AFSDB_ENV #undef AFS_NAMEI_ENV #undef BITMAP_LATER #undef FAST_RESTART @@ -94,10 +93,6 @@ AC_ARG_WITH([afs-sysname], [AS_HELP_STRING([--with-afs-sysname=sys], [use sys for the afs sysname])]) dnl General feature options. -AC_ARG_ENABLE([afsdb], - [AS_HELP_STRING([--disable-afsdb], [disable AFSDB DNS RR support])], - , - [enable_afsdb="yes"]) AC_ARG_ENABLE([pam], [AS_HELP_STRING([--disable-pam], [disable PAM support])], , @@ -1337,7 +1332,7 @@ else fi done if test "$ac_cv_func_res_search" = yes; then - LIB_res_search="-l$lib" + LIB_AFSDB="-l$lib" AC_DEFINE(HAVE_RES_SEARCH, 1, []) AC_MSG_RESULT([yes, in lib$lib]) else @@ -1494,11 +1489,6 @@ else fi fi -if test "$enable_afsdb" = "yes"; then - LIB_AFSDB="$LIB_res_search" - AC_DEFINE(AFS_AFSDB_ENV, 1, [define if you want to want search afsdb rr]) -fi - dnl check for tivoli AC_MSG_CHECKING(for tivoli tsm butc support) XBSA_CFLAGS="" diff --git a/src/WINNT/afsd/afsd_init.c b/src/WINNT/afsd/afsd_init.c index e6813ed63..8d039a514 100644 --- a/src/WINNT/afsd/afsd_init.c +++ b/src/WINNT/afsd/afsd_init.c @@ -113,9 +113,7 @@ DWORD TraceOption = 0; HANDLE afsi_file; -#ifdef AFS_AFSDB_ENV int cm_dnsEnabled = 1; -#endif static int afsi_log_useTimestamp = 1; @@ -951,7 +949,6 @@ afsd_InitCM(char **reasonP) (BYTE *) &cm_anonvldb, &dummyLen); afsi_log("CM ForceAnonVLDB is %s", cm_anonvldb ? "on" : "off"); -#ifdef AFS_AFSDB_ENV dummyLen = sizeof(cm_dnsEnabled); code = RegQueryValueEx(parmKey, "UseDNS", NULL, NULL, (BYTE *) &cm_dnsEnabled, &dummyLen); @@ -963,9 +960,6 @@ afsd_InitCM(char **reasonP) cm_dnsEnabled = 1; /* default on */ afsi_log("Default to use DNS to find AFS cell servers"); } -#else /* AFS_AFSDB_ENV */ - afsi_log("AFS not built with DNS support to find AFS cell servers"); -#endif /* AFS_AFSDB_ENV */ #ifdef AFS_FREELANCE_CLIENT dummyLen = sizeof(cm_freelanceEnabled); @@ -1298,12 +1292,10 @@ afsd_InitCM(char **reasonP) return -1; } -#ifdef AFS_AFSDB_ENV #if !defined(_WIN32_WINNT) || (_WIN32_WINNT < 0x0500) if (cm_InitDNS(cm_dnsEnabled) == -1) cm_dnsEnabled = 0; /* init failed, so deactivate */ afsi_log("cm_InitDNS %d", cm_dnsEnabled); -#endif #endif /* Set RX parameters before initializing RX */ diff --git a/src/WINNT/afsd/afskfw.c b/src/WINNT/afsd/afskfw.c index 3c2ad4222..974a27cce 100644 --- a/src/WINNT/afsd/afskfw.c +++ b/src/WINNT/afsd/afskfw.c @@ -3416,12 +3416,10 @@ KFW_AFS_get_cellconfig(char *cell, struct afsconf_cell *cellconfig, char *local_ rc = cm_SearchCellRegistry(1, cell, newcell, linkedcell, get_cellconfig_callback, (void*)cellconfig); if (rc && rc != CM_ERROR_FORCE_DNS_LOOKUP) rc = cm_SearchCellFileEx(cell, newcell, linkedcell, get_cellconfig_callback, (void*)cellconfig); -#ifdef AFS_AFSDB_ENV if (rc != 0) { int ttl; rc = cm_SearchCellByDNS(cell, newcell, &ttl, get_cellconfig_callback, (void*)cellconfig); } -#endif if (rc == 0) { strcpy(cellconfig->name, newcell); diff --git a/src/WINNT/afsd/cm_cell.c b/src/WINNT/afsd/cm_cell.c index c166bba1e..7c0d989b9 100644 --- a/src/WINNT/afsd/cm_cell.c +++ b/src/WINNT/afsd/cm_cell.c @@ -86,10 +86,8 @@ cm_cell_t *cm_UpdateCell(cm_cell_t * cp, afs_uint32 flags) && !(cp->flags & CM_CELLFLAG_FREELANCE) #endif ) || (time(0) > cp->timeout) -#ifdef AFS_AFSDB_ENV || (cm_dnsEnabled && (cp->flags & CM_CELLFLAG_DNS) && ((cp->flags & CM_CELLFLAG_VLSERVER_INVALID))) -#endif ) { lock_ReleaseMutex(&cp->mx); @@ -110,7 +108,6 @@ cm_cell_t *cm_UpdateCell(cm_cell_t * cp, afs_uint32 flags) cp->timeout = time(0) + 7200; lock_ReleaseMutex(&cp->mx); } -#ifdef AFS_AFSDB_ENV else { if (cm_dnsEnabled) { int ttl; @@ -135,7 +132,6 @@ cm_cell_t *cm_UpdateCell(cm_cell_t * cp, afs_uint32 flags) } } } -#endif /* AFS_AFSDB_ENV */ } else { lock_ReleaseMutex(&cp->mx); } diff --git a/src/WINNT/afsd/cm_config.c b/src/WINNT/afsd/cm_config.c index 3cc5b13ab..ee6fc2086 100644 --- a/src/WINNT/afsd/cm_config.c +++ b/src/WINNT/afsd/cm_config.c @@ -21,10 +21,8 @@ #include #include -#ifdef AFS_AFSDB_ENV #include "cm_dns.h" #include -#endif static long cm_ParsePair(char *lineBufferp, char *leftp, char *rightp) { @@ -693,7 +691,6 @@ long cm_EnumerateCellRegistry(afs_uint32 client, cm_enumCellRegistryProc_t *proc long cm_SearchCellByDNS(char *cellNamep, char *newCellNamep, int *ttl, cm_configProc_t *procp, void *rockp) { -#ifdef AFS_AFSDB_ENV int rc; int cellHostAddrs[AFSMAXCELLHOSTS]; char cellHostNames[AFSMAXCELLHOSTS][MAXHOSTCHARS]; @@ -737,9 +734,6 @@ long cm_SearchCellByDNS(char *cellNamep, char *newCellNamep, int *ttl, } else return -1; /* not found */ -#else - return -1; /* not found */ -#endif /* AFS_AFSDB_ENV */ } /* use cm_GetConfigDir() plus AFS_CELLSERVDB to diff --git a/src/WINNT/afsd/cm_dns.c b/src/WINNT/afsd/cm_dns.c index d8bce281f..73d1b9286 100644 --- a/src/WINNT/afsd/cm_dns.c +++ b/src/WINNT/afsd/cm_dns.c @@ -6,8 +6,6 @@ * directory or online at http://www.openafs.org/dl/license10.html */ -#ifdef AFS_AFSDB_ENV - #include #include #include @@ -1024,5 +1022,4 @@ int getAFSServerW(const cm_unichar_t *service, const cm_unichar_t *protocol, con #endif /* DNSAPI_ENV */ return -1; } -#endif /* AFS_AFSDB_ENV */ diff --git a/src/WINNT/afsd/cm_ioctl.c b/src/WINNT/afsd/cm_ioctl.c index e4cbb84c6..c7e71d945 100644 --- a/src/WINNT/afsd/cm_ioctl.c +++ b/src/WINNT/afsd/cm_ioctl.c @@ -1493,7 +1493,6 @@ cm_IoctlNewCell(struct cm_ioctl *ioctlp, struct cm_user *userp) code = cm_SearchCellRegistry(1, cp->name, cp->name, cp->linkedName, cm_AddCellProc, &rock); if (code && code != CM_ERROR_FORCE_DNS_LOOKUP) code = cm_SearchCellFileEx(cp->name, cp->name, cp->linkedName, cm_AddCellProc, &rock); -#ifdef AFS_AFSDB_ENV if (code) { if (cm_dnsEnabled) { int ttl; @@ -1512,7 +1511,6 @@ cm_IoctlNewCell(struct cm_ioctl *ioctlp, struct cm_user *userp) cp->flags &= ~CM_CELLFLAG_DNS; lock_ReleaseMutex(&cp->mx); } -#endif /* AFS_AFSDB_ENV */ if (code) { lock_ObtainMutex(&cp->mx); cp->flags |= CM_CELLFLAG_VLSERVER_INVALID; diff --git a/src/WINNT/afsd/smb.c b/src/WINNT/afsd/smb.c index 6af4eb61c..214c5fb01 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 if (cellname) free(cellname); diff --git a/src/WINNT/client_config/tab_general.cpp b/src/WINNT/client_config/tab_general.cpp index 3fe83effa..f97caf7a8 100644 --- a/src/WINNT/client_config/tab_general.cpp +++ b/src/WINNT/client_config/tab_general.cpp @@ -681,13 +681,11 @@ BOOL fIsCellInCellServDB (LPCTSTR pszCell) fFound = TRUE; CSDB_FreeFile (&CellServDB); } -#ifdef AFS_AFSDB_ENV - if ( fFound == FALSE ) { - int ttl; - fFound = !cm_SearchCellByDNS(cellname, NULL, &ttl, NULL, NULL); - } -#endif - done: + if ( fFound == FALSE ) { + int ttl; + fFound = !cm_SearchCellByDNS(cellname, NULL, &ttl, NULL, NULL); + } + done: return fFound; } diff --git a/src/WINNT/client_config/tab_hosts.cpp b/src/WINNT/client_config/tab_hosts.cpp index 4859d9c20..ffc529fc9 100644 --- a/src/WINNT/client_config/tab_hosts.cpp +++ b/src/WINNT/client_config/tab_hosts.cpp @@ -196,10 +196,8 @@ BOOL HostsTab_OnApply (HWND hDlg) code != CM_ERROR_FORCE_DNS_LOOKUP && !CSDB_FindCell (&g.Configuration.CellServDB, szCell)) { -#ifdef AFS_AFSDB_ENV int ttl; if (cm_SearchCellByDNS(cellname, NULL, &ttl, NULL, NULL)) -#endif { Message (MB_ICONASTERISK | MB_OK, GetErrorTitle(), IDS_BADCELL_DESC_CC); return FALSE; diff --git a/src/afs/UKERNEL/sysincludes.h b/src/afs/UKERNEL/sysincludes.h index dc9017025..9fcb93eeb 100644 --- a/src/afs/UKERNEL/sysincludes.h +++ b/src/afs/UKERNEL/sysincludes.h @@ -155,13 +155,11 @@ typedef unsigned int fsblkcnt_t; #endif -#ifdef AFS_AFSDB_ENV #include #ifdef HAVE_ARPA_NAMESER_COMPAT_H #include #endif #include -#endif /* AFS_AFSDB_ENV */ /* glibc 2.2 has pthread_attr_setstacksize */ #if (defined(AFS_LINUX22_ENV) && !defined(AFS_USR_LINUX22_ENV)) || (defined(AFS_USR_LINUX22_ENV) && (__GLIBC_MINOR__ < 2)) diff --git a/src/afs/afs_call.c b/src/afs/afs_call.c index 25f34fe78..70e37e754 100644 --- a/src/afs/afs_call.c +++ b/src/afs/afs_call.c @@ -1134,7 +1134,6 @@ afs_syscall_call(long parm, long parm2, long parm3, AFS_COPYOUT((caddr_t) & mask, AFSKPTR(parm3), sizeof(afs_int32), code); } -#ifdef AFS_AFSDB_ENV else if (parm == AFSOP_AFSDB_HANDLER) { int sizeArg = (int)parm4; int kmsgLen = sizeArg & 0xffff; @@ -1161,7 +1160,6 @@ afs_syscall_call(long parm, long parm2, long parm3, afs_osi_Free(kmsg, kmsgLen); afs_osi_Free(cellname, cellLen); } -#endif else if (parm == AFSOP_SET_DYNROOT) { code = afs_SetDynrootEnable(parm2); } else if (parm == AFSOP_SET_FAKESTAT) { @@ -1269,12 +1267,10 @@ afs_shutdown(void) afs_osi_Wakeup((char *)&afs_CacheTruncateDaemon); afs_osi_Sleep(&afs_termState); } -#ifdef AFS_AFSDB_ENV afs_warn("AFSDB... "); afs_StopAFSDB(); while (afs_termState == AFSOP_STOP_AFSDB) afs_osi_Sleep(&afs_termState); -#endif #if defined(AFS_SUN5_ENV) || defined(RXK_LISTENER_ENV) afs_warn("RxEvent... "); /* cancel rx event daemon */ diff --git a/src/afs/afs_callback.c b/src/afs/afs_callback.c index b80643d54..a4ea288ab 100644 --- a/src/afs/afs_callback.c +++ b/src/afs/afs_callback.c @@ -60,10 +60,8 @@ static struct ltable { "afs_xsrvAddr", (char *)&afs_xsrvAddr}, { "afs_xvreclaim", (char *)&afs_xvreclaim}, -#ifdef AFS_AFSDB_ENV { "afsdb_client_lock", (char *)&afsdb_client_lock}, { "afsdb_req_lock", (char *)&afsdb_req_lock}, -#endif #ifdef AFS_DISCON_ENV { "afs_discon_lock", (char *)&afs_discon_lock}, { "afs_disconDirtyLock", (char *)&afs_disconDirtyLock}, diff --git a/src/afs/afs_cell.c b/src/afs/afs_cell.c index 1ac049f6e..c228136c3 100644 --- a/src/afs/afs_cell.c +++ b/src/afs/afs_cell.c @@ -33,7 +33,6 @@ afs_rwlock_t afs_xcell; /* Export for cmdebug peeking at locks */ * afs_LookupAFSDB: look up AFSDB for given cell name and create locally */ -#ifdef AFS_AFSDB_ENV afs_rwlock_t afsdb_client_lock; /* Serializes client requests */ afs_rwlock_t afsdb_req_lock; /* Serializes client requests */ static char afsdb_handler_running; /* Protected by GLOCK */ @@ -181,7 +180,6 @@ afs_GetCellHostsAFSDB(char *acellName) } else return ENOENT; } -#endif /*! @@ -191,7 +189,6 @@ afs_GetCellHostsAFSDB(char *acellName) void afs_LookupAFSDB(char *acellName) { -#ifdef AFS_AFSDB_ENV int code; char *cellName = afs_strdup(acellName); @@ -199,7 +196,6 @@ afs_LookupAFSDB(char *acellName) afs_Trace2(afs_iclSetp, CM_TRACE_AFSDB, ICL_TYPE_STRING, cellName, ICL_TYPE_INT32, code); afs_osi_FreeStr(cellName); -#endif } /* @@ -1040,10 +1036,8 @@ void afs_CellInit(void) { AFS_RWLOCK_INIT(&afs_xcell, "afs_xcell"); -#ifdef AFS_AFSDB_ENV AFS_RWLOCK_INIT(&afsdb_client_lock, "afsdb_client_lock"); AFS_RWLOCK_INIT(&afsdb_req_lock, "afsdb_req_lock"); -#endif QInit(&CellLRU); afs_cellindex = 0; diff --git a/src/afs/afs_dcache.c b/src/afs/afs_dcache.c index 78b4e314f..0481b2974 100644 --- a/src/afs/afs_dcache.c +++ b/src/afs/afs_dcache.c @@ -452,11 +452,7 @@ afs_CacheTruncateDaemon(void) afs_stats_AddTo(CTD_stats.CTD_sleepTime, CTD_tmpTime); } if (afs_termState == AFSOP_STOP_TRUNCDAEMON) { -#ifdef AFS_AFSDB_ENV afs_termState = AFSOP_STOP_AFSDB; -#else - afs_termState = AFSOP_STOP_RXEVENT; -#endif afs_osi_Wakeup(&afs_termState); break; } diff --git a/src/afs/afs_prototypes.h b/src/afs/afs_prototypes.h index 1c1f315aa..97a870833 100644 --- a/src/afs/afs_prototypes.h +++ b/src/afs/afs_prototypes.h @@ -127,10 +127,8 @@ extern void afs_DequeueCallback(struct vcache *avc); /* afs_cell.c */ extern afs_int32 afs_cellindex; extern afs_rwlock_t afs_xcell; -#ifdef AFS_AFSDB_ENV extern afs_rwlock_t afsdb_client_lock; extern afs_rwlock_t afsdb_req_lock; -#endif extern struct afs_q CellLRU; extern void afs_CellInit(void); diff --git a/src/afsd/afsd.c b/src/afsd/afsd.c index a52b0e4f2..268a6570b 100644 --- a/src/afsd/afsd.c +++ b/src/afsd/afsd.c @@ -311,9 +311,7 @@ static int nBiods = 5; /* AIX3.1 only */ static int preallocs = 400; /* Def # of allocated memory blocks */ static int enable_peer_stats = 0; /* enable rx stats */ static int enable_process_stats = 0; /* enable rx stats */ -#ifdef AFS_AFSDB_ENV static int enable_afsdb = 0; /* enable AFSDB support */ -#endif static int enable_dynroot = 0; /* enable dynroot support */ static int enable_fakestat = 0; /* enable fakestat support */ static int enable_backuptree = 0; /* enable backup tree support */ @@ -1427,7 +1425,6 @@ ConfigCellAlias(struct afsconf_cellalias *aca, return 0; } -#ifdef AFS_AFSDB_ENV static void AfsdbLookupHandler(void) { @@ -1485,7 +1482,6 @@ AfsdbLookupHandler(void) #endif exit(1); } -#endif #ifdef mac2 #include @@ -1674,11 +1670,7 @@ mainproc(struct cmd_syndesc *as, void *arock) } if (as->parms[24].items) { /* -afsdb */ -#ifdef AFS_AFSDB_ENV enable_afsdb = 1; -#else - printf("afsd: No AFSDB support; ignoring -afsdb"); -#endif } if (as->parms[25].items) { /* -files_per_subdir */ @@ -2067,7 +2059,6 @@ mainproc(struct cmd_syndesc *as, void *arock) } #endif -#ifdef AFS_AFSDB_ENV if (enable_afsdb) { if (afsd_verbose) printf("%s: Forking AFSDB lookup handler.\n", rn); @@ -2085,7 +2076,6 @@ mainproc(struct cmd_syndesc *as, void *arock) exit(1); } } -#endif code = call_syscall(AFSOP_BASIC_INIT, 1); if (code) { @@ -2481,11 +2471,8 @@ main(int argc, char **argv) "Collect rpc statistics for this process"); cmd_AddParm(ts, "-mem_alloc_sleep", CMD_FLAG, (CMD_OPTIONAL | CMD_HIDE), "Allow sleeps when allocating memory cache"); - cmd_AddParm(ts, "-afsdb", CMD_FLAG, (CMD_OPTIONAL -#ifndef AFS_AFSDB_ENV - | CMD_HIDE -#endif - ), "Enable AFSDB support"); + cmd_AddParm(ts, "-afsdb", CMD_FLAG, (CMD_OPTIONAL), + "Enable AFSDB support"); cmd_AddParm(ts, "-files_per_subdir", CMD_SINGLE, CMD_OPTIONAL, "log(2) of the number of cache files per cache subdirectory"); cmd_AddParm(ts, "-dynroot", CMD_FLAG, CMD_OPTIONAL, diff --git a/src/auth/NTMakefile b/src/auth/NTMakefile index 839d5928c..f59a09e6f 100644 --- a/src/auth/NTMakefile +++ b/src/auth/NTMakefile @@ -8,7 +8,6 @@ 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 b5ebe0053..18a286bd4 100644 --- a/src/auth/cellconfig.c +++ b/src/auth/cellconfig.c @@ -34,13 +34,11 @@ #include #include #include -#ifdef AFS_AFSDB_ENV #include #ifdef HAVE_ARPA_NAMESER_COMPAT_H #include #endif #include -#endif /* AFS_AFSDB_ENV */ #endif /* AFS_NT40_ENV */ #include #include @@ -61,13 +59,11 @@ #include "cellconfig.h" #include "keys.h" #ifdef AFS_NT40_ENV -#ifdef AFS_AFSDB_ENV #include #include /* cm_dns.h depends on cellconfig.h */ #include #include -#endif /* AFS_AFSDB_ENV */ #endif #include #include @@ -991,7 +987,6 @@ afsconf_GetExtendedCellInfo(struct afsconf_dir *adir, char *acellName, return code; } -#ifdef AFS_AFSDB_ENV #if !defined(AFS_NT40_ENV) int afsconf_LookupServer(const char *service, const char *protocol, @@ -1310,7 +1305,6 @@ afsconf_GetAfsdbInfo(char *acellName, char *aservice, return 0; } #endif /* windows */ -#endif /* AFS_AFSDB_ENV */ int afsconf_GetCellInfo(struct afsconf_dir *adir, char *acellName, char *aservice, @@ -1449,11 +1443,7 @@ afsconf_GetCellInfo(struct afsconf_dir *adir, char *acellName, char *aservice, return 0; } else { UNLOCK_GLOBAL_MUTEX; -#ifdef AFS_AFSDB_ENV return afsconf_GetAfsdbInfo(tcell, aservice, acellInfo); -#else - return AFSCONF_NOTFOUND; -#endif /* AFS_AFSDB_ENV */ } } diff --git a/src/config/NTMakefile.amd64_w2k b/src/config/NTMakefile.amd64_w2k index afda243a9..68ff5126b 100644 --- a/src/config/NTMakefile.amd64_w2k +++ b/src/config/NTMakefile.amd64_w2k @@ -240,7 +240,6 @@ afscdefs =\ -D_WIN32_WINNT=0x0502 \ -DWINVER=0x0502 \ -DREGISTER_POWER_NOTIFICATIONS \ - -DAFS_AFSDB_ENV \ -DAFS_FREELANCE_CLIENT \ -DAFS_64BITPOINTER_ENV \ -DAFS_64BITUSERPOINTER_ENV \ diff --git a/src/config/NTMakefile.i386_nt40 b/src/config/NTMakefile.i386_nt40 index f8724d9f5..6fa77bdaf 100644 --- a/src/config/NTMakefile.i386_nt40 +++ b/src/config/NTMakefile.i386_nt40 @@ -246,7 +246,6 @@ afscdefs =\ -D_WIN32_WINNT=0x0500 \ -DWINVER=0x0500 \ -DREGISTER_POWER_NOTIFICATIONS \ - -DAFS_AFSDB_ENV \ -DAFS_FREELANCE_CLIENT \ -DAFS_64BIT_ENV \ -DAFS_64BIT_CLIENT \ diff --git a/src/config/NTMakefile.i386_w2k b/src/config/NTMakefile.i386_w2k index 6e0b69e92..733a85876 100644 --- a/src/config/NTMakefile.i386_w2k +++ b/src/config/NTMakefile.i386_w2k @@ -250,7 +250,6 @@ afscdefs =\ -D_WIN32_WINNT=0x0500 \ -DWINVER=0x0500 \ -DREGISTER_POWER_NOTIFICATIONS \ - -DAFS_AFSDB_ENV \ -DAFS_FREELANCE_CLIENT \ -DAFS_64BIT_ENV \ -DAFS_64BIT_CLIENT \ diff --git a/src/config/afsconfig-windows.h b/src/config/afsconfig-windows.h index 7248592e8..eb9ad46fb 100644 --- a/src/config/afsconfig-windows.h +++ b/src/config/afsconfig-windows.h @@ -210,8 +210,6 @@ # endif #endif -/*#undef AFS_AFSDB_ENV*/ -#define AFS_AFSDB_ENV 1 #undef AFS_NAMEI_ENV #undef FAST_RESTART -- 2.39.5