diff options
| author | Justin Mitchell <jumitche@redhat.com> | 2017-10-26 08:46:43 -0400 |
|---|---|---|
| committer | Steve Dickson <steved@redhat.com> | 2017-10-26 08:50:08 -0400 |
| commit | f821eb7f9624f047a12fbf5c9dce23994eeb50e8 (patch) | |
| tree | dc7cf0bc359fb6c7b599aa86a33d6f9a17024a81 /support/nfsidmap/libnfsidmap.c | |
| parent | 1ea6d9231f839b968adb44eaf98b363f436cb1d5 (diff) | |
| download | nfs-utils-f821eb7f9624f047a12fbf5c9dce23994eeb50e8.tar.gz nfs-utils-f821eb7f9624f047a12fbf5c9dce23994eeb50e8.tar.xz nfs-utils-f821eb7f9624f047a12fbf5c9dce23994eeb50e8.zip | |
nfs-utils: integrate libnfsidmap code with rest of nfs-utils
Modify libnfsidmap to use the now shared conffile code,
adjust the build structure to generate everything correctly,
and modify the other utils to use the merged version of libnfsidmap
instead of testing for an external dependancy.
Signed-off-by: Justin Mitchell <jumitche@redhat.com>
Signed-off-by: Steve Dickson <steved@redhat.com>
Diffstat (limited to 'support/nfsidmap/libnfsidmap.c')
| -rw-r--r-- | support/nfsidmap/libnfsidmap.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/support/nfsidmap/libnfsidmap.c b/support/nfsidmap/libnfsidmap.c index d484101..aa368b7 100644 --- a/support/nfsidmap/libnfsidmap.c +++ b/support/nfsidmap/libnfsidmap.c @@ -59,7 +59,7 @@ #include "nfsidmap.h" #include "nfsidmap_internal.h" -#include "cfg.h" +#include "conffile.h" static char *default_domain; static struct conf_list *local_realms; @@ -340,6 +340,7 @@ 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 */ @@ -348,7 +349,7 @@ int nfs4_init_name_mapping(char *conffile) conf_path = conffile; else conf_path = PATH_IDMAPDCONF; - conf_init(); + conf_init(conf_path); default_domain = conf_get_str("General", "Domain"); if (default_domain == NULL) { dflt = 1; |