sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-26 21:57:41 +03:00
Code

s3:testparm: Use cmdline_messaging_context

Browse Source 
Call cmdline_messaging_context to initialize a messaging config before
accessing clustered Samba config.

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>
This commit is contained in:
Christof Schmitt 2018-08-20 16:11:11 -07:00 committed by Andreas Schneider
parent 4661537c20
commit ea7a4ff7ae
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
source3/utils/testparm.c
View File

@ -35,6 +35,7 @@
#include "system/filesys.h" #include "system/filesys.h"
#include "popt_common.h" #include "popt_common.h"
#include "lib/param/loadparm.h" #include "lib/param/loadparm.h"
#include "cmdline_contexts.h"
#include <regex.h> #include <regex.h>
@ -698,6 +699,8 @@ static void do_per_share_checks(int s)
goto done; goto done;
} }
cmdline_messaging_context(config_file);
fprintf(stderr,"Load smb config files from %s\n",config_file); fprintf(stderr,"Load smb config files from %s\n",config_file);
if (!lp_load_with_registry_shares(config_file)) { if (!lp_load_with_registry_shares(config_file)) {

4
source3/utils/wscript_build
View File

@ -163,7 +163,9 @@ bld.SAMBA3_BINARY('testparm',
deps=''' deps='''
talloc talloc
smbconf smbconf
popt_samba3''') popt_samba3
cmdline_contexts
''')
bld.SAMBA3_BINARY('net', bld.SAMBA3_BINARY('net',
source='''net.c source='''net.c