[PATCH] Fix bug 13465

[Jeremy Allison]

On Mon, Sep 10, 2018 at 07:31:11AM +0200, Ralph Böhme wrote:
> On Thu, Sep 06, 2018 at 05:54:36PM +0200, Ralph Böhme wrote:
> > On Thu, Aug 30, 2018 at 03:31:42PM -0700, Christof Schmitt wrote:
> > > Yes, i made the change, together with the other requested changes
> > > (commit message update and fixup of pointer initialization). See
> > > attached updated patches.
> > 
> > happy. Pushed. Thanks!
> 
> here's a follow-up patch for s3/smbtorture.
> 
> Please review & push if happy.

Nice catch, thanks. Pushed.

> 
> -- 
> Ralph Boehme, Samba Team       https://samba.org/
> Samba Developer, SerNet GmbH   https://sernet.de/en/samba/
> GPG Key Fingerprint:           FAE2 C608 8A24 2520 51C5
>                               59E4 AA1E 9B71 2639 9E46

> From 2c69be4679d1b3e9aed6ea7f3092bb10e026e39e Mon Sep 17 00:00:00 2001
> From: Ralph Boehme <slow at samba.org>
> Date: Sun, 9 Sep 2018 21:54:04 +0200
> Subject: [PATCH] s3:smbtorture: 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: Ralph Boehme <slow at samba.org>
> ---
>  source3/torture/torture.c | 2 ++
>  source3/wscript_build     | 1 +
>  2 files changed, 3 insertions(+)
> 
> diff --git a/source3/torture/torture.c b/source3/torture/torture.c
> index fe86a27aea9..dc6a9fa7fab 100644
> --- a/source3/torture/torture.c
> +++ b/source3/torture/torture.c
> @@ -45,6 +45,7 @@
>  #include "lib/util/base64.h"
>  #include "lib/util/time.h"
>  #include "lib/crypto/md5.h"
> +#include "cmdline_contexts.h"
>  
>  extern char *optarg;
>  extern int optind;
> @@ -11993,6 +11994,7 @@ static void usage(void)
>  			set_dyn_CONFIGFILE(getenv("SMB_CONF_PATH"));
>  		}
>  	}
> +	cmdline_messaging_context(get_dyn_CONFIGFILE());
>  	lp_load_global(get_dyn_CONFIGFILE());
>  	load_interfaces();
>  
> diff --git a/source3/wscript_build b/source3/wscript_build
> index 95182084fc2..3f95a3fb0f5 100644
> --- a/source3/wscript_build
> +++ b/source3/wscript_build
> @@ -1211,6 +1211,7 @@ bld.SAMBA3_BINARY('smbtorture' + bld.env.suffix3,
>                        idmap
>                        IDMAP_TDB_COMMON
>                        samba-cluster-support
> +                      cmdline_contexts
>                        ''',
>                   cflags='-DWINBINDD_SOCKET_DIR=\"%s\"' % bld.env.WINBINDD_SOCKET_DIR,
>                   install=False)
> -- 
> 2.13.6
>