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 /support/nfsidmap | |
| parent | ec342d7fecc804e817efba19fddcdab70050ea3e (diff) | |
| download | nfs-utils-8d9bf479441d9d7a44a86b69026a7e9d431d3ade.tar.gz | |
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 'support/nfsidmap')
| -rw-r--r-- | support/nfsidmap/libnfsidmap.c | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/support/nfsidmap/libnfsidmap.c b/support/nfsidmap/libnfsidmap.c index 931387a..40011ee 100644 --- a/support/nfsidmap/libnfsidmap.c +++ b/support/nfsidmap/libnfsidmap.c @@ -89,6 +89,10 @@ gid_t nobody_gid = (gid_t)-1; #define NFS4DNSTXTREC "_nfsv4idmapdomain" #endif +/* DEPRECATED these are for ABI compatibility only */ +char * conf_path = PATH_IDMAPDCONF; +void conf_reinit(void); +void conf_init(void); /* Default logging fuction */ static void default_logger(const char *fmt, ...) @@ -342,7 +346,6 @@ int nfs4_init_name_mapping(char *conffile) char *nobody_user, *nobody_group; char *nostrip; char *reformatgroup; - char *conf_path; /* XXX: need to be able to reload configurations... */ if (nfs4_plugins) /* already succesfully initialized */ @@ -351,7 +354,7 @@ int nfs4_init_name_mapping(char *conffile) conf_path = conffile; else conf_path = PATH_IDMAPDCONF; - conf_init(conf_path); + conf_init_file(conf_path); default_domain = conf_get_str("General", "Domain"); if (default_domain == NULL) { dflt = 1; @@ -710,3 +713,13 @@ void nfs4_set_debug(int dbg_level, void (*logger)(const char *, ...)) idmap_verbosity = dbg_level; } +void conf_reinit(void) +{ + conf_init_file(conf_path); +} + +void conf_init(void) +{ + conf_init_file(conf_path); +} + |