r26355: Eliminate global_loadparm in more places.

(This used to be commit 5d589a0d94bd76a9b4c9fc748854e8098ea43c4d)

4 files changed, 7 insertions, 7 deletions

diff --git a/source4/client/cifsdd.c b/source4/client/cifsdd.c
index 06a5f79ed7..2ce01a2227 100644
--- a/source4/client/cifsdd.c
+++ b/source4/client/cifsdd.c
@@ -574,7 +574,7 @@ int main(int argc, const char ** argv)
 		}
 	}
 
-	gensec_init(global_loadparm);
+	gensec_init(cmdline_lp_ctx);
 	dump_args();
 
 	if (check_arg_numeric("ibs") == 0 || check_arg_numeric("ibs") == 0) {
@@ -595,7 +595,7 @@ int main(int argc, const char ** argv)
 
 	CatchSignal(SIGINT, dd_handle_signal);
 	CatchSignal(SIGUSR1, dd_handle_signal);
-	return(copy_files(global_loadparm));
+	return(copy_files(cmdline_lp_ctx));
 }
 
 /* vim: set sw=8 sts=8 ts=8 tw=79 : */
diff --git a/source4/client/client.c b/source4/client/client.c
index 6842e2e91d..9e031cd09e 100644
--- a/source4/client/client.c
+++ b/source4/client/client.c
@@ -3181,7 +3181,7 @@ static int do_message_op(const char *netbios_name, const char *desthost, const c
 		}
 	}
 
-	gensec_init(global_loadparm);
+	gensec_init(cmdline_lp_ctx);
 
 	if(poptPeekArg(pc)) {
 		char *s = strdup(poptGetArg(pc)); 
@@ -3220,11 +3220,11 @@ static int do_message_op(const char *netbios_name, const char *desthost, const c
 	}
   
 	if (query_host) {
-		return do_host_query(global_loadparm, query_host, lp_workgroup(global_loadparm));
+		return do_host_query(cmdline_lp_ctx, query_host, lp_workgroup(cmdline_lp_ctx));
 	}
 
 	if (message) {
-		return do_message_op(lp_netbios_name(global_loadparm), desthost, dest_ip, name_type, lp_name_resolve_order(global_loadparm), lp_max_xmit(global_loadparm), lp_maxmux(global_loadparm));
+		return do_message_op(lp_netbios_name(cmdline_lp_ctx), desthost, dest_ip, name_type, lp_name_resolve_order(cmdline_lp_ctx), lp_max_xmit(cmdline_lp_ctx), lp_maxmux(cmdline_lp_ctx));
 	}
 	
 
diff --git a/source4/client/smbmount.c b/source4/client/smbmount.c
index 0c1c330104..9ab6c375f2 100644
--- a/source4/client/smbmount.c
+++ b/source4/client/smbmount.c
@@ -897,7 +897,7 @@ static void parse_mount_smb(int argc, char **argv)
 		pstrcpy(username,getenv("LOGNAME"));
 	}
 
-	lp_ctx = global_loadparm = loadparm_init(talloc_autofree_context());
+	lp_ctx = loadparm_init(talloc_autofree_context());
 
 	if (!lp_load(lp_ctx, dyn_CONFIGFILE)) {
 		fprintf(stderr, "Can't load %s - run testparm to debug it\n", 
diff --git a/source4/client/smbspool.c b/source4/client/smbspool.c
index 80a11d5f2d..57050acab8 100644
--- a/source4/client/smbspool.c
+++ b/source4/client/smbspool.c
@@ -177,7 +177,7 @@ static int		smb_print(struct smbcli_state *, char *, FILE *);
 
   setup_logging(argv[0], DEBUG_STDOUT);
 
-  global_loadparm = lp_ctx = loadparm_init(talloc_autofree_context());
+  lp_ctx = loadparm_init(talloc_autofree_context());
 
   if (!lp_load(lp_ctx, dyn_CONFIGFILE)) {
 	  fprintf(stderr, "ERROR: Can't load %s - run testparm to debug it\n", lp_config_file());