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 <shadow@dementia.org>
Reviewed-by: Derrick Brashear <shadow@dementia.org>

diff --git a/src/util/dirpath.c b/src/util/dirpath.c
index ca116b1c752df84a1d679c86e5bb0146a1b0bcf7..e388c02ff05e73c06bbb627f6cbe861155e2416b 100644 (file)
--- 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 db1dd8a4e6a4c561edf5382de10301c932b30638..805bf442c61f5c7f903d01bb5f59e87ddd5e109c 100644 (file)
--- 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 \