summaryrefslogtreecommitdiff
path: root/source4/lib
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2008-11-02 19:33:34 +0100
committerJelmer Vernooij <jelmer@samba.org>2008-11-02 19:33:34 +0100
commit4147ad1e98f04627f9072784e69c72cd72ea206c (patch)
tree5b38eee0baa6125378d644a4b0bc4af1e257dbe7 /source4/lib
parenta9dbd73b2f1400347bf9db7b6da2020fb5c11494 (diff)
downloadsamba-4147ad1e98f04627f9072784e69c72cd72ea206c.tar.gz
samba-4147ad1e98f04627f9072784e69c72cd72ea206c.tar.bz2
samba-4147ad1e98f04627f9072784e69c72cd72ea206c.zip
Remove global_loadparm.
Diffstat (limited to 'source4/lib')
-rw-r--r--source4/lib/cmdline/popt_common.c6
-rw-r--r--source4/lib/cmdline/popt_credentials.c2
2 files changed, 2 insertions, 6 deletions
diff --git a/source4/lib/cmdline/popt_common.c b/source4/lib/cmdline/popt_common.c
index 563bc0f399..712d99996c 100644
--- a/source4/lib/cmdline/popt_common.c
+++ b/source4/lib/cmdline/popt_common.c
@@ -78,11 +78,7 @@ static void popt_samba_callback(poptContext con,
pname++;
if (reason == POPT_CALLBACK_REASON_PRE) {
- if (global_loadparm != NULL) {
- cmdline_lp_ctx = global_loadparm;
- } else {
- cmdline_lp_ctx = global_loadparm = loadparm_init(talloc_autofree_context());
- }
+ cmdline_lp_ctx = loadparm_init(talloc_autofree_context());
/* Hook for 'almost the first thing to do in a samba program' here */
/* setup for panics */
diff --git a/source4/lib/cmdline/popt_credentials.c b/source4/lib/cmdline/popt_credentials.c
index de5ea7c1b6..42ecac1eaa 100644
--- a/source4/lib/cmdline/popt_credentials.c
+++ b/source4/lib/cmdline/popt_credentials.c
@@ -60,7 +60,7 @@ static void popt_common_credentials_callback(poptContext con,
}
if (reason == POPT_CALLBACK_REASON_POST) {
- cli_credentials_guess(cmdline_credentials, global_loadparm);
+ cli_credentials_guess(cmdline_credentials, cmdline_lp_ctx);
if (!dont_ask) {
cli_credentials_set_cmdline_callbacks(cmdline_credentials);