From 3ef5d868931b6757c5d7b91481ae7ab3a311602c Mon Sep 17 00:00:00 2001 From: Sam Hartman Date: Thu, 9 Nov 2000 21:22:21 +0000 Subject: [PATCH] Better dirpath handling for Debian; the code is a mess, but this actually appears to meet FHS --- src/util/dirpath.c | 62 ++++++++++++++++++++++++---------------------- src/util/dirpath.h | 10 +++++--- 2 files changed, 39 insertions(+), 33 deletions(-) diff --git a/src/util/dirpath.c b/src/util/dirpath.c index e5a315316..dd0fa59c8 100644 --- a/src/util/dirpath.c +++ b/src/util/dirpath.c @@ -1,3 +1,6 @@ +/* Changed for Debian by Sam Hartman + * conform to FHS + */ /* * Copyright 2000, International Business Machines Corporation and others. * All Rights Reserved. @@ -57,7 +60,7 @@ static void initDirPathArray(void); strcompose(buf, AFSDIR_PATH_MAX, dirPathArray[AFSDIR_SERVER_AFS_DIRPATH_ID], "/", dir, NULL) #define AFSDIR_SERVER_FILEPATH(buf, dir, file) \ - strcompose(buf, AFSDIR_PATH_MAX, dirPathArray[AFSDIR_SERVER_AFS_DIRPATH_ID], "/", dir, "/", file, NULL) + strcompose(buf, AFSDIR_PATH_MAX, dir, "/", file, NULL) #define AFSDIR_CLIENT_DIRPATH(buf, dir) \ strcompose(buf, AFSDIR_PATH_MAX, dirPathArray[AFSDIR_CLIENT_VICE_DIRPATH_ID], "/", dir, NULL) @@ -168,19 +171,20 @@ static void initDirPathArray(void) strcpy(dirPathArray[AFSDIR_SERVER_AFS_DIRPATH_ID], afsSrvDirPath); pathp = dirPathArray[AFSDIR_SERVER_ETC_DIRPATH_ID]; - AFSDIR_SERVER_DIRPATH(pathp, AFSDIR_ETC_DIR); + strcompose(pathp, AFSDIR_PATH_MAX, "/etc/openafs/server", NULL); pathp = dirPathArray[AFSDIR_SERVER_BIN_DIRPATH_ID]; - AFSDIR_SERVER_DIRPATH(pathp, AFSDIR_BIN_DIR); + strcompose(pathp, AFSDIR_PATH_MAX, "/usr/lib/openafs", NULL); pathp = dirPathArray[AFSDIR_SERVER_CORES_DIRPATH_ID]; - AFSDIR_SERVER_DIRPATH(pathp, AFSDIR_CORES_DIR); + strcompose(pathp, AFSDIR_PATH_MAX, "/var/lib/openafs/cores", NULL); + pathp = dirPathArray[AFSDIR_SERVER_DB_DIRPATH_ID]; - AFSDIR_SERVER_DIRPATH(pathp, AFSDIR_DB_DIR); + strcompose(pathp, AFSDIR_PATH_MAX, "/var/lib/openafs/db", NULL); pathp = dirPathArray[AFSDIR_SERVER_LOGS_DIRPATH_ID]; - AFSDIR_SERVER_DIRPATH(pathp, AFSDIR_LOGS_DIR); + strcompose(pathp, AFSDIR_PATH_MAX, "/var/log/openafs", NULL); pathp = dirPathArray[AFSDIR_SERVER_LOCAL_DIRPATH_ID]; AFSDIR_SERVER_DIRPATH(pathp, AFSDIR_LOCAL_DIR); @@ -204,82 +208,82 @@ static void initDirPathArray(void) /* server file paths */ pathp = dirPathArray[AFSDIR_SERVER_THISCELL_FILEPATH_ID]; - AFSDIR_SERVER_FILEPATH(pathp, AFSDIR_ETC_DIR, AFSDIR_THISCELL_FILE); + AFSDIR_SERVER_FILEPATH(pathp, AFSDIR_CANONICAL_SERVER_ETC_DIRPATH, AFSDIR_THISCELL_FILE); pathp = dirPathArray[AFSDIR_SERVER_CELLSERVDB_FILEPATH_ID]; - AFSDIR_SERVER_FILEPATH(pathp, AFSDIR_ETC_DIR, AFSDIR_CELLSERVDB_FILE); + AFSDIR_SERVER_FILEPATH(pathp, AFSDIR_CANONICAL_SERVER_ETC_DIRPATH, AFSDIR_CELLSERVDB_FILE); pathp = dirPathArray[AFSDIR_SERVER_NOAUTH_FILEPATH_ID]; - AFSDIR_SERVER_FILEPATH(pathp, AFSDIR_LOCAL_DIR, AFSDIR_NOAUTH_FILE); + AFSDIR_SERVER_FILEPATH(pathp, AFSDIR_CANONICAL_SERVER_LOCAL_DIRPATH, AFSDIR_NOAUTH_FILE); pathp = dirPathArray[AFSDIR_SERVER_BUDBLOG_FILEPATH_ID]; - AFSDIR_SERVER_FILEPATH(pathp, AFSDIR_LOGS_DIR, AFSDIR_BUDBLOG_FILE); + AFSDIR_SERVER_FILEPATH(pathp, AFSDIR_CANONICAL_SERVER_LOGS_DIRPATH, AFSDIR_BUDBLOG_FILE); pathp = dirPathArray[AFSDIR_SERVER_TAPECONFIG_FILEPATH_ID]; AFSDIR_SERVER_FILEPATH(pathp, AFSDIR_BACKUP_DIR, AFSDIR_TAPECONFIG_FILE); pathp = dirPathArray[AFSDIR_SERVER_KALOGDB_FILEPATH_ID]; - AFSDIR_SERVER_FILEPATH(pathp, AFSDIR_LOGS_DIR, AFSDIR_KALOGDB_FILE); + AFSDIR_SERVER_FILEPATH(pathp, AFSDIR_CANONICAL_SERVER_LOGS_DIRPATH, AFSDIR_KALOGDB_FILE); pathp = dirPathArray[AFSDIR_SERVER_KALOG_FILEPATH_ID]; - AFSDIR_SERVER_FILEPATH(pathp, AFSDIR_LOGS_DIR, AFSDIR_KALOG_FILE); + AFSDIR_SERVER_FILEPATH(pathp, AFSDIR_CANONICAL_SERVER_LOGS_DIRPATH, AFSDIR_KALOG_FILE); pathp = dirPathArray[AFSDIR_SERVER_KADB_FILEPATH_ID]; - AFSDIR_SERVER_FILEPATH(pathp, AFSDIR_DB_DIR, AFSDIR_KADB_FILE); + AFSDIR_SERVER_FILEPATH(pathp, "/var/lib/openafs/db", AFSDIR_KADB_FILE); pathp = dirPathArray[AFSDIR_SERVER_NTPD_FILEPATH_ID]; AFSDIR_SERVER_FILEPATH(pathp, AFSDIR_BIN_DIR, AFSDIR_NTPD_FILE); pathp = dirPathArray[AFSDIR_SERVER_PRDB_FILEPATH_ID]; - AFSDIR_SERVER_FILEPATH(pathp, AFSDIR_DB_DIR, AFSDIR_PRDB_FILE); + AFSDIR_SERVER_FILEPATH(pathp, "/var/lib/openafs/db", AFSDIR_PRDB_FILE); pathp = dirPathArray[AFSDIR_SERVER_PTLOG_FILEPATH_ID]; - AFSDIR_SERVER_FILEPATH(pathp, AFSDIR_LOGS_DIR, AFSDIR_PTLOG_FILE); + AFSDIR_SERVER_FILEPATH(pathp, AFSDIR_CANONICAL_SERVER_LOGS_DIRPATH, AFSDIR_PTLOG_FILE); pathp = dirPathArray[AFSDIR_SERVER_KCONF_FILEPATH_ID]; - AFSDIR_SERVER_FILEPATH(pathp, AFSDIR_ETC_DIR, AFSDIR_KCONF_FILE); + AFSDIR_SERVER_FILEPATH(pathp, AFSDIR_CANONICAL_SERVER_ETC_DIRPATH, AFSDIR_KCONF_FILE); pathp = dirPathArray[AFSDIR_SERVER_VLDB_FILEPATH_ID]; - AFSDIR_SERVER_FILEPATH(pathp, AFSDIR_DB_DIR, AFSDIR_VLDB_FILE); + AFSDIR_SERVER_FILEPATH(pathp, "/var/lib/openafs/db", AFSDIR_VLDB_FILE); pathp = dirPathArray[AFSDIR_SERVER_VLOG_FILEPATH_ID]; - AFSDIR_SERVER_FILEPATH(pathp, AFSDIR_LOGS_DIR, AFSDIR_VLOG_FILE); + AFSDIR_SERVER_FILEPATH(pathp, AFSDIR_CANONICAL_SERVER_LOGS_DIRPATH, AFSDIR_VLOG_FILE); pathp = dirPathArray[AFSDIR_SERVER_CORELOG_FILEPATH_ID]; - AFSDIR_SERVER_FILEPATH(pathp, AFSDIR_LOGS_DIR, AFSDIR_CORE_FILE); + AFSDIR_SERVER_FILEPATH(pathp, AFSDIR_CANONICAL_SERVER_LOGS_DIRPATH, AFSDIR_CORE_FILE); pathp = dirPathArray[AFSDIR_SERVER_SLVGLOG_FILEPATH_ID]; - AFSDIR_SERVER_FILEPATH(pathp, AFSDIR_LOGS_DIR, AFSDIR_SLVGLOG_FILE); + AFSDIR_SERVER_FILEPATH(pathp, AFSDIR_CANONICAL_SERVER_LOGS_DIRPATH, AFSDIR_SLVGLOG_FILE); pathp = dirPathArray[AFSDIR_SERVER_SALVAGER_FILEPATH_ID]; - AFSDIR_SERVER_FILEPATH(pathp, AFSDIR_BIN_DIR, AFSDIR_SALVAGER_FILE); + AFSDIR_SERVER_FILEPATH(pathp, AFSDIR_CANONICAL_SERVER_BIN_DIRPATH, AFSDIR_SALVAGER_FILE); pathp = dirPathArray[AFSDIR_SERVER_SLVGLOCK_FILEPATH_ID]; - AFSDIR_SERVER_FILEPATH(pathp, AFSDIR_LOCAL_DIR, AFSDIR_SLVGLOCK_FILE); + AFSDIR_SERVER_FILEPATH(pathp, AFSDIR_CANONICAL_SERVER_LOCAL_DIRPATH, AFSDIR_SLVGLOCK_FILE); pathp = dirPathArray[AFSDIR_SERVER_KEY_FILEPATH_ID]; - AFSDIR_SERVER_FILEPATH(pathp, AFSDIR_ETC_DIR, AFSDIR_KEY_FILE); + AFSDIR_SERVER_FILEPATH(pathp, AFSDIR_CANONICAL_SERVER_ETC_DIRPATH, AFSDIR_KEY_FILE); pathp = dirPathArray[AFSDIR_SERVER_ULIST_FILEPATH_ID]; - AFSDIR_SERVER_FILEPATH(pathp, AFSDIR_ETC_DIR, AFSDIR_ULIST_FILE); + AFSDIR_SERVER_FILEPATH(pathp, AFSDIR_CANONICAL_SERVER_ETC_DIRPATH, AFSDIR_ULIST_FILE); pathp = dirPathArray[AFSDIR_SERVER_BOZCONF_FILEPATH_ID]; - AFSDIR_SERVER_FILEPATH(pathp, AFSDIR_LOCAL_DIR, AFSDIR_BOZCONF_FILE); + AFSDIR_SERVER_FILEPATH(pathp, AFSDIR_CANONICAL_SERVER_LOCAL_DIRPATH, AFSDIR_BOZCONF_FILE); pathp = dirPathArray[AFSDIR_SERVER_BOZLOG_FILEPATH_ID]; - AFSDIR_SERVER_FILEPATH(pathp, AFSDIR_LOGS_DIR, AFSDIR_BOZLOG_FILE); + AFSDIR_SERVER_FILEPATH(pathp, AFSDIR_CANONICAL_SERVER_LOGS_DIRPATH, AFSDIR_BOZLOG_FILE); pathp = dirPathArray[AFSDIR_SERVER_BOZINIT_FILEPATH_ID]; - AFSDIR_SERVER_FILEPATH(pathp, AFSDIR_LOCAL_DIR, AFSDIR_BOZINIT_FILE); + AFSDIR_SERVER_FILEPATH(pathp, AFSDIR_CANONICAL_SERVER_LOCAL_DIRPATH, AFSDIR_BOZINIT_FILE); pathp = dirPathArray[AFSDIR_SERVER_BOSVR_FILEPATH_ID]; - AFSDIR_SERVER_FILEPATH(pathp, AFSDIR_BIN_DIR, AFSDIR_BOSVR_FILE); + AFSDIR_SERVER_FILEPATH(pathp, AFSDIR_CANONICAL_SERVER_BIN_DIRPATH, AFSDIR_BOSVR_FILE); pathp = dirPathArray[AFSDIR_SERVER_VOLSERLOG_FILEPATH_ID]; AFSDIR_SERVER_FILEPATH(pathp, AFSDIR_LOGS_DIR, AFSDIR_VOLSERLOG_FILE); pathp = dirPathArray[AFSDIR_SERVER_ROOTVOL_FILEPATH_ID]; - AFSDIR_SERVER_FILEPATH(pathp, AFSDIR_ETC_DIR, AFSDIR_ROOTVOL_FILE); + AFSDIR_SERVER_FILEPATH(pathp, AFSDIR_CANONICAL_SERVER_ETC_DIRPATH, AFSDIR_ROOTVOL_FILE); pathp = dirPathArray[AFSDIR_SERVER_HOSTDUMP_FILEPATH_ID]; AFSDIR_SERVER_FILEPATH(pathp, AFSDIR_LOCAL_DIR, AFSDIR_HOSTDUMP_FILE); diff --git a/src/util/dirpath.h b/src/util/dirpath.h index fc4080076..39d471137 100644 --- a/src/util/dirpath.h +++ b/src/util/dirpath.h @@ -158,17 +158,19 @@ ConstructLocalLogPath(const char *cpath, */ #define AFSDIR_CANONICAL_USR_DIRPATH "/usr" -#define AFSDIR_CANONICAL_SERVER_AFS_DIRPATH "/usr/afs" +#define AFSDIR_CANONICAL_SERVER_AFS_DIRPATH "/etc/openafs" #define AFSDIR_CANONICAL_CLIENT_VICE_DIRPATH "/etc/openafs" #define AFSDIR_CANONICAL_SERVER_BIN_DIRPATH \ -AFSDIR_CANONICAL_SERVER_AFS_DIRPATH "/" AFSDIR_BIN_DIR + "/usr/lib/openafs/" AFSDIR_BIN_DIR #define AFSDIR_CANONICAL_SERVER_ETC_DIRPATH \ -AFSDIR_CANONICAL_SERVER_AFS_DIRPATH "/" AFSDIR_ETC_DIR +AFSDIR_CANONICAL_SERVER_AFS_DIRPATH "/server" #define AFSDIR_CANONICAL_SERVER_LOGS_DIRPATH \ -AFSDIR_CANONICAL_SERVER_AFS_DIRPATH "/" AFSDIR_LOGS_DIR +"/var/log/openafs/" +#define AFSDIR_CANONICAL_SERVER_LOCAL_DIRPATH \ + "/etc/openafs/server-local" #define AFSDIR_CANONICAL_SERVER_SALVAGER_FILEPATH \ AFSDIR_CANONICAL_SERVER_BIN_DIRPATH "/" AFSDIR_SALVAGER_FILE -- 2.39.5