jimzah/openafs
1
0
Fork 0
mirror of https://git.openafs.org/openafs.git synced 2025-01-21 00:10:15 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

afsd: Avoid dir interpolation for memcache

Browse Source 
memcache doesn't make use of fullpn_DCacheFile, fullpn_VolInfoFile,
etc. Do not even try to generate these strings for memcache, since
cacheBaseDir will be NULL, and so this can cause a segfault on some
platforms including Solaris.

Change-Id: I0decdb9a8866272adf500125af7edb03c98e6bdc
Reviewed-on: http://gerrit.openafs.org/7442
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Derrick Brashear <shadow@dementix.org>
This commit is contained in:
Andrew Deason 2012-05-21 17:11:29 -05:00 committed by Derrick Brashear
parent 6f6c799c4b
commit 2e2bc535bd
1 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/afsd/afsd.c
View File

@ -2090,23 +2090,25 @@ afsd_run(void)
cacheFiles, inode_for_V, (cacheFiles * sizeof(AFSD_INO_T))); cacheFiles, inode_for_V, (cacheFiles * sizeof(AFSD_INO_T)));
#endif #endif
/* if (!(cacheFlags & AFSCALL_INIT_MEMCACHE)) {
* Set up all the pathnames we'll need for later. /*
*/ * Set up all the pathnames we'll need for later.
sprintf(fullpn_DCacheFile, "%s/%s", cacheBaseDir, DCACHEFILE); */
sprintf(fullpn_VolInfoFile, "%s/%s", cacheBaseDir, VOLINFOFILE); sprintf(fullpn_DCacheFile, "%s/%s", cacheBaseDir, DCACHEFILE);
sprintf(fullpn_CellInfoFile, "%s/%s", cacheBaseDir, CELLINFOFILE); sprintf(fullpn_VolInfoFile, "%s/%s", cacheBaseDir, VOLINFOFILE);
sprintf(fullpn_VFile, "%s/", cacheBaseDir); sprintf(fullpn_CellInfoFile, "%s/%s", cacheBaseDir, CELLINFOFILE);
vFilePtr = fullpn_VFile + strlen(fullpn_VFile); sprintf(fullpn_VFile, "%s/", cacheBaseDir);
vFilePtr = fullpn_VFile + strlen(fullpn_VFile);
if (!(cacheFlags & AFSCALL_INIT_MEMCACHE) fsTypeMsg = CheckCacheBaseDir(cacheBaseDir);
&& (fsTypeMsg = CheckCacheBaseDir(cacheBaseDir))) { if (fsTypeMsg) {
#ifdef AFS_SUN5_ENV #ifdef AFS_SUN5_ENV
printf("%s: WARNING: Cache dir check failed (%s)\n", rn, fsTypeMsg); printf("%s: WARNING: Cache dir check failed (%s)\n", rn, fsTypeMsg);
#else #else
printf("%s: ERROR: Cache dir check failed (%s)\n", rn, fsTypeMsg); printf("%s: ERROR: Cache dir check failed (%s)\n", rn, fsTypeMsg);
exit(1); exit(1);
#endif #endif
}
} }
/* /*