summaryrefslogtreecommitdiff
path: root/source4/gtk/tools
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/gtk/tools
parent238a7e2f4c46f5bb586bcef36f39e1bf6749c2c1 (diff)
downloadsamba-2f5f01567b4c30cd764843a1ca0c7ab6d9bc0882.tar.gz
samba-2f5f01567b4c30cd764843a1ca0c7ab6d9bc0882.tar.bz2
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/gtk/tools')
-rw-r--r--source4/gtk/tools/gepdump.c2
-rw-r--r--source4/gtk/tools/gregedit.c2
-rw-r--r--source4/gtk/tools/gwcrontab.c2
-rw-r--r--source4/gtk/tools/gwsam.c2
4 files changed, 4 insertions, 4 deletions
diff --git a/source4/gtk/tools/gepdump.c b/source4/gtk/tools/gepdump.c
index 23d95152f4..12ca93905d 100644
--- a/source4/gtk/tools/gepdump.c
+++ b/source4/gtk/tools/gepdump.c
@@ -463,7 +463,7 @@ static GtkWidget* create_mainwindow (void)
int main(int argc, char **argv)
{
gepdump_init_subsystems;
- lp_load(dyn_CONFIGFILE);
+ lp_load();
load_interfaces();
setup_logging(argv[0], DEBUG_STDERR);
diff --git a/source4/gtk/tools/gregedit.c b/source4/gtk/tools/gregedit.c
index 27ae925746..5501059c5a 100644
--- a/source4/gtk/tools/gregedit.c
+++ b/source4/gtk/tools/gregedit.c
@@ -977,7 +977,7 @@ int main(int argc, char *argv[])
int ret;
gregedit_init_subsystems;
- lp_load(dyn_CONFIGFILE);
+ lp_load();
load_interfaces();
setup_logging(argv[0], DEBUG_STDERR);
diff --git a/source4/gtk/tools/gwcrontab.c b/source4/gtk/tools/gwcrontab.c
index 5b79eafa0a..c8d8fd6929 100644
--- a/source4/gtk/tools/gwcrontab.c
+++ b/source4/gtk/tools/gwcrontab.c
@@ -495,7 +495,7 @@ static GtkWidget*create_new_job_dialog (void)
int main(int argc, char **argv)
{
gwcrontab_init_subsystems;
- lp_load(dyn_CONFIGFILE);
+ lp_load();
load_interfaces();
setup_logging(argv[0], DEBUG_STDERR);
diff --git a/source4/gtk/tools/gwsam.c b/source4/gtk/tools/gwsam.c
index 8606cc398f..96e405c3a5 100644
--- a/source4/gtk/tools/gwsam.c
+++ b/source4/gtk/tools/gwsam.c
@@ -403,7 +403,7 @@ static GtkWidget* create_mainwindow (void)
int main(int argc, char **argv)
{
gwsam_init_subsystems;
- lp_load(dyn_CONFIGFILE);
+ lp_load();
load_interfaces();
setup_logging(argv[0], DEBUG_STDERR);