diff options
| author | Michael Adam <obnox@samba.org> | 2011-07-26 12:46:08 +0200 |
|---|---|---|
| committer | Michael Adam <obnox@samba.org> | 2011-07-28 11:17:29 +0200 |
| commit | f764de64e39f62f84389c9df4f4a55f2ee01f857 (patch) | |
| tree | a183cf30570bb5ba4771d4af86463353ba38aa2f /source3 | |
| parent | 4e41d38df3ad80a379899b611f7e2fac44d42155 (diff) | |
| download | samba-f764de64e39f62f84389c9df4f4a55f2ee01f857.tar.gz | |
s3:libsmb: use lp_load_client() and lp_load_client_no_reinit() in libsmb_context
Diffstat (limited to 'source3')
| -rw-r--r-- | source3/libsmb/libsmb_context.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/source3/libsmb/libsmb_context.c b/source3/libsmb/libsmb_context.c index 766728963b8..978fac902e4 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", |