From 2df6f25f61cc888bc2a8fb3ccab1de37fc4c04b0 Mon Sep 17 00:00:00 2001 From: Derrick Brashear Date: Tue, 3 Nov 2009 19:26:33 -0500 Subject: [PATCH] macos fstrace msgcat search path everything else on osx will look for config in /var/db/openafs; make fstrace do the same Change-Id: I7b787435343b15c82cd8eb8f3ed00096d469e888 Reviewed-on: http://gerrit.openafs.org/772 Tested-by: Derrick Brashear Reviewed-by: Derrick Brashear --- src/util/dirpath.c | 7 ++++++- src/util/dirpath.hin | 1 + 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/util/dirpath.c b/src/util/dirpath.c index ca116b1c7..e388c02ff 100644 --- a/src/util/dirpath.c +++ b/src/util/dirpath.c @@ -241,7 +241,12 @@ initDirPathArray(void) #ifndef AFS_NT40_ENV pathp = dirPathArray[AFSDIR_CLIENT_DATA_DIRPATH_ID]; - AFSDIR_CLIENT_DIRPATH(pathp, AFSDIR_DATA_DIR); +#ifdef AFS_DARWIN_ENV + if (access(AFSDIR_ALTERNATE_CLIENT_DATA_DIR, F_OK) == 0) + AFSDIR_CLIENT_DIRPATH(pathp, AFSDIR_ALTERNATE_CLIENT_DATA_DIR); + else +#endif + AFSDIR_CLIENT_DIRPATH(pathp, AFSDIR_DATA_DIR); #endif /* server file paths */ diff --git a/src/util/dirpath.hin b/src/util/dirpath.hin index db1dd8a4e..805bf442c 100644 --- a/src/util/dirpath.hin +++ b/src/util/dirpath.hin @@ -181,6 +181,7 @@ ConstructLocalLogPath(const char *cpath, #ifdef AFS_DARWIN_ENV #define AFSDIR_ALTERNATE_CLIENT_VICE_DIRPATH "/var/db/openafs" #define AFSDIR_ALTERNATE_CLIENT_ETC_DIR "/var/db/openafs/etc" +#define AFSDIR_ALTERNATE_CLIENT_DATA_DIR "/var/db/openafs/etc" #endif #define AFSDIR_CANONICAL_SERVER_BIN_DIRPATH \ -- 2.39.5