From 3adabc36875e73fead1b15c7c5eb8f357ad039f7 Mon Sep 17 00:00:00 2001 From: neilbrown Date: Sun, 26 Mar 2006 23:54:16 +0000 Subject: [PATCH 1/1] Set libnfsidmap library debugging level and logging function. This patch adds a call to the new libnfsidmap library function nfs4_set_debug(), which defines the verbosity level libnfsidmap should use as well as the logging function. --- ChangeLog | 7 +++++++ utils/idmapd/idmapd.c | 8 +++++++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index b24b46c..b771721 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2006-03-27 Steve Dickson + Set libnfsidmap library debugging level and logging function. + + This patch adds a call to the new libnfsidmap library function + nfs4_set_debug(), which defines the verbosity level libnfsidmap + should use as well as the logging function. + 2006-03-27 Kevin Coffman Don't close file descriptor until after calling event_del(). diff --git a/utils/idmapd/idmapd.c b/utils/idmapd/idmapd.c index 69396af..ca52c2c 100644 --- a/utils/idmapd/idmapd.c +++ b/utils/idmapd/idmapd.c @@ -287,6 +287,7 @@ main(int argc, char **argv) if (stat(conf_path, &sb) == -1 && (errno == ENOENT || errno == EACCES)) { warn("Skipping configuration file \"%s\"", conf_path); + conf_path = NULL; } else { conf_init(); verbose = conf_get_num("General", "Verbosity", 0); @@ -295,7 +296,6 @@ main(int argc, char **argv) strlcpy(pipefsdir, xpipefsdir, sizeof(pipefsdir)); CONF_SAVE(nobodyuser, conf_get_str("Mapping", "Nobody-User")); CONF_SAVE(nobodygroup, conf_get_str("Mapping", "Nobody-Group")); - nfs4_init_name_mapping(conf_path); } while ((opt = getopt(argc, argv, GETOPTSTR)) != -1) @@ -337,6 +337,12 @@ main(int argc, char **argv) errx(1, "Could not find group \"%s\"", nobodygroup); nobodygid = gr->gr_gid; + nfs4_set_debug(verbose, idmapd_warnx); + if (conf_path == NULL) + conf_path = _PATH_IDMAPDCONF; + if (nfs4_init_name_mapping(conf_path)) + errx(1, "Unable to create name to user id mappings."); + if (!fg) mydaemon(0, 0); -- 2.39.2