diff options
| author | Garming Sam <garming@catalyst.net.nz> | 2014-02-21 12:54:29 +1300 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2014-05-07 19:49:16 +0200 |
| commit | 8d4821168feeaec7d80fd2432f385bdfd24d26df (patch) | |
| tree | 3e226db7cbd6c503f485125820b7c517489e327e /source3/lib/popt_common.c | |
| parent | b320953660ec2fd62762ce9bdf27f1040a60e28e (diff) | |
| download | samba-8d4821168feeaec7d80fd2432f385bdfd24d26df.tar.gz | |
param: use a single command line set_option in the code
Signed-off-by: Garming Sam <garming@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
Diffstat (limited to 'source3/lib/popt_common.c')
| -rw-r--r-- | source3/lib/popt_common.c | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/source3/lib/popt_common.c b/source3/lib/popt_common.c index 25558091c7d..be13004e6ea 100644 --- a/source3/lib/popt_common.c +++ b/source3/lib/popt_common.c @@ -23,6 +23,7 @@ #include "includes.h" #include "system/filesys.h" #include "popt_common.h" +#include "lib/param/param.h" /* Handle command line options: * -d,--debuglevel @@ -99,12 +100,22 @@ static void popt_common_callback(poptContext con, switch(opt->val) { case OPT_OPTION: - if (!lp_set_option(arg)) { + { + struct loadparm_context *lp_ctx; + + lp_ctx = loadparm_init_s3(talloc_tos(), loadparm_s3_helpers()); + if (lp_ctx == NULL) { + fprintf(stderr, "loadparm_init_s3() failed!\n"); + exit(1); + } + + if (!lpcfg_set_option(lp_ctx, arg)) { fprintf(stderr, "Error setting option '%s'\n", arg); exit(1); } + TALLOC_FREE(lp_ctx); break; - + } case 'd': if (arg) { lp_set_cmdline("log level", arg); |