From 0f6c86b201367675e1181cb31bcf5ed249683f9a Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Tue, 12 Jan 2021 11:59:58 +0100 Subject: [PATCH] s3:lib: Migrate smbconftort to new cmdline option parser Signed-off-by: Andreas Schneider Reviewed-by: Andrew Bartlett --- source3/lib/smbconf/testsuite.c | 28 ++++++++++++++++++---------- source3/wscript_build | 2 +- 2 files changed, 19 insertions(+), 11 deletions(-) diff --git a/source3/lib/smbconf/testsuite.c b/source3/lib/smbconf/testsuite.c index 0053f9f042d..fa97a52132a 100644 --- a/source3/lib/smbconf/testsuite.c +++ b/source3/lib/smbconf/testsuite.c @@ -18,7 +18,7 @@ */ #include "includes.h" -#include "popt_common.h" +#include "lib/cmdline/cmdline.h" #include "lib/smbconf/smbconf.h" #include "lib/smbconf/smbconf_init.h" #include "lib/smbconf/smbconf_reg.h" @@ -293,26 +293,34 @@ int main(int argc, const char **argv) struct poptOption long_options[] = { POPT_COMMON_SAMBA + POPT_COMMON_VERSION POPT_TABLEEND }; smb_init_locale(); - setup_logging(argv[0], DEBUG_STDERR); + + ret = samba_cmdline_init(mem_ctx, + SAMBA_CMDLINE_CONFIG_CLIENT, + true /* require_smbconf */); + if (!ret) { + goto done; + } /* parse options */ - pc = poptGetContext("smbconftort", argc, (const char **)argv, - long_options, 0); + pc = samba_popt_get_context(getprogname(), + argc, + (const char **)argv, + long_options, + 0); + if (pc == NULL) { + ret = false; + goto done; + } while(poptGetNextOpt(pc) != -1) { } poptFreeContext(pc); - ret = lp_load_global(get_dyn_CONFIGFILE()); - if (!ret) { - printf("failure: error loading the configuration\n"); - goto done; - } - ret = torture_smbconf(); done: diff --git a/source3/wscript_build b/source3/wscript_build index e756c407f94..8ef11910049 100644 --- a/source3/wscript_build +++ b/source3/wscript_build @@ -1250,7 +1250,7 @@ bld.SAMBA3_BINARY('smbconftort', deps=''' talloc smbconf - popt_samba3 + CMDLINE_S3 ''', for_selftest=True) -- 2.47.3