summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorMichael Adam <obnox@samba.org>2011-07-22 17:28:46 +0200
committerMichael Adam <obnox@samba.org>2011-07-28 11:17:27 +0200
commitbff217cf4a3ea52f9509970ea9bf8520a281eb3e (patch)
tree32343f1b6c7451a026081bf439b6c520671cfdd1 /source3
parent0c55a7606fe5ff9a1cf0be13a13a3a657cdd1e53 (diff)
downloadsamba-bff217cf4a3ea52f9509970ea9bf8520a281eb3e.tar.gz
samba-bff217cf4a3ea52f9509970ea9bf8520a281eb3e.tar.bz2
samba-bff217cf4a3ea52f9509970ea9bf8520a281eb3e.zip
s3:smbspool: use lp_load_client()
Diffstat (limited to 'source3')
-rw-r--r--source3/client/smbspool.c4
-rw-r--r--source3/param/loadparm.c2
2 files changed, 2 insertions, 4 deletions
diff --git a/source3/client/smbspool.c b/source3/client/smbspool.c
index e16086dd67..0be8d51878 100644
--- a/source3/client/smbspool.c
+++ b/source3/client/smbspool.c
@@ -245,11 +245,9 @@ main(int argc, /* I - Number of command-line arguments */
setup_logging("smbspool", DEBUG_STDOUT);
- lp_set_in_client(True); /* Make sure that we tell lp_load we are */
-
load_case_tables();
- if (!lp_load(get_dyn_CONFIGFILE(), True, False, False, True)) {
+ if (!lp_load_client(get_dyn_CONFIGFILE())) {
fprintf(stderr, "ERROR: Can't load %s - run testparm to debug it\n", get_dyn_CONFIGFILE());
goto done;
}
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index 3409a34aa2..038032cf48 100644
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -9139,7 +9139,7 @@ bool lp_load_client(const char *file_name)
{
lp_set_in_client(true);
- return lp_load_global_only(file_name);
+ return lp_load_global(file_name);
}
bool lp_load_with_registry_shares(const char *pszFname,