From: Christof Schmitt Date: Mon, 20 Aug 2018 23:21:51 +0000 (-0700) Subject: s3:eventlogadm: Use cmdline_messaging_context X-Git-Tag: samba-4.8.8~153 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=eea0c0d2821bce91036125c8ba7bd841f816c265;p=thirdparty%2Fsamba.git s3:eventlogadm: Use cmdline_messaging_context BUG: https://bugzilla.samba.org/show_bug.cgi?id=13465 Signed-off-by: Christof Schmitt Reviewed-by: Ralph Boehme (backported from commit 095123df945270bc51635a19125a7abdfcd4ab80) --- diff --git a/source3/utils/eventlogadm.c b/source3/utils/eventlogadm.c index 5ef091a9ae3..db874dfae8a 100644 --- a/source3/utils/eventlogadm.c +++ b/source3/utils/eventlogadm.c @@ -30,6 +30,7 @@ #include "registry/reg_util_token.h" #include "registry/reg_backend_db.h" #include "../libcli/registry/util_reg.h" +#include "cmdline_contexts.h" extern int optind; extern char *optarg; @@ -472,6 +473,9 @@ int main( int argc, char *argv[] ) exit( 1 ); } + cmdline_messaging_context(configfile == NULL ? + get_dyn_CONFIGFILE() : configfile); + if ( configfile == NULL ) { lp_load_global(get_dyn_CONFIGFILE()); } else if (!lp_load_global(configfile)) { diff --git a/source3/utils/wscript_build b/source3/utils/wscript_build index acd22f77fbf..6ff34ef482c 100644 --- a/source3/utils/wscript_build +++ b/source3/utils/wscript_build @@ -89,7 +89,8 @@ bld.SAMBA3_BINARY('eventlogadm', deps=''' talloc smbconf - LIBEVENTLOG''') + LIBEVENTLOG + cmdline_contexts''') bld.SAMBA3_BINARY('sharesec', source='sharesec.c ../lib/util_sd.c',