diff options
Diffstat (limited to 'utils')
| -rw-r--r-- | utils/blkmapd/device-discovery.c | 2 | ||||
| -rw-r--r-- | utils/exportfs/exportfs.c | 2 | ||||
| -rw-r--r-- | utils/gssd/gssd.c | 2 | ||||
| -rw-r--r-- | utils/idmapd/idmapd.c | 6 | ||||
| -rw-r--r-- | utils/mount/mount_config.h | 2 | ||||
| -rw-r--r-- | utils/mountd/mountd.c | 2 | ||||
| -rw-r--r-- | utils/nfsd/nfsd.c | 2 | ||||
| -rw-r--r-- | utils/nfsdcltrack/nfsdcltrack.c | 2 | ||||
| -rw-r--r-- | utils/statd/sm-notify.c | 2 | ||||
| -rw-r--r-- | utils/statd/statd.c | 2 |
10 files changed, 12 insertions, 12 deletions
diff --git a/utils/blkmapd/device-discovery.c b/utils/blkmapd/device-discovery.c index 29bafb2..cae8c8d 100644 --- a/utils/blkmapd/device-discovery.c +++ b/utils/blkmapd/device-discovery.c @@ -456,7 +456,7 @@ int main(int argc, char **argv) char *xrpcpipe_dir = NULL; strncpy(rpcpipe_dir, RPCPIPE_DIR, sizeof(rpcpipe_dir)); - conf_init(NFS_CONFFILE); + conf_init_file(NFS_CONFFILE); CONF_SAVE(xrpcpipe_dir, conf_get_str("general", "pipefs-directory")); if (xrpcpipe_dir != NULL) strlcpy(rpcpipe_dir, xrpcpipe_dir, sizeof(rpcpipe_dir)); diff --git a/utils/exportfs/exportfs.c b/utils/exportfs/exportfs.c index beed1b3..448f195 100644 --- a/utils/exportfs/exportfs.c +++ b/utils/exportfs/exportfs.c @@ -107,7 +107,7 @@ main(int argc, char **argv) xlog_stderr(1); xlog_syslog(0); - conf_init(NFS_CONFFILE); + conf_init_file(NFS_CONFFILE); xlog_from_conffile("exportfs"); /* NOTE: following uses "mountd" section of nfs.conf !!!! */ diff --git a/utils/gssd/gssd.c b/utils/gssd/gssd.c index 053a223..2c14e5f 100644 --- a/utils/gssd/gssd.c +++ b/utils/gssd/gssd.c @@ -842,7 +842,7 @@ read_gss_conf(void) { char *s; - conf_init(NFS_CONFFILE); + conf_init_file(NFS_CONFFILE); use_memcache = conf_get_bool("gssd", "use-memcache", use_memcache); root_uses_machine_creds = conf_get_bool("gssd", "use-machine-creds", root_uses_machine_creds); diff --git a/utils/idmapd/idmapd.c b/utils/idmapd/idmapd.c index 4cbe148..2b9ecea 100644 --- a/utils/idmapd/idmapd.c +++ b/utils/idmapd/idmapd.c @@ -252,7 +252,7 @@ main(int argc, char **argv) warn("Skipping configuration file \"%s\"", conf_path); conf_path = NULL; } else { - conf_init(conf_path); + conf_init_file(conf_path); verbose = conf_get_num("General", "Verbosity", 0); cache_entry_expiration = conf_get_num("General", "Cache-Expiration", DEFAULT_IDMAP_CACHE_EXPIRY); @@ -264,13 +264,13 @@ main(int argc, char **argv) } } else { conf_path = NFS_CONFFILE; - conf_init(conf_path); + conf_init_file(conf_path); CONF_SAVE(xpipefsdir, conf_get_str("General", "Pipefs-Directory")); if (xpipefsdir != NULL) strlcpy(pipefsdir, xpipefsdir, sizeof(pipefsdir)); conf_path = _PATH_IDMAPDCONF; - conf_init(conf_path); + conf_init_file(conf_path); verbose = conf_get_num("General", "Verbosity", 0); cache_entry_expiration = conf_get_num("General", "cache-expiration", DEFAULT_IDMAP_CACHE_EXPIRY); diff --git a/utils/mount/mount_config.h b/utils/mount/mount_config.h index e4f8511..7cc72fc 100644 --- a/utils/mount/mount_config.h +++ b/utils/mount/mount_config.h @@ -32,7 +32,7 @@ static inline void mount_config_init(char *program) /* * Read the the default mount options */ - conf_init(MOUNTOPTS_CONFFILE); + conf_init_file(MOUNTOPTS_CONFFILE); } static inline char *mount_config_opts(char *spec, diff --git a/utils/mountd/mountd.c b/utils/mountd/mountd.c index 829f803..4c68702 100644 --- a/utils/mountd/mountd.c +++ b/utils/mountd/mountd.c @@ -679,7 +679,7 @@ main(int argc, char **argv) else progname = argv[0]; - conf_init(NFS_CONFFILE); + conf_init_file(NFS_CONFFILE); xlog_from_conffile("mountd"); manage_gids = conf_get_bool("mountd", "manage-gids", manage_gids); descriptors = conf_get_num("mountd", "descriptors", descriptors); diff --git a/utils/nfsd/nfsd.c b/utils/nfsd/nfsd.c index f973203..f41a2de 100644 --- a/utils/nfsd/nfsd.c +++ b/utils/nfsd/nfsd.c @@ -80,7 +80,7 @@ main(int argc, char **argv) xlog_syslog(0); xlog_stderr(1); - conf_init(NFS_CONFFILE); + conf_init_file(NFS_CONFFILE); xlog_from_conffile("nfsd"); count = conf_get_num("nfsd", "threads", count); grace = conf_get_num("nfsd", "grace-time", grace); diff --git a/utils/nfsdcltrack/nfsdcltrack.c b/utils/nfsdcltrack/nfsdcltrack.c index 7830cf4..76b06d2 100644 --- a/utils/nfsdcltrack/nfsdcltrack.c +++ b/utils/nfsdcltrack/nfsdcltrack.c @@ -564,7 +564,7 @@ main(int argc, char **argv) xlog_syslog(1); xlog_stderr(0); - conf_init(NFS_CONFFILE); + conf_init_file(NFS_CONFFILE); xlog_from_conffile("nfsdcltrack"); val = conf_get_str("nfsdcltrack", "storagedir"); if (val) diff --git a/utils/statd/sm-notify.c b/utils/statd/sm-notify.c index d961dc0..6d19ec1 100644 --- a/utils/statd/sm-notify.c +++ b/utils/statd/sm-notify.c @@ -494,7 +494,7 @@ main(int argc, char **argv) else progname = argv[0]; - conf_init(NFS_CONFFILE); + conf_init_file(NFS_CONFFILE); xlog_from_conffile("sm-notify"); opt_max_retry = conf_get_num("sm-notify", "retry-time", opt_max_retry / 60) * 60; opt_srcport = conf_get_str("sm-notify", "outgoing-port"); diff --git a/utils/statd/statd.c b/utils/statd/statd.c index 1443715..197d853 100644 --- a/utils/statd/statd.c +++ b/utils/statd/statd.c @@ -273,7 +273,7 @@ int main (int argc, char **argv) /* Set hostname */ MY_NAME = NULL; - conf_init(NFS_CONFFILE); + conf_init_file(NFS_CONFFILE); xlog_from_conffile("statd"); out_port = conf_get_num("statd", "outgoing-port", out_port); port = conf_get_num("statd", "port", port); |