summaryrefslogtreecommitdiff
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
parenta9dbd73b2f1400347bf9db7b6da2020fb5c11494 (diff)
downloadsamba-4147ad1e98f04627f9072784e69c72cd72ea206c.tar.gz
samba-4147ad1e98f04627f9072784e69c72cd72ea206c.tar.bz2
samba-4147ad1e98f04627f9072784e69c72cd72ea206c.zip
Remove global_loadparm.
-rw-r--r--source4/lib/cmdline/popt_common.c6
-rw-r--r--source4/lib/cmdline/popt_credentials.c2
-rw-r--r--source4/param/loadparm.c2
-rw-r--r--source4/param/param.h2
4 files changed, 2 insertions, 10 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);
diff --git a/source4/param/loadparm.c b/source4/param/loadparm.c
index 79132a388a..766194570c 100644
--- a/source4/param/loadparm.c
+++ b/source4/param/loadparm.c
@@ -228,8 +228,6 @@ struct loadparm_service
};
-struct loadparm_context *global_loadparm = NULL;
-
#define NUMPARAMETERS (sizeof(parm_table) / sizeof(struct parm_struct))
diff --git a/source4/param/param.h b/source4/param/param.h
index 80bb5ff128..ba0dbfd0fa 100644
--- a/source4/param/param.h
+++ b/source4/param/param.h
@@ -71,8 +71,6 @@ struct gensec_settings;
void reload_charcnv(struct loadparm_context *lp_ctx);
-extern _DEPRECATED_ struct loadparm_context *global_loadparm;
-
struct loadparm_service *lp_default_service(struct loadparm_context *lp_ctx);
struct parm_struct *lp_parm_table(void);
int lp_server_role(struct loadparm_context *);