diff options
| author | Justin Mitchell <jumitche@redhat.com> | 2017-11-07 09:28:25 -0500 |
|---|---|---|
| committer | Steve Dickson <steved@redhat.com> | 2017-11-07 09:28:25 -0500 |
| commit | 8d9bf479441d9d7a44a86b69026a7e9d431d3ade (patch) | |
| tree | 8756dc065dda8e3f9190f9920638e5370da189e7 /utils/idmapd | |
| parent | ec342d7fecc804e817efba19fddcdab70050ea3e (diff) | |
| download | nfs-utils-8d9bf479441d9d7a44a86b69026a7e9d431d3ade.tar.gz nfs-utils-8d9bf479441d9d7a44a86b69026a7e9d431d3ade.tar.xz nfs-utils-8d9bf479441d9d7a44a86b69026a7e9d431d3ade.zip | |
nfs-utils: Restore ABI compat with pre-merge libnfsidmap
Prior to merge libnfsidmap leaked many private symbols that were
not defined in its API, creating an accidental ABI.
This patch renames and unhides symbols in order to match that ABI
until a cleaned up API can be established and released.
Signed-off-by: Steve Dickson <steved@redhat.com>
Diffstat (limited to 'utils/idmapd')
| -rw-r--r-- | utils/idmapd/idmapd.c | 6 |
1 files changed, 3 insertions, 3 deletions
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); |