dirpath-canonical-should-be-local-20050819

FIXES 20954

ConstructLocalPath only checks
the first argument (cpath) for needed translation from canonical to
local, but not the relativeTo path, which is simply prepended when
cpath doesn't begin with a '/'.

diff --git a/src/util/dirpath.c b/src/util/dirpath.c
index 188042dbdd9b77cb5ac2ab9e96133ef51bb2c89d..db4aa01ba3cfcb6da5aa9b2c1e29e5a2b00984a5 100644 (file)
--- a/src/util/dirpath.c
+++ b/src/util/dirpath.c
@@ -641,7 +641,7 @@ ConstructLocalPath(const char *cpath, const char *relativeTo,
 int
 ConstructLocalBinPath(const char *cpath, char **fullPathBufp)
 {
-    return ConstructLocalPath(cpath, AFSDIR_CANONICAL_SERVER_BIN_DIRPATH,
+    return ConstructLocalPath(cpath, AFSDIR_SERVER_BIN_DIRPATH,
                              fullPathBufp);
 }
 
@@ -654,6 +654,6 @@ ConstructLocalBinPath(const char *cpath, char **fullPathBufp)
 int
 ConstructLocalLogPath(const char *cpath, char **fullPathBufp)
 {
-    return ConstructLocalPath(cpath, AFSDIR_CANONICAL_SERVER_LOGS_DIRPATH,
+    return ConstructLocalPath(cpath, AFSDIR_SERVER_LOGS_DIRPATH,
                              fullPathBufp);
 }