]> git.ipfire.org Git - thirdparty/samba.git/commitdiff
s3:eventlogadm: Use cmdline_messaging_context
authorChristof Schmitt <cs@samba.org>
Mon, 20 Aug 2018 23:21:51 +0000 (16:21 -0700)
committerKarolin Seeger <kseeger@samba.org>
Tue, 9 Oct 2018 09:29:24 +0000 (11:29 +0200)
BUG: https://bugzilla.samba.org/show_bug.cgi?id=13465

Signed-off-by: Christof Schmitt <cs@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
(backported from commit 095123df945270bc51635a19125a7abdfcd4ab80)

source3/utils/eventlogadm.c
source3/utils/wscript_build

index 5ef091a9ae30476c256ddc18d57e7a65cbc7aba1..db874dfae8a70d54006b0ac0bb0f235e0e71e71c 100644 (file)
@@ -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)) {
index acd22f77fbffc45e139c533a3461852e1d6a9d10..6ff34ef482c3d613c895d1876dcea79e283fe49e 100644 (file)
@@ -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',