summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteve Dickson <steved@redhat.com>2012-07-05 08:58:47 -0400
committerSteve Dickson <steved@redhat.com>2012-07-05 15:36:00 -0400
commitfd27c638898010438d404cd17120729ef1d680e2 (patch)
tree61d1d598b8c8f09f5a0253b09c81f8285be807bf
parent8c3d608410c2c8f405fc74d47aa3bcab1933f974 (diff)
downloadnfs-utils-fd27c638898010438d404cd17120729ef1d680e2.zip
nfs-utils-fd27c638898010438d404cd17120729ef1d680e2.tar.gz
nfs-utils-fd27c638898010438d404cd17120729ef1d680e2.tar.xz
nfsidmap: Default domain not being set.
nfsidmap is not calling the nfs4_init_name_mapping() function which initializes the default domain from either the DNS domain or the Domain variable in /etc/idmap.conf Signed-off-by: Steve Dickson <steved@redhat.com>
-rw-r--r--utils/nfsidmap/nfsidmap.c20
1 files changed, 7 insertions, 13 deletions
diff --git a/utils/nfsidmap/nfsidmap.c b/utils/nfsidmap/nfsidmap.c
index b767395..e14543c 100644
--- a/utils/nfsidmap/nfsidmap.c
+++ b/utils/nfsidmap/nfsidmap.c
@@ -37,17 +37,6 @@ static int keyring_clear(char *keyring);
#define GIDKEYS 0x2
/*
- * Check to the config file for the verbosity level
- */
-int
-get_config_verbose(char *path)
-{
- conf_path = path;
- conf_init();
- return conf_get_num("General", "Verbosity", 0);
-}
-
-/*
* Find either a user or group id based on the name@domain string
*/
int id_lookup(char *name_at_domain, key_serial_t key, int type)
@@ -282,9 +271,14 @@ int main(int argc, char **argv)
break;
}
}
- if (!verbose) {
- verbose = get_config_verbose(PATH_IDMAPDCONF);
+
+ if (nfs4_init_name_mapping(PATH_IDMAPDCONF)) {
+ xlog_err("Unable to create name to user id mappings.");
+ return 1;
}
+ if (!verbose)
+ verbose = conf_get_num("General", "Verbosity", 0);
+
if (keystr) {
rc = key_revoke(keystr, keymask);
return rc;