diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2007-09-27 23:31:28 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 15:07:24 -0500 |
| commit | 3048e9ad654506219b169a934edded388d10fcad (patch) | |
| tree | c1844fe26108014e59c2be927266783b67124e6e /source4/lib | |
| parent | 3ff257b36b9a7adb986f39f66b2c8181b61a29ee (diff) | |
| download | samba-3048e9ad654506219b169a934edded388d10fcad.tar.gz samba-3048e9ad654506219b169a934edded388d10fcad.tar.bz2 samba-3048e9ad654506219b169a934edded388d10fcad.zip | |
r25392: Add loadparm context as argument in a couple more places.
(This used to be commit c62f51cc28a37959128e78a1f34cfd4c6d3ba069)
Diffstat (limited to 'source4/lib')
| -rw-r--r-- | source4/lib/charset/charcnv.c | 2 | ||||
| -rw-r--r-- | source4/lib/cmdline/popt_common.c | 24 | ||||
| -rw-r--r-- | source4/lib/cmdline/popt_credentials.c | 2 |
3 files changed, 14 insertions, 14 deletions
diff --git a/source4/lib/charset/charcnv.c b/source4/lib/charset/charcnv.c index ca96277679..d0c4461cc8 100644 --- a/source4/lib/charset/charcnv.c +++ b/source4/lib/charset/charcnv.c @@ -119,7 +119,7 @@ static smb_iconv_t get_conv_handle(charset_t from, charset_t to) strcasecmp(charset_name(CH_DOS), "ASCII") != 0) { DEBUG(0,("dos charset '%s' unavailable - using ASCII\n", charset_name(CH_DOS))); - lp_set_cmdline("dos charset", "ASCII"); + lp_set_cmdline(global_loadparm, "dos charset", "ASCII"); n1 = charset_name(from); n2 = charset_name(to); diff --git a/source4/lib/cmdline/popt_common.c b/source4/lib/cmdline/popt_common.c index 6f91c3a26a..6e0573e7ef 100644 --- a/source4/lib/cmdline/popt_common.c +++ b/source4/lib/cmdline/popt_common.c @@ -78,14 +78,14 @@ static void popt_common_callback(poptContext con, setup_logging(pname, DEBUG_STDOUT); if (getenv("SMB_CONF_PATH")) { - lp_set_cmdline("config file", getenv("SMB_CONF_PATH")); + lp_set_cmdline(global_loadparm, "config file", getenv("SMB_CONF_PATH")); } return; } switch(opt->val) { case 'd': - lp_set_cmdline("log level", arg); + lp_set_cmdline(global_loadparm, "log level", arg); break; case OPT_DEBUG_STDERR: @@ -98,50 +98,50 @@ static void popt_common_callback(poptContext con, case 'O': if (arg) { - lp_set_cmdline("socket options", arg); + lp_set_cmdline(global_loadparm, "socket options", arg); } break; case 's': if (arg) { - lp_set_cmdline("config file", arg); + lp_set_cmdline(global_loadparm, "config file", arg); } break; case 'l': if (arg) { char *new_logfile = talloc_asprintf(NULL, "%s/log.%s", arg, pname); - lp_set_cmdline("log file", new_logfile); + lp_set_cmdline(global_loadparm, "log file", new_logfile); talloc_free(new_logfile); } break; case 'W': - lp_set_cmdline("workgroup", arg); + lp_set_cmdline(global_loadparm, "workgroup", arg); break; case 'r': - lp_set_cmdline("realm", arg); + lp_set_cmdline(global_loadparm, "realm", arg); break; case 'n': - lp_set_cmdline("netbios name", arg); + lp_set_cmdline(global_loadparm, "netbios name", arg); break; case 'i': - lp_set_cmdline("netbios scope", arg); + lp_set_cmdline(global_loadparm, "netbios scope", arg); break; case 'm': - lp_set_cmdline("client max protocol", arg); + lp_set_cmdline(global_loadparm, "client max protocol", arg); break; case 'R': - lp_set_cmdline("name resolve order", arg); + lp_set_cmdline(global_loadparm, "name resolve order", arg); break; case OPT_OPTION: - if (!lp_set_option(arg)) { + if (!lp_set_option(global_loadparm, arg)) { fprintf(stderr, "Error setting option '%s'\n", arg); exit(1); } diff --git a/source4/lib/cmdline/popt_credentials.c b/source4/lib/cmdline/popt_credentials.c index 9abd7f53d2..b913e6a53a 100644 --- a/source4/lib/cmdline/popt_credentials.c +++ b/source4/lib/cmdline/popt_credentials.c @@ -95,7 +95,7 @@ static void popt_common_credentials_callback(poptContext con, break; case 'S': - lp_set_cmdline("client signing", arg); + lp_set_cmdline(global_loadparm, "client signing", arg); break; case 'P': |