From d3750f3c3a9e232629c8b634b7b5407114667700 Mon Sep 17 00:00:00 2001 From: Stephen Gallagher Date: Wed, 27 Apr 2011 15:28:07 -0400 Subject: Override config file debug_level with command-line This patch also makes the following changes: 1) The [sssd] debug_level setting no longer acts as a default for all other sections. 2) We will now skip passing the debug argument to the child processes from the master unless the SSSD was run with a command-line argument for the debug level. https://fedorahosted.org/sssd/ticket/764 --- src/util/server.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) (limited to 'src/util/server.c') diff --git a/src/util/server.c b/src/util/server.c index 1e8b148d7..977c75117 100644 --- a/src/util/server.c +++ b/src/util/server.c @@ -444,14 +444,17 @@ int server_setup(const char *name, int flags, return ret; } - /* set debug level if any in conf_entry */ - ret = confdb_get_int(ctx->confdb_ctx, ctx, conf_entry, - CONFDB_SERVICE_DEBUG_LEVEL, - debug_level, &debug_level); - if (ret != EOK) { - DEBUG(0, ("Error reading from confdb (%d) [%s]\n", - ret, strerror(ret))); - return ret; + if (debug_level == SSS_UNRESOLVED_DEBUG_LEVEL) { + /* set debug level if any in conf_entry */ + ret = confdb_get_int(ctx->confdb_ctx, ctx, conf_entry, + CONFDB_SERVICE_DEBUG_LEVEL, + SSS_DEFAULT_DEBUG_LEVEL, + &debug_level); + if (ret != EOK) { + DEBUG(0, ("Error reading from confdb (%d) [%s]\n", + ret, strerror(ret))); + return ret; + } } /* same for debug timestamps */ -- cgit