summaryrefslogtreecommitdiffstats
path: root/source4/client
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2005-07-20 10:07:48 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:29:48 -0500
commit2f5f01567b4c30cd764843a1ca0c7ab6d9bc0882 (patch)
tree52876d17edf8162d20c8da7c1761cd0fbb0e0db1 /source4/client
parent238a7e2f4c46f5bb586bcef36f39e1bf6749c2c1 (diff)
downloadsamba-2f5f01567b4c30cd764843a1ca0c7ab6d9bc0882.tar.gz
samba-2f5f01567b4c30cd764843a1ca0c7ab6d9bc0882.tar.xz
samba-2f5f01567b4c30cd764843a1ca0c7ab6d9bc0882.zip
r8643: - make lp_configfile() work again
- get rid of redundeny dyn_CONFIGFILE argument to lp_load() - fixed provisioning to work with completely pristine install, creating an initial smb.conf is none is present - added lp.set() and lp.reload() to loadparm ejs object interface (This used to be commit c2691ef7126ddcee5f95970b78759b40a049d0a7)
Diffstat (limited to 'source4/client')
-rw-r--r--source4/client/smbmount.c4
-rw-r--r--source4/client/smbspool.c7
2 files changed, 5 insertions, 6 deletions
diff --git a/source4/client/smbmount.c b/source4/client/smbmount.c
index 77cd04c3c32..b2e6b9677f6 100644
--- a/source4/client/smbmount.c
+++ b/source4/client/smbmount.c
@@ -894,9 +894,9 @@ static void parse_mount_smb(int argc, char **argv)
pstrcpy(username,getenv("LOGNAME"));
}
- if (!lp_load(dyn_CONFIGFILE)) {
+ if (!lp_load()) {
fprintf(stderr, "Can't load %s - run testparm to debug it\n",
- dyn_CONFIGFILE);
+ lp_config_file());
}
parse_mount_smb(argc, argv);
diff --git a/source4/client/smbspool.c b/source4/client/smbspool.c
index 2703205d7d2..21dc5c0e108 100644
--- a/source4/client/smbspool.c
+++ b/source4/client/smbspool.c
@@ -177,10 +177,9 @@ static int smb_print(struct smbcli_state *, char *, FILE *);
setup_logging("smbspool", DEBUG_STDOUT);
- if (!lp_load(dyn_CONFIGFILE))
- {
- fprintf(stderr, "ERROR: Can't load %s - run testparm to debug it\n", dyn_CONFIGFILE);
- return (1);
+ if (!lp_load()) {
+ fprintf(stderr, "ERROR: Can't load %s - run testparm to debug it\n", lp_config_file());
+ return (1);
}
if (workgroup == NULL)