diff options
author | Steve Dickson <steved@redhat.com> | 2012-05-29 14:27:24 -0400 |
---|---|---|
committer | Steve Dickson <steved@redhat.com> | 2012-05-29 14:44:18 -0400 |
commit | 43537ecbc1ab3ae7cefe5d47e7e03b14bf428197 (patch) | |
tree | 2cf7bb4325b9d7693ffaa3d38b103473f52b9cdb | |
parent | 1ca82a963ace17397bd7ec09f5e0707badd7c254 (diff) | |
download | nfs-utils-43537ecbc1ab3ae7cefe5d47e7e03b14bf428197.tar.gz nfs-utils-43537ecbc1ab3ae7cefe5d47e7e03b14bf428197.tar.xz nfs-utils-43537ecbc1ab3ae7cefe5d47e7e03b14bf428197.zip |
nfsidmap: Allow verbosity level to be set in the config file
To make it easier to enable ID mapping debugging, nfsidmap
should read /etc/idmap.conf to see if the verbosity level
is set, similar to what rpc.idmapd does
Signed-off-by: Steve Dickson <steved@redhat.com>
-rw-r--r-- | utils/nfsidmap/nfsidmap.c | 20 |
1 files changed, 19 insertions, 1 deletions
diff --git a/utils/nfsidmap/nfsidmap.c b/utils/nfsidmap/nfsidmap.c index cf11551..b767395 100644 --- a/utils/nfsidmap/nfsidmap.c +++ b/utils/nfsidmap/nfsidmap.c @@ -12,6 +12,7 @@ #include <unistd.h> #include "xlog.h" +#include "conffile.h" int verbose = 0; char *usage="Usage: %s [-v] [-c || [-u|-g|-r key] || [-t timeout] key desc]"; @@ -26,12 +27,27 @@ char *usage="Usage: %s [-v] [-c || [-u|-g|-r key] || [-t timeout] key desc]"; #define DEFAULT_KEYRING "id_resolver" #endif +#ifndef PATH_IDMAPDCONF +#define PATH_IDMAPDCONF "/etc/idmapd.conf" +#endif + static int keyring_clear(char *keyring); #define UIDKEYS 0x1 #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) @@ -266,7 +282,9 @@ int main(int argc, char **argv) break; } } - + if (!verbose) { + verbose = get_config_verbose(PATH_IDMAPDCONF); + } if (keystr) { rc = key_revoke(keystr, keymask); return rc; |