From cb9fba1ed387a1a34f866c13a979ee91cd1d6da8 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Thu, 4 Nov 2010 10:25:30 +1100 Subject: debug: fixed default debug settings this fixes -d in our command line tools (eg. samba-tool) Pair-Programmed-With: Andrew Bartlett Autobuild-User: Andrew Tridgell Autobuild-Date: Thu Nov 4 01:48:15 UTC 2010 on sn-devel-104 --- lib/util/debug.c | 2 ++ lib/util/debug.h | 6 +++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/lib/util/debug.c b/lib/util/debug.c index 54e7a5fcf6..789abe19c2 100644 --- a/lib/util/debug.c +++ b/lib/util/debug.c @@ -141,10 +141,12 @@ _PUBLIC_ void reopen_logs(void) switch (state.logtype) { case DEBUG_STDOUT: + case DEBUG_DEFAULT_STDOUT: state.fd = 1; break; case DEBUG_STDERR: + case DEBUG_DEFAULT_STDERR: state.fd = 2; break; diff --git a/lib/util/debug.h b/lib/util/debug.h index a62db1a387..055edcb3c4 100644 --- a/lib/util/debug.h +++ b/lib/util/debug.h @@ -79,7 +79,11 @@ extern int DEBUGLEVEL; * for example. This makes it easy to override for debug to stderr on * the command line, as the smb.conf cannot reset it back to * file-based logging */ -enum debug_logtype {DEBUG_DEFAULT_STDERR = 0, DEBUG_STDOUT = 1, DEBUG_FILE = 2, DEBUG_STDERR = 3}; +enum debug_logtype {DEBUG_DEFAULT_STDOUT = 0, + DEBUG_DEFAULT_STDERR, + DEBUG_STDOUT, + DEBUG_FILE, + DEBUG_STDERR}; /** the backend for debug messages. Note that the DEBUG() macro has already -- cgit