From ba39d270dff8e3dd64a537bbca6834f74ba11ccc Mon Sep 17 00:00:00 2001 From: Amitay Isaacs Date: Sat, 6 May 2017 02:08:50 +1000 Subject: [PATCH] ctdb-logging: Initialize DEBUGLEVEL before changing the value BUG: https://bugzilla.samba.org/show_bug.cgi?id=12770 DEBUGLEVEL is defined as a const array reference at compile time. debug_init() converts that to an allocated array reference at run time. Since debug_init() is a static function, initialize DEBUGLEVEL via setup_logging(). Signed-off-by: Amitay Isaacs Reviewed-by: Volker Lendecke Autobuild-User(master): Volker Lendecke Autobuild-Date(master): Mon May 8 00:12:25 CEST 2017 on sn-devel-144 (cherry picked from commit af09a733e953072707cde7df0126652e646970f6) --- ctdb/common/logging.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ctdb/common/logging.c b/ctdb/common/logging.c index 8e547c9..e1b8e7f 100644 --- a/ctdb/common/logging.c +++ b/ctdb/common/logging.c @@ -501,6 +501,8 @@ int logging_init(TALLOC_CTX *mem_ctx, const char *logging, char *str, *name, *option; int ret, i; + setup_logging(app_name, DEBUG_STDERR); + if (debug_level == NULL) { debug_level = getenv("CTDB_DEBUGLEVEL"); } -- 2.9.3