jimzah/openafs
1
0
Fork 0
mirror of https://git.openafs.org/openafs.git synced 2025-01-31 21:47:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

viced: Make the config directory path global

Browse Source 
Store the location of the configuration directory in a global
variable, rather than hardcoding it in multiple locations in the file.
This makes it easier to write unit tests for portions of the fileserver,
and is a step towards producing a fileserver that can be run from
within the test suite.

Change-Id: I0ee1d9bed084472b1e29b9c559a8726f867f91e4
Reviewed-on: http://gerrit.openafs.org/7585
Reviewed-by: Jeffrey Altman <jaltman@secure-endpoints.com>
Reviewed-by: Derrick Brashear <shadow@dementix.org>
Tested-by: Derrick Brashear <shadow@dementix.org>
This commit is contained in:
Simon Wilkinson 2012-06-27 10:51:37 +01:00 committed by Derrick Brashear
parent 7034b980f7
commit 3b45a13a74
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/viced/host.c
View File

@ -61,6 +61,7 @@ extern int LogLevel;
extern struct afsconf_dir *confDir; /* config dir object */
extern int lwps; /* the max number of server threads */
extern afsUUID FS_HostUUID;
extern char *FS_configPath;
afsUUID nulluuid;
int CEs = 0; /* active clients */
@ -266,9 +267,11 @@ hpr_Initialize(struct ubik_client **uclient)
afs_int32 i;
char cellstr[64];
tdir = afsconf_Open(AFSDIR_SERVER_ETC_DIRPATH);
tdir = afsconf_Open(FS_configPath);
if (!tdir) {
ViceLog(0, ("hpr_Initialize: Could not open configuration directory: %s", AFSDIR_SERVER_ETC_DIRPATH));
ViceLog(0,
("hpr_Initialize: Could not open configuration directory: %s",
FS_configPath));
return -1;
}

7
src/viced/viced.c
View File

@ -180,6 +180,7 @@ pthread_key_t viced_uclient_key;
#define ADDRSPERSITE 16 /* Same global is in rx/rx_user.c */
char FS_HostName[128] = "localhost";
char *FS_configPath = NULL;
afs_uint32 FS_HostAddr_NBO;
afs_uint32 FS_HostAddr_HBO;
afs_uint32 FS_HostAddrs[ADDRSPERSITE], FS_HostAddr_cnt = 0, FS_registered = 0;
@ -1835,10 +1836,12 @@ main(int argc, char *argv[])
exit(1);
}
#endif
confDir = afsconf_Open(AFSDIR_SERVER_ETC_DIRPATH);
FS_configPath = strdup(AFSDIR_SERVER_ETC_DIRPATH);
confDir = afsconf_Open(FS_configPath);
if (!confDir) {
fprintf(stderr, "Unable to open config directory %s\n",
AFSDIR_SERVER_ETC_DIRPATH);
FS_configPath);
exit(-1);
}