summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2010-11-04 10:25:30 +1100
committerAndrew Tridgell <tridge@samba.org>2010-11-04 01:48:15 +0000
commitcb9fba1ed387a1a34f866c13a979ee91cd1d6da8 (patch)
treeaecc9b2a916d1a3f80040d5077ff699d3ed99c8f
parent832cd99ea7168df3d07f5e57fb56a8db438dc62a (diff)
downloadsamba-cb9fba1ed387a1a34f866c13a979ee91cd1d6da8.tar.gz
samba-cb9fba1ed387a1a34f866c13a979ee91cd1d6da8.tar.bz2
samba-cb9fba1ed387a1a34f866c13a979ee91cd1d6da8.zip
debug: fixed default debug settings
this fixes -d in our command line tools (eg. samba-tool) Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org> Autobuild-User: Andrew Tridgell <tridge@samba.org> Autobuild-Date: Thu Nov 4 01:48:15 UTC 2010 on sn-devel-104
-rw-r--r--lib/util/debug.c2
-rw-r--r--lib/util/debug.h6
2 files changed, 7 insertions, 1 deletions
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