git://git.openafs.org / openafs.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw
no-more-ini-files-20040713
[openafs.git] / src / util / dirpath_nt.h
diff --git a/src/util/dirpath_nt.h b/src/util/dirpath_nt.h
index 76249bd..230e062 100644 (file)
--- a/src/util/dirpath_nt.h
+++ b/src/util/dirpath_nt.h
@@ -69,44 +69,47 @@
 #else /* unices */
 #define AFSDIR_PATH_MAX    _POSIX_PATH_MAX
 #endif
- 
+
 
 /* ---------------------  Exported functions ---------------------- */
 
 
-#define AFSDIR_CLIENT_PATHS_OK 0x1   /* client paths initialized correctly */
-#define AFSDIR_SERVER_PATHS_OK 0x2   /* server paths initialized correctly */
+#define AFSDIR_CLIENT_PATHS_OK 0x1     /* client paths initialized correctly */
+#define AFSDIR_SERVER_PATHS_OK 0x2     /* server paths initialized correctly */
 extern unsigned int initAFSDirPath(void);
 
 extern int
-ConstructLocalPath(const char *cpath,
-                  const char *relativeTo,
-                  char **fullPathBufp);
+  ConstructLocalPath(const char *cpath, const char *relativeTo,
+                    char **fullPathBufp);
 extern int
-ConstructLocalBinPath(const char *cpath,
-                     char **fullPathBufp);
+  ConstructLocalBinPath(const char *cpath, char **fullPathBufp);
 extern int
-ConstructLocalLogPath(const char *cpath,
-                     char **fullPathBufp);
+  ConstructLocalLogPath(const char *cpath, char **fullPathBufp);
 
 
 
 /* -----------------  Directory/file name macros ------------------ */
 
 /* afs installation dir names */
-#define AFSDIR_ETC_DIR   "etc"
-#define AFSDIR_BIN_DIR   "bin"
-#define AFSDIR_CORES_DIR "cores"
-#define AFSDIR_DB_DIR    "db"
-#define AFSDIR_LOGS_DIR  "logs"
-#define AFSDIR_LOCAL_DIR "local"
-#define AFSDIR_BACKUP_DIR "backup"
-#define AFSDIR_MIGR_DIR  "local/migrate"
-#define AFSDIR_BIN_FILE_DIR  "local/migrate/bin_files"
-
-/* file names */ 
+#define AFSDIR_ETC_DIR   "/etc"
+#define AFSDIR_BIN_DIR   "/bin"
+#define AFSDIR_SERVER_ETC_DIR   "/usr/afs/etc"
+#define AFSDIR_SERVER_BIN_DIR   "/usr/afs/bin"
+#define AFSDIR_CLIENT_ETC_DIR   "/usr/afs/etc"
+#define AFSDIR_CORES_DIR "/usr/afs/etc/cores"
+#define AFSDIR_DB_DIR    "/usr/afs/etc/db"
+#define AFSDIR_LOGS_DIR  "/usr/afs/etc/logs"
+#define AFSDIR_LOCAL_DIR "/usr/afs/local"
+#define AFSDIR_BACKUP_DIR "/usr/afs/backup"
+#define AFSDIR_MIGR_DIR  "/usr/afs/local/migrate"
+#define AFSDIR_BIN_FILE_DIR  "/usr/afs/local/migrate/bin_files"
+#define AFSDIR_BOSCONFIG_DIR "/usr/afs/local"
+#define AFSDIR_BOSSERVER_DIR "/usr/afs/bin"
+
+/* file names */
 #define AFSDIR_THISCELL_FILE    "ThisCell"
 #define AFSDIR_CELLSERVDB_FILE  "CellServDB"
+#define AFSDIR_CELLALIAS_FILE   "CellAlias"
 #define AFSDIR_KEY_FILE         "KeyFile"
 #define AFSDIR_ULIST_FILE       "UserList"
 #define AFSDIR_NOAUTH_FILE      "NoAuth"
@@ -142,7 +145,11 @@ ConstructLocalLogPath(const char *cpath,
 #define AFSDIR_FILELOG_FILE     "FileLog"
 #define AFSDIR_MIGRATE_LOGNAME  "wtlog."
 
+#ifdef COMMENT
 #define AFSDIR_CELLSERVDB_FILE_NTCLIENT  "afsdcell.ini"
+#else
+#define AFSDIR_CELLSERVDB_FILE_NTCLIENT  AFSDIR_CELLSERVDB_FILE
+#endif
 
 #define AFSDIR_NETINFO_FILE     "NetInfo"
 #define AFSDIR_NETRESTRICT_FILE "NetRestrict"
@@ -171,11 +178,12 @@ AFSDIR_CANONICAL_SERVER_AFS_DIRPATH "/" AFSDIR_BIN_DIR
 AFSDIR_CANONICAL_SERVER_AFS_DIRPATH "/" AFSDIR_ETC_DIR
 
 #define AFSDIR_CANONICAL_SERVER_LOGS_DIRPATH \
-AFSDIR_CANONICAL_SERVER_AFS_DIRPATH "/" AFSDIR_LOGS_DIR
+AFSDIR_LOGS_DIR
+/* AFSDIR_CANONICAL_SERVER_AFS_DIRPATH "/" AFSDIR_LOGS_DIR */
 
 #define AFSDIR_CANONICAL_SERVER_LOCAL_DIRPATH \
-AFSDIR_CANONICAL_SERVER_AFS_DIRPATH "/" AFSDIR_LOCAL_DIR
-
+AFSDIR_LOCAL_DIR
+/* AFSDIR_CANONICAL_SERVER_AFS_DIRPATH "/" AFSDIR_LOCAL_DIR */
 
 #define AFSDIR_CANONICAL_SERVER_SALVAGER_FILEPATH \
 AFSDIR_CANONICAL_SERVER_BIN_DIRPATH "/" AFSDIR_SALVAGER_FILE
@@ -191,64 +199,66 @@ AFSDIR_CANONICAL_SERVER_LOGS_DIRPATH "/" AFSDIR_SLVGLOG_FILE
  */
 
 /* enums for indexes into the pathname array */
-typedef enum afsdir_id { 
-      AFSDIR_USR_DIRPATH_ID,
-      AFSDIR_SERVER_AFS_DIRPATH_ID,
-      AFSDIR_SERVER_ETC_DIRPATH_ID,
-      AFSDIR_SERVER_BIN_DIRPATH_ID,
-      AFSDIR_SERVER_CORES_DIRPATH_ID,
-      AFSDIR_SERVER_DB_DIRPATH_ID,
-      AFSDIR_SERVER_LOGS_DIRPATH_ID,
-      AFSDIR_SERVER_LOCAL_DIRPATH_ID,
-      AFSDIR_SERVER_BACKUP_DIRPATH_ID,
-      AFSDIR_CLIENT_VICE_DIRPATH_ID,
-      AFSDIR_CLIENT_ETC_DIRPATH_ID,
-      AFSDIR_SERVER_THISCELL_FILEPATH_ID,
-      AFSDIR_SERVER_CELLSERVDB_FILEPATH_ID,
-      AFSDIR_SERVER_NOAUTH_FILEPATH_ID,
-      AFSDIR_SERVER_KEY_FILEPATH_ID,
-      AFSDIR_SERVER_ULIST_FILEPATH_ID,
-      AFSDIR_SERVER_BUDBLOG_FILEPATH_ID,
-      AFSDIR_SERVER_TAPECONFIG_FILEPATH_ID,
-      AFSDIR_SERVER_KALOGDB_FILEPATH_ID,
-      AFSDIR_SERVER_KALOG_FILEPATH_ID,
-      AFSDIR_SERVER_KADB_FILEPATH_ID,
-      AFSDIR_SERVER_NTPD_FILEPATH_ID,
-      AFSDIR_SERVER_PRDB_FILEPATH_ID,
-      AFSDIR_SERVER_PTLOG_FILEPATH_ID,
-      AFSDIR_SERVER_KCONF_FILEPATH_ID,
-      AFSDIR_SERVER_VLDB_FILEPATH_ID,
-      AFSDIR_SERVER_VLOG_FILEPATH_ID,
-      AFSDIR_SERVER_CORELOG_FILEPATH_ID,
-      AFSDIR_SERVER_SLVGLOG_FILEPATH_ID,
-      AFSDIR_SERVER_SALVAGER_FILEPATH_ID,
-      AFSDIR_SERVER_BOZCONF_FILEPATH_ID,
-      AFSDIR_SERVER_BOZCONFNEW_FILEPATH_ID,
-      AFSDIR_SERVER_BOZINIT_FILEPATH_ID,
-      AFSDIR_SERVER_BOZLOG_FILEPATH_ID,
-      AFSDIR_SERVER_BOSVR_FILEPATH_ID,
-      AFSDIR_SERVER_SLVGLOCK_FILEPATH_ID,
-      AFSDIR_SERVER_VOLSERLOG_FILEPATH_ID,
-      AFSDIR_SERVER_ROOTVOL_FILEPATH_ID,
-      AFSDIR_SERVER_HOSTDUMP_FILEPATH_ID,
-      AFSDIR_SERVER_CLNTDUMP_FILEPATH_ID,
-      AFSDIR_SERVER_CBKDUMP_FILEPATH_ID,
-      AFSDIR_SERVER_OLDSYSID_FILEPATH_ID,
-      AFSDIR_SERVER_SYSID_FILEPATH_ID,
-      AFSDIR_SERVER_FILELOG_FILEPATH_ID,
-      AFSDIR_SERVER_AUDIT_FILEPATH_ID,
-      AFSDIR_CLIENT_THISCELL_FILEPATH_ID,
-      AFSDIR_CLIENT_CELLSERVDB_FILEPATH_ID,
-      AFSDIR_CLIENT_NETINFO_FILEPATH_ID,
-      AFSDIR_CLIENT_NETRESTRICT_FILEPATH_ID,
-      AFSDIR_SERVER_NETINFO_FILEPATH_ID,
-      AFSDIR_SERVER_NETRESTRICT_FILEPATH_ID,
-      AFSDIR_SERVER_WEIGHTING_CONSTANTS_FILEPATH_ID,
-      AFSDIR_SERVER_THRESHOLD_CONSTANTS_FILEPATH_ID,
-      AFSDIR_SERVER_MIGRATE_DIRPATH_ID,
-      AFSDIR_SERVER_MIGRATELOG_FILEPATH_ID,
-      AFSDIR_SERVER_BIN_FILE_DIRPATH_ID,
-      AFSDIR_PATHSTRING_MAX } afsdir_id_t;
+typedef enum afsdir_id {
+    AFSDIR_USR_DIRPATH_ID,
+    AFSDIR_SERVER_AFS_DIRPATH_ID,
+    AFSDIR_SERVER_ETC_DIRPATH_ID,
+    AFSDIR_SERVER_BIN_DIRPATH_ID,
+    AFSDIR_SERVER_CORES_DIRPATH_ID,
+    AFSDIR_SERVER_DB_DIRPATH_ID,
+    AFSDIR_SERVER_LOGS_DIRPATH_ID,
+    AFSDIR_SERVER_LOCAL_DIRPATH_ID,
+    AFSDIR_SERVER_BACKUP_DIRPATH_ID,
+    AFSDIR_CLIENT_VICE_DIRPATH_ID,
+    AFSDIR_CLIENT_ETC_DIRPATH_ID,
+    AFSDIR_SERVER_THISCELL_FILEPATH_ID,
+    AFSDIR_SERVER_CELLSERVDB_FILEPATH_ID,
+    AFSDIR_SERVER_NOAUTH_FILEPATH_ID,
+    AFSDIR_SERVER_KEY_FILEPATH_ID,
+    AFSDIR_SERVER_ULIST_FILEPATH_ID,
+    AFSDIR_SERVER_BUDBLOG_FILEPATH_ID,
+    AFSDIR_SERVER_TAPECONFIG_FILEPATH_ID,
+    AFSDIR_SERVER_KALOGDB_FILEPATH_ID,
+    AFSDIR_SERVER_KALOG_FILEPATH_ID,
+    AFSDIR_SERVER_KADB_FILEPATH_ID,
+    AFSDIR_SERVER_NTPD_FILEPATH_ID,
+    AFSDIR_SERVER_PRDB_FILEPATH_ID,
+    AFSDIR_SERVER_PTLOG_FILEPATH_ID,
+    AFSDIR_SERVER_KCONF_FILEPATH_ID,
+    AFSDIR_SERVER_VLDB_FILEPATH_ID,
+    AFSDIR_SERVER_VLOG_FILEPATH_ID,
+    AFSDIR_SERVER_CORELOG_FILEPATH_ID,
+    AFSDIR_SERVER_SLVGLOG_FILEPATH_ID,
+    AFSDIR_SERVER_SALVAGER_FILEPATH_ID,
+    AFSDIR_SERVER_BOZCONF_FILEPATH_ID,
+    AFSDIR_SERVER_BOZCONFNEW_FILEPATH_ID,
+    AFSDIR_SERVER_BOZINIT_FILEPATH_ID,
+    AFSDIR_SERVER_BOZLOG_FILEPATH_ID,
+    AFSDIR_SERVER_BOSVR_FILEPATH_ID,
+    AFSDIR_SERVER_SLVGLOCK_FILEPATH_ID,
+    AFSDIR_SERVER_VOLSERLOG_FILEPATH_ID,
+    AFSDIR_SERVER_ROOTVOL_FILEPATH_ID,
+    AFSDIR_SERVER_HOSTDUMP_FILEPATH_ID,
+    AFSDIR_SERVER_CLNTDUMP_FILEPATH_ID,
+    AFSDIR_SERVER_CBKDUMP_FILEPATH_ID,
+    AFSDIR_SERVER_OLDSYSID_FILEPATH_ID,
+    AFSDIR_SERVER_SYSID_FILEPATH_ID,
+    AFSDIR_SERVER_FILELOG_FILEPATH_ID,
+    AFSDIR_SERVER_AUDIT_FILEPATH_ID,
+    AFSDIR_CLIENT_THISCELL_FILEPATH_ID,
+    AFSDIR_CLIENT_CELLSERVDB_FILEPATH_ID,
+    AFSDIR_CLIENT_NETINFO_FILEPATH_ID,
+    AFSDIR_CLIENT_NETRESTRICT_FILEPATH_ID,
+    AFSDIR_SERVER_NETINFO_FILEPATH_ID,
+    AFSDIR_SERVER_NETRESTRICT_FILEPATH_ID,
+    AFSDIR_SERVER_WEIGHTING_CONSTANTS_FILEPATH_ID,
+    AFSDIR_SERVER_THRESHOLD_CONSTANTS_FILEPATH_ID,
+    AFSDIR_SERVER_MIGRATE_DIRPATH_ID,
+    AFSDIR_SERVER_MIGRATELOG_FILEPATH_ID,
+    AFSDIR_SERVER_BIN_FILE_DIRPATH_ID,
+    AFSDIR_CLIENT_CELLALIAS_FILEPATH_ID,
+    AFSDIR_PATHSTRING_MAX
+} afsdir_id_t;
 
 /* getDirPath() returns a pointer to a string from an internal array of path strings 
  */
@@ -318,7 +328,7 @@ const char *getDirPath(afsdir_id_t string_id);
 
 /* client file paths */
 #define AFSDIR_CLIENT_THISCELL_FILEPATH getDirPath(AFSDIR_CLIENT_THISCELL_FILEPATH_ID)
-#define AFSDIR_CLIENT_CELLSERVDB_FILEPATH getDirPath(AFSDIR_CLIENT_CELLSERVDB_FILEPATH_ID)  
+#define AFSDIR_CLIENT_CELLSERVDB_FILEPATH getDirPath(AFSDIR_CLIENT_CELLSERVDB_FILEPATH_ID)
 #define AFSDIR_CLIENT_NETINFO_FILEPATH getDirPath(AFSDIR_CLIENT_NETINFO_FILEPATH_ID)
 #define AFSDIR_CLIENT_NETRESTRICT_FILEPATH getDirPath(AFSDIR_CLIENT_NETRESTRICT_FILEPATH_ID)
 
OpenAFS Master Repository