From 2f5f01567b4c30cd764843a1ca0c7ab6d9bc0882 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Wed, 20 Jul 2005 10:07:48 +0000 Subject: 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) --- source4/client/smbmount.c | 4 ++-- source4/client/smbspool.c | 7 +++---- 2 files changed, 5 insertions(+), 6 deletions(-) (limited to 'source4/client') diff --git a/source4/client/smbmount.c b/source4/client/smbmount.c index 77cd04c3c3..b2e6b9677f 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 2703205d7d..21dc5c0e10 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) -- cgit