| Message ID | 1341493903-20835-1-git-send-email-steved@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 07/05/2012 09:11 AM, Steve Dickson wrote: > 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> Committed... steved. > --- > utils/nfsidmap/nfsidmap.c | 20 +++++++------------- > 1 file 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; -- To unsubscribe from this list: send the line "unsubscribe linux-nfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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;
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> --- utils/nfsidmap/nfsidmap.c | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-)