From c392f642ba68bcb5a90ff55f2df477a7e75a08ec Mon Sep 17 00:00:00 2001 From: Christof Schmitt Date: Mon, 20 Aug 2018 16:18:20 -0700 Subject: [PATCH] s3: ntlm_auth: Use cmdline_messaging_context Call cmdline_messaging_context to initialize the messaging context before accessing clustered Samba config. BUG: https://bugzilla.samba.org/show_bug.cgi?id=13465 Signed-off-by: Christof Schmitt Reviewed-by: Ralph Boehme (cherry picked from commit 9ed617474f588ceb42c8929ee8a51071a408c219) --- source3/utils/ntlm_auth.c | 3 +++ source3/utils/wscript_build | 1 + 2 files changed, 4 insertions(+) diff --git a/source3/utils/ntlm_auth.c b/source3/utils/ntlm_auth.c index 8f77680416f..78e189a932f 100644 --- a/source3/utils/ntlm_auth.c +++ b/source3/utils/ntlm_auth.c @@ -47,6 +47,7 @@ #include "nsswitch/libwbclient/wbclient.h" #include "lib/param/loadparm.h" #include "lib/util/base64.h" +#include "cmdline_contexts.h" #if HAVE_KRB5 #include "auth/kerberos/pac_utils.h" @@ -2364,6 +2365,8 @@ enum { poptFreeContext(pc); + cmdline_messaging_context(get_dyn_CONFIGFILE()); + if (!lp_load_global(get_dyn_CONFIGFILE())) { d_fprintf(stderr, "ntlm_auth: error opening config file %s. Error was %s\n", get_dyn_CONFIGFILE(), strerror(errno)); diff --git a/source3/utils/wscript_build b/source3/utils/wscript_build index b0ea6964023..acd22f77fbf 100644 --- a/source3/utils/wscript_build +++ b/source3/utils/wscript_build @@ -127,6 +127,7 @@ bld.SAMBA3_BINARY('ntlm_auth', tiniparser libsmb popt_samba3 + cmdline_contexts gse gensec''') bld.SAMBA3_BINARY('dbwrap_tool', -- 2.47.2