diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2005-06-13 08:12:39 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:18:06 -0500 |
| commit | 2b4791ae733488845b2c36bca64db695203de571 (patch) | |
| tree | e6c3836a90b412e61b10d30f3b256092b46811c7 /source4/torture | |
| parent | 8fd5825a890db4f08966e4b262b03fb7868cc4c2 (diff) | |
| download | samba-2b4791ae733488845b2c36bca64db695203de571.tar.gz samba-2b4791ae733488845b2c36bca64db695203de571.tar.bz2 samba-2b4791ae733488845b2c36bca64db695203de571.zip | |
r7525: Unify lp_load(), load_interfaces and logging setup into popt().
There is now a new --debug-stderr option to enable debug to STDERR.
popt isn't perfect, but the callbacks are used in all the main Samba
binaries, and should be used in the rest. This avoids duplicated
code, and ensures every binary is setup correctly.
This also ensures the setup happens early enough to have -s function,
and have a correct impact on the credentials code. (Fixing a bug that
frustrated tridge earlier today).
The only 'subtle' aspect of all this is that I'm pretty sure that the
SAMBA_COMMON popt code must be above the CREDENTIALS code, in the
popt tables.
Andrew Bartlett
(This used to be commit 50f3c2b3a22971f40e0d3a88127b5120bfc47591)
Diffstat (limited to 'source4/torture')
| -rw-r--r-- | source4/torture/smbiconv.c | 4 | ||||
| -rw-r--r-- | source4/torture/torture.c | 5 |
2 files changed, 0 insertions, 9 deletions
diff --git a/source4/torture/smbiconv.c b/source4/torture/smbiconv.c index 7ca6bb1c12..0cd16278ee 100644 --- a/source4/torture/smbiconv.c +++ b/source4/torture/smbiconv.c @@ -195,10 +195,6 @@ int main(int argc, char *argv[]) while(poptGetNextOpt(pc) != -1); - /* the following functions are part of the Samba debugging - facilities. See lib/debug.c */ - setup_logging("smbiconv", DEBUG_STDOUT); - if (preload_modules[0]) smb_load_modules(preload_modules); if(output) { diff --git a/source4/torture/torture.c b/source4/torture/torture.c index 98519a3797..a2ca9fc72f 100644 --- a/source4/torture/torture.c +++ b/source4/torture/torture.c @@ -2558,8 +2558,6 @@ static void max_runtime_handler(int sig) POPT_TABLEEND }; - setup_logging("smbtorture", DEBUG_STDOUT); - #ifdef HAVE_SETBUFFER setbuffer(stdout, NULL, 0); #endif @@ -2604,9 +2602,6 @@ static void max_runtime_handler(int sig) alarm(max_runtime); } - lp_load(dyn_CONFIGFILE,True,False,False); - load_interfaces(); - smbtorture_init_subsystems; |