From bff217cf4a3ea52f9509970ea9bf8520a281eb3e Mon Sep 17 00:00:00 2001 From: Michael Adam Date: Fri, 22 Jul 2011 17:28:46 +0200 Subject: s3:smbspool: use lp_load_client() --- source3/client/smbspool.c | 4 +--- source3/param/loadparm.c | 2 +- 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, -- cgit