From: Russ Allbery Date: Fri, 19 Aug 2005 01:55:57 +0000 (+0000) Subject: * Don't create the unused /etc/openafs/AFSLog file. (Closes: #120097) X-Git-Tag: debian/1.4rc1-1~28 X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=367b4d1feca4c9c0c1c1fa91ba1f8f5d9ff1e4ec;p=packages%2Fo%2Fopenafs.git * Don't create the unused /etc/openafs/AFSLog file. (Closes: #120097) --- diff --git a/debian/changelog b/debian/changelog index 5e81cf8f8..058ceb410 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,7 @@ openafs (1.3.87-2) unstable; urgency=low Gelato for analysis and patches. (Closes: #322638) * Detect AFS caches on non-ext2/ext3 file systems and abort AFS client initialization. (Closes: #249315) + * Don't create the unused /etc/openafs/AFSLog file. (Closes: #120097) * Redo how library object files are found for the PAM module build to avoid assuming C locale character set behavior. (Closes: #323582) * Remove the openafs-client warning against dynroot for the first system diff --git a/debian/patches/afslog b/debian/patches/afslog new file mode 100644 index 000000000..ec5ea5af5 --- /dev/null +++ b/debian/patches/afslog @@ -0,0 +1,84 @@ +Submitted upstream as #18662, but deferred until after the 1.4 release +for upstream. Fixes Debian bug #120097. + +--- openafs-1.3.87.orig/src/afsd/afsd.c ++++ openafs-1.3.87/src/afsd/afsd.c +@@ -47,7 +47,8 @@ + * system problems, which can only be ameliorated by changing + * NINODE (or equivalent) and rebuilding the kernel. + * This option is now disabled. +- * -logfile Place where to put the logfile (default in /etc/AFSLog. ++ * -logfile [OBSOLETE] Place where to put the logfile (default in ++ * /etc/AFSLog. + * -waitclose make close calls always synchronous (slows em down, tho) + * -files_per_subdir [n] number of files per cache subdir. (def=2048) + * -shutdown Shutdown afs daemons +@@ -184,7 +185,6 @@ + + + #define CACHEINFOFILE "cacheinfo" +-#define AFSLOGFILE "AFSLog" + #define DCACHEFILE "CacheItems" + #define VOLINFOFILE "VolumeItems" + #define CELLINFOFILE "CellItems" +@@ -236,7 +236,6 @@ + char fullpn_DCacheFile[1024]; /*Full pathname of DCACHEFILE */ + char fullpn_VolInfoFile[1024]; /*Full pathname of VOLINFOFILE */ + char fullpn_CellInfoFile[1024]; /*Full pathanem of CELLINFOFILE */ +-char fullpn_AFSLogFile[1024]; /*Full pathname of AFSLOGFILE */ + char fullpn_CacheInfo[1024]; /*Full pathname of CACHEINFO */ + char fullpn_VFile[1024]; /*Full pathname of data cache files */ + char *vFilePtr; /*Ptr to the number part of above pathname */ +@@ -1441,10 +1440,9 @@ + strcpy(confDir, as->parms[17].items->data); + } + sprintf(fullpn_CacheInfo, "%s/%s", confDir, CACHEINFOFILE); +- sprintf(fullpn_AFSLogFile, "%s/%s", confDir, AFSLOGFILE); + if (as->parms[18].items) { + /* -logfile */ +- strcpy(fullpn_AFSLogFile, as->parms[18].items->data); ++ printf("afsd: Ignoring obsolete -logfile flag\n"); + } + if (as->parms[19].items) { + /* -waitclose */ +@@ -1561,18 +1559,6 @@ + exit(1); + } + +- if ((logfd = fopen(fullpn_AFSLogFile, "r+")) == 0) { +- if (afsd_verbose) +- printf("%s: Creating '%s'\n", rn, fullpn_AFSLogFile); +- if (CreateCacheFile(fullpn_AFSLogFile, NULL)) { +- printf +- ("%s: Can't create '%s' (You may want to use the -logfile option)\n", +- rn, fullpn_AFSLogFile); +- exit(1); +- } +- } else +- fclose(logfd); +- + /* do some random computations in memcache case to get things to work + * reasonably no matter which parameters you set. + */ +@@ -1978,21 +1964,6 @@ + call_syscall(AFSOP_VOLUMEINFO, fullpn_VolInfoFile); + + /* +- * Pass the kernel the name of the afs logging file holding the volume +- * information. +- */ +- if (afsd_debug) +- printf("%s: Calling AFSOP_AFSLOG: volume info file is '%s'\n", rn, +- fullpn_AFSLogFile); +-#if defined(AFS_SGI_ENV) +- /* permit explicit -logfile argument to enable logging on memcache systems */ +- if (!(cacheFlags & AFSCALL_INIT_MEMCACHE) || as->parms[18].items) +-#else +- if (!(cacheFlags & AFSCALL_INIT_MEMCACHE)) /* ... nor this ... */ +-#endif +- call_syscall(AFSOP_AFSLOG, fullpn_AFSLogFile); +- +- /* + * Give the kernel the names of the AFS files cached on the workstation's + * disk. + */ diff --git a/src/afsd/afsd.c b/src/afsd/afsd.c index 2d98c5f71..05b3032b8 100644 --- a/src/afsd/afsd.c +++ b/src/afsd/afsd.c @@ -47,7 +47,8 @@ * system problems, which can only be ameliorated by changing * NINODE (or equivalent) and rebuilding the kernel. * This option is now disabled. - * -logfile Place where to put the logfile (default in /etc/AFSLog. + * -logfile [OBSOLETE] Place where to put the logfile (default in + * /etc/AFSLog. * -waitclose make close calls always synchronous (slows em down, tho) * -files_per_subdir [n] number of files per cache subdir. (def=2048) * -shutdown Shutdown afs daemons @@ -184,7 +185,6 @@ kern_return_t DiskArbDiskAppearedWithMountpointPing_auto(char *, unsigned int, #define CACHEINFOFILE "cacheinfo" -#define AFSLOGFILE "AFSLog" #define DCACHEFILE "CacheItems" #define VOLINFOFILE "VolumeItems" #define CELLINFOFILE "CellItems" @@ -236,7 +236,6 @@ char confDir[1024]; /*Where the workstation AFS configuration lives */ char fullpn_DCacheFile[1024]; /*Full pathname of DCACHEFILE */ char fullpn_VolInfoFile[1024]; /*Full pathname of VOLINFOFILE */ char fullpn_CellInfoFile[1024]; /*Full pathanem of CELLINFOFILE */ -char fullpn_AFSLogFile[1024]; /*Full pathname of AFSLOGFILE */ char fullpn_CacheInfo[1024]; /*Full pathname of CACHEINFO */ char fullpn_VFile[1024]; /*Full pathname of data cache files */ char *vFilePtr; /*Ptr to the number part of above pathname */ @@ -1441,10 +1440,9 @@ mainproc(as, arock) strcpy(confDir, as->parms[17].items->data); } sprintf(fullpn_CacheInfo, "%s/%s", confDir, CACHEINFOFILE); - sprintf(fullpn_AFSLogFile, "%s/%s", confDir, AFSLOGFILE); if (as->parms[18].items) { /* -logfile */ - strcpy(fullpn_AFSLogFile, as->parms[18].items->data); + printf("afsd: Ignoring obsolete -logfile flag\n"); } if (as->parms[19].items) { /* -waitclose */ @@ -1561,18 +1559,6 @@ mainproc(as, arock) exit(1); } - if ((logfd = fopen(fullpn_AFSLogFile, "r+")) == 0) { - if (afsd_verbose) - printf("%s: Creating '%s'\n", rn, fullpn_AFSLogFile); - if (CreateCacheFile(fullpn_AFSLogFile, NULL)) { - printf - ("%s: Can't create '%s' (You may want to use the -logfile option)\n", - rn, fullpn_AFSLogFile); - exit(1); - } - } else - fclose(logfd); - /* do some random computations in memcache case to get things to work * reasonably no matter which parameters you set. */ @@ -1977,21 +1963,6 @@ mainproc(as, arock) if (!(cacheFlags & AFSCALL_INIT_MEMCACHE)) call_syscall(AFSOP_VOLUMEINFO, fullpn_VolInfoFile); - /* - * Pass the kernel the name of the afs logging file holding the volume - * information. - */ - if (afsd_debug) - printf("%s: Calling AFSOP_AFSLOG: volume info file is '%s'\n", rn, - fullpn_AFSLogFile); -#if defined(AFS_SGI_ENV) - /* permit explicit -logfile argument to enable logging on memcache systems */ - if (!(cacheFlags & AFSCALL_INIT_MEMCACHE) || as->parms[18].items) -#else - if (!(cacheFlags & AFSCALL_INIT_MEMCACHE)) /* ... nor this ... */ -#endif - call_syscall(AFSOP_AFSLOG, fullpn_AFSLogFile); - /* * Give the kernel the names of the AFS files cached on the workstation's * disk.