}
#endif
+ cmd_OpenConfigFile(AFSDIR_CLIENT_CONFIG_FILE_FILEPATH);
+ cmd_SetCommandName("afsd");
+
/* call atoi on the appropriate parsed results */
if (cmd_OptionAsInt(as, OPT_blocks, &cacheBlocks) == 0)
sawCacheBlocks = 1;
if (code)
PT_EXIT(1);
+ cmd_OptionAsString(opts, OPT_config, &configDir);
+
+ cmd_OpenConfigFile(AFSDIR_SERVER_CONFIG_FILE_FILEPATH);
+ cmd_SetCommandName("ptserver");
+
if (cmd_OptionAsList(opts, OPT_access, &list) == 0) {
prp_user_default = prp_access_mask(list->data);
if (list->next == NULL || list->next->data == NULL) {
free(interface);
}
- cmd_OptionAsString(opts, OPT_config, &configDir);
cmd_OptionAsInt(opts, OPT_debug, &LogLevel);
cmd_OptionAsString(opts, OPT_database, &pr_dbaseName);
cmd_OptionAsString(opts, OPT_logfile, &logFile);
pathp = dirPathArray[AFSDIR_SERVER_AUDIT_FILEPATH_ID];
AFSDIR_SERVER_FILEPATH(pathp, AFSDIR_LOCAL_DIR, AFSDIR_AUDIT_FILE);
+ pathp = dirPathArray[AFSDIR_SERVER_CONFIG_FILE_FILEPATH_ID];
+ AFSDIR_CLIENT_FILEPATH(pathp, AFSDIR_SERVER_ETC_DIR,
+ AFSDIR_SERVER_CONFIG_FILE);
+
pathp = dirPathArray[AFSDIR_SERVER_NETINFO_FILEPATH_ID];
AFSDIR_SERVER_FILEPATH(pathp, AFSDIR_LOCAL_DIR, AFSDIR_NETINFO_FILE);
AFSDIR_CLIENT_FILEPATH(pathp, clntEtcDir, AFSDIR_CELLALIAS_FILE);
#endif /* AFS_NT40_ENV */
+ pathp = dirPathArray[AFSDIR_CLIENT_CONFIG_FILE_FILEPATH_ID];
+ AFSDIR_CLIENT_FILEPATH(pathp, clntEtcDir, AFSDIR_CLIENT_CONFIG_FILE);
+
pathp = dirPathArray[AFSDIR_CLIENT_NETINFO_FILEPATH_ID];
AFSDIR_CLIENT_FILEPATH(pathp, clntEtcDir, AFSDIR_NETINFO_FILE);
#define AFSDIR_FSSTATE_FILE "fsstate.dat"
#define AFSDIR_CELLSERVDB_FILE_NTCLIENT "afsdcell.ini"
+#define AFSDIR_CLIENT_CONFIG_FILE "openafs-client.conf"
+#define AFSDIR_SERVER_CONFIG_FILE "openafs-server.conf"
#define AFSDIR_NETINFO_FILE "NetInfo"
#define AFSDIR_NETRESTRICT_FILE "NetRestrict"
AFSDIR_SERVER_SALSRV_FILEPATH_ID,
AFSDIR_SERVER_SALSRVLOG_FILEPATH_ID,
AFSDIR_SERVER_FSSTATE_FILEPATH_ID,
+ AFSDIR_CLIENT_CONFIG_FILE_FILEPATH_ID,
+ AFSDIR_SERVER_CONFIG_FILE_FILEPATH_ID,
AFSDIR_PATHSTRING_MAX } afsdir_id_t;
/* getDirPath() returns a pointer to a string from an internal array of path strings
#define AFSDIR_SERVER_MIGRATELOG_FILEPATH getDirPath(AFSDIR_SERVER_MIGRATELOG_FILEPATH_ID)
#define AFSDIR_SERVER_KRB_EXCL_FILEPATH getDirPath(AFSDIR_SERVER_KRB_EXCL_FILEPATH_ID)
#define AFSDIR_SERVER_FSSTATE_FILEPATH getDirPath(AFSDIR_SERVER_FSSTATE_FILEPATH_ID)
+#define AFSDIR_SERVER_CONFIG_FILE_FILEPATH getDirPath(AFSDIR_SERVER_CONFIG_FILE_FILEPATH_ID)
/* client file paths */
+#define AFSDIR_CLIENT_CONFIG_FILE_FILEPATH getDirPath(AFSDIR_CLIENT_CONFIG_FILE_FILEPATH_ID)
#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_CELLALIAS_FILEPATH getDirPath(AFSDIR_CLIENT_CELLALIAS_FILEPATH_ID)
#else
#define AFSDIR_CELLSERVDB_FILE_NTCLIENT AFSDIR_CELLSERVDB_FILE
#endif
+#define AFSDIR_CLIENT_CONFIG_FILE "openafs-client.conf"
+#define AFSDIR_SERVER_CONFIG_FILE "openafs-server.conf"
#define AFSDIR_NETINFO_FILE "NetInfo"
#define AFSDIR_NETRESTRICT_FILE "NetRestrict"
AFSDIR_SERVER_SALSRV_FILEPATH_ID,
AFSDIR_SERVER_SALSRVLOG_FILEPATH_ID,
AFSDIR_SERVER_FSSTATE_FILEPATH_ID,
+ AFSDIR_CLIENT_CONFIG_FILE_FILEPATH_ID,
+ AFSDIR_SERVER_CONFIG_FILE_FILEPATH_ID,
AFSDIR_PATHSTRING_MAX
} afsdir_id_t;
#define AFSDIR_SERVER_MIGRATELOG_FILEPATH getDirPath(AFSDIR_SERVER_MIGRATELOG_FILEPATH_ID)
#define AFSDIR_SERVER_KRB_EXCL_FILEPATH getDirPath(AFSDIR_SERVER_KRB_EXCL_FILEPATH_ID)
#define AFSDIR_SERVER_FSSTATE_FILEPATH getDirPath(AFSDIR_SERVER_FSSTATE_FILEPATH_ID)
+#define AFSDIR_SERVER_CONFIG_FILE_FILEPATH getDirPath(AFSDIR_SERVER_CONFIG_FILE_FILEPATH_ID)
/* client file paths */
+#define AFSDIR_CLIENT_CONFIG_FILE_FILEPATH getDirPath(AFSDIR_CLIENT_CONFIG_FILE_FILEPATH_ID)
#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_NETINFO_FILEPATH getDirPath(AFSDIR_CLIENT_NETINFO_FILEPATH_ID)
if (code)
return -1;
+ /* XXX - cmd_OptionAsString(opts, OPT_config, &configDir); */
+
+ cmd_OpenConfigFile(AFSDIR_SERVER_CONFIG_FILE_FILEPATH);
+ cmd_SetCommandName("fileserver");
+
if (cmd_OptionPresent(opts, OPT_large)
&& cmd_OptionPresent(opts, OPT_small)) {
printf("Only one of -L or -S must be specified\n");
optstring = NULL;
}
- /* XXX - cmd_OptionAsString(opts, OPT_config, &configDir); */
cmd_OptionAsInt(opts, OPT_debug, &LogLevel);
/* XXX - cmd_OptionAsString(opts, OPT_logfile, &logFile); */
cmd_OptionAsFlag(opts, OPT_mrafslogs, &mrafsStyleLogs);
if (code)
return -1;
+ cmd_OptionAsString(opts, OPT_config, &configDir);
+
+ cmd_OpenConfigFile(AFSDIR_SERVER_CONFIG_FILE_FILEPATH);
+ cmd_SetCommandName("vlserver");
+
/* vlserver options */
cmd_OptionAsFlag(opts, OPT_noauth, &noAuth);
cmd_OptionAsFlag(opts, OPT_smallmem, &smallMem);
free(interface);
}
- cmd_OptionAsString(opts, OPT_config, &configDir);
cmd_OptionAsInt(opts, OPT_debug, &LogLevel);
cmd_OptionAsString(opts, OPT_database, &vl_dbaseName);
cmd_OptionAsString(opts, OPT_logfile, &logFile);