From 2b4791ae733488845b2c36bca64db695203de571 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Mon, 13 Jun 2005 08:12:39 +0000 Subject: 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) --- source4/torture/torture.c | 5 ----- 1 file changed, 5 deletions(-) (limited to 'source4/torture/torture.c') 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; -- cgit