diff options
| author | Andrew Tridgell <tridge@samba.org> | 2010-07-16 14:32:42 +1000 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2010-07-16 18:24:27 +1000 |
| commit | 6b266b85cf34145ac1f03d8f787b81121e4ec92b (patch) | |
| tree | 9f6faebdcf58c73e0297bfdf3b905ef256f8e478 /source4/lib/cmdline | |
| parent | e4c35c5a09dd66c9280caa39130b7e3b941b7e51 (diff) | |
| download | samba-6b266b85cf34145ac1f03d8f787b81121e4ec92b.tar.gz samba-6b266b85cf34145ac1f03d8f787b81121e4ec92b.tar.bz2 samba-6b266b85cf34145ac1f03d8f787b81121e4ec92b.zip | |
s4-loadparm: 2nd half of lp_ to lpcfg_ conversion
this converts all callers that use the Samba4 loadparm lp_ calling
convention to use the lpcfg_ prefix.
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Diffstat (limited to 'source4/lib/cmdline')
| -rw-r--r-- | source4/lib/cmdline/popt_common.c | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/source4/lib/cmdline/popt_common.c b/source4/lib/cmdline/popt_common.c index 77218290ff..7d9e65d55f 100644 --- a/source4/lib/cmdline/popt_common.c +++ b/source4/lib/cmdline/popt_common.c @@ -66,8 +66,8 @@ static void popt_samba_callback(poptContext con, const char *pname; if (reason == POPT_CALLBACK_REASON_POST) { - if (lp_configfile(cmdline_lp_ctx) == NULL) { - lp_load_default(cmdline_lp_ctx); + if (lpcfg_configfile(cmdline_lp_ctx) == NULL) { + lpcfg_load_default(cmdline_lp_ctx); } /* Hook any 'every Samba program must do this, after * the smb.conf is setup' functions here */ @@ -108,14 +108,14 @@ static void popt_samba_callback(poptContext con, break; case OPT_OPTION: - if (!lp_set_option(cmdline_lp_ctx, arg)) { + if (!lpcfg_set_option(cmdline_lp_ctx, arg)) { fprintf(stderr, "Error setting option '%s'\n", arg); exit(1); } break; case 'd': - lp_set_cmdline(cmdline_lp_ctx, "log level", arg); + lpcfg_set_cmdline(cmdline_lp_ctx, "log level", arg); break; case OPT_DEBUG_STDERR: @@ -124,14 +124,14 @@ static void popt_samba_callback(poptContext con, case 's': if (arg) { - lp_load(cmdline_lp_ctx, arg); + lpcfg_load(cmdline_lp_ctx, arg); } break; case 'l': if (arg) { char *new_logfile = talloc_asprintf(NULL, "%s/log.%s", arg, pname); - lp_set_cmdline(cmdline_lp_ctx, "log file", new_logfile); + lpcfg_set_cmdline(cmdline_lp_ctx, "log file", new_logfile); talloc_free(new_logfile); } break; @@ -152,36 +152,36 @@ static void popt_common_callback(poptContext con, switch(opt->val) { case 'O': if (arg) { - lp_set_cmdline(lp_ctx, "socket options", arg); + lpcfg_set_cmdline(lp_ctx, "socket options", arg); } break; case 'W': - lp_set_cmdline(lp_ctx, "workgroup", arg); + lpcfg_set_cmdline(lp_ctx, "workgroup", arg); break; case 'r': - lp_set_cmdline(lp_ctx, "realm", arg); + lpcfg_set_cmdline(lp_ctx, "realm", arg); break; case 'n': - lp_set_cmdline(lp_ctx, "netbios name", arg); + lpcfg_set_cmdline(lp_ctx, "netbios name", arg); break; case 'i': - lp_set_cmdline(lp_ctx, "netbios scope", arg); + lpcfg_set_cmdline(lp_ctx, "netbios scope", arg); break; case 'm': - lp_set_cmdline(lp_ctx, "client max protocol", arg); + lpcfg_set_cmdline(lp_ctx, "client max protocol", arg); break; case 'R': - lp_set_cmdline(lp_ctx, "name resolve order", arg); + lpcfg_set_cmdline(lp_ctx, "name resolve order", arg); break; case 'S': - lp_set_cmdline(lp_ctx, "client signing", arg); + lpcfg_set_cmdline(lp_ctx, "client signing", arg); break; } |