From 6a0ae3b5f95b3072c6fa9e53f67d3493b5e98031 Mon Sep 17 00:00:00 2001 From: Christof Schmitt Date: Tue, 21 Aug 2018 12:34:34 -0700 Subject: [PATCH] s3:dbwrap_tool: Use cmdline_messaging_context Initialize the messaging context through cmdline_messaging_context to allow access to config in clustered Samba. BUG: https://bugzilla.samba.org/show_bug.cgi?id=13465 Signed-off-by: Christof Schmitt Reviewed-by: Ralph Boehme (cherry picked from commit 7eeff96b826711b5a8d44ab24603dafcc0343d84) --- source3/utils/dbwrap_tool.c | 3 +++ source3/utils/wscript_build | 4 +++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/source3/utils/dbwrap_tool.c b/source3/utils/dbwrap_tool.c index 94aacd8ba26..b182e9cbfab 100644 --- a/source3/utils/dbwrap_tool.c +++ b/source3/utils/dbwrap_tool.c @@ -28,6 +28,7 @@ #include "dbwrap/dbwrap_watch.h" #include "messages.h" #include "util_tdb.h" +#include "cmdline_contexts.h" enum dbwrap_op { OP_FETCH, OP_STORE, OP_DELETE, OP_ERASE, OP_LISTKEYS, OP_EXISTS }; @@ -428,6 +429,8 @@ int main(int argc, const char **argv) while (extra_argv[extra_argc]) extra_argc++; } + cmdline_messaging_context(get_dyn_CONFIGFILE()); + lp_load_global(get_dyn_CONFIGFILE()); if ((extra_argc < 2) || (extra_argc > 5)) { diff --git a/source3/utils/wscript_build b/source3/utils/wscript_build index 6ff34ef482c..42aaf683695 100644 --- a/source3/utils/wscript_build +++ b/source3/utils/wscript_build @@ -135,7 +135,9 @@ bld.SAMBA3_BINARY('dbwrap_tool', source='dbwrap_tool.c', deps=''' talloc - popt_samba3''') + popt_samba3 + cmdline_contexts + ''') bld.SAMBA3_BINARY('dbwrap_torture', source='dbwrap_torture.c',