From f764de64e39f62f84389c9df4f4a55f2ee01f857 Mon Sep 17 00:00:00 2001 From: Michael Adam Date: Tue, 26 Jul 2011 12:46:08 +0200 Subject: s3:libsmb: use lp_load_client() and lp_load_client_no_reinit() in libsmb_context --- source3/libsmb/libsmb_context.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'source3/libsmb') diff --git a/source3/libsmb/libsmb_context.c b/source3/libsmb/libsmb_context.c index 766728963b..978fac902e 100644 --- a/source3/libsmb/libsmb_context.c +++ b/source3/libsmb/libsmb_context.c @@ -52,13 +52,11 @@ SMBC_module_init(void * punused) /* Here we would open the smb.conf file if needed ... */ - lp_set_in_client(True); - home = getenv("HOME"); if (home) { char *conf = NULL; if (asprintf(&conf, "%s/.smb/smb.conf", home) > 0) { - if (lp_load(conf, True, False, False, True)) { + if (lp_load_client(conf)) { conf_loaded = True; } else { DEBUG(5, ("Could not load config file: %s\n", @@ -76,7 +74,7 @@ SMBC_module_init(void * punused) * defaults ... */ - if (!lp_load(get_dyn_CONFIGFILE(), True, False, False, True)) { + if (!lp_load_client(get_dyn_CONFIGFILE())) { DEBUG(5, ("Could not load config file: %s\n", get_dyn_CONFIGFILE())); } else if (home) { @@ -89,7 +87,7 @@ SMBC_module_init(void * punused) if (asprintf(&conf, "%s/.smb/smb.conf.append", home) > 0) { - if (!lp_load(conf, True, False, False, False)) { + if (!lp_load_client_no_reinit(conf)) { DEBUG(10, ("Could not append config file: " "%s\n", -- cgit