diff options
author | Andrew Tridgell <tridge@samba.org> | 2005-07-20 10:07:48 +0000 |
---|---|---|
committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:29:48 -0500 |
commit | 2f5f01567b4c30cd764843a1ca0c7ab6d9bc0882 (patch) | |
tree | 52876d17edf8162d20c8da7c1761cd0fbb0e0db1 /source4/torture | |
parent | 238a7e2f4c46f5bb586bcef36f39e1bf6749c2c1 (diff) | |
download | samba-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/torture')
-rw-r--r-- | source4/torture/gentest.c | 2 | ||||
-rw-r--r-- | source4/torture/locktest.c | 2 | ||||
-rw-r--r-- | source4/torture/locktest2.c | 2 | ||||
-rw-r--r-- | source4/torture/masktest.c | 2 | ||||
-rw-r--r-- | source4/torture/msgtest.c | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/source4/torture/gentest.c b/source4/torture/gentest.c index 6adcbbc0fe..8b0e995b44 100644 --- a/source4/torture/gentest.c +++ b/source4/torture/gentest.c @@ -2127,7 +2127,7 @@ static void usage(void) argc -= NSERVERS; argv += NSERVERS; - lp_load(dyn_CONFIGFILE); + lp_load(); load_interfaces(); servers[0].credentials = cli_credentials_init(talloc_autofree_context()); diff --git a/source4/torture/locktest.c b/source4/torture/locktest.c index 62eabeb688..65fadfcc7d 100644 --- a/source4/torture/locktest.c +++ b/source4/torture/locktest.c @@ -476,7 +476,7 @@ static void usage(void) argc -= NSERVERS; argv += NSERVERS; - lp_load(dyn_CONFIGFILE); + lp_load(); load_interfaces(); servers[0] = cli_credentials_init(talloc_autofree_context()); diff --git a/source4/torture/locktest2.c b/source4/torture/locktest2.c index e5cd8a60af..062861a75f 100644 --- a/source4/torture/locktest2.c +++ b/source4/torture/locktest2.c @@ -484,7 +484,7 @@ static void usage(void) argc -= 4; argv += 4; - lp_load(dyn_CONFIGFILE); + lp_load(); load_interfaces(); if (getenv("USER")) { diff --git a/source4/torture/masktest.c b/source4/torture/masktest.c index 4ad280eac7..8b1c0699ee 100644 --- a/source4/torture/masktest.c +++ b/source4/torture/masktest.c @@ -296,7 +296,7 @@ static void usage(void) argc -= 1; argv += 1; - lp_load(dyn_CONFIGFILE); + lp_load(); load_interfaces(); credentials = cli_credentials_init(talloc_autofree_context()); diff --git a/source4/torture/msgtest.c b/source4/torture/msgtest.c index fa47eca1ba..92c62b8e9f 100644 --- a/source4/torture/msgtest.c +++ b/source4/torture/msgtest.c @@ -41,7 +41,7 @@ void pong_message(int msg_type, pid_t src, void *buf, size_t len) setup_logging(argv[0], DEBUG_STDOUT); - lp_load(dyn_CONFIGFILE); + lp_load(); message_init(); |