From: Derrick Brashear <shadow@dementia.org>
Date: Wed, 4 Nov 2009 00:26:33 +0000 (-0500)
Subject: macos fstrace msgcat search path
X-Git-Tag: openafs-devel-1_5_67~84
X-Git-Url: https://git.openafs.org/?p=openafs.git;a=commitdiff_plain;h=2df6f25f61cc888bc2a8fb3ccab1de37fc4c04b0

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 ca116b1..e388c02 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 db1dd8a..805bf44 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 \