[SCM] Samba Shared Repository - branch master updated

[Andrew Tridgell]

The branch, master has been updated
       via  cb9fba1 debug: fixed default debug settings
      from  832cd99 Speed test with user objects

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit cb9fba1ed387a1a34f866c13a979ee91cd1d6da8
Author: Andrew Tridgell <tridge at samba.org>
Date:   Thu Nov 4 10:25:30 2010 +1100

    debug: fixed default debug settings
    
    this fixes -d in our command line tools (eg. samba-tool)
    
    Pair-Programmed-With: Andrew Bartlett <abartlet at samba.org>
    
    Autobuild-User: Andrew Tridgell <tridge at samba.org>
    Autobuild-Date: Thu Nov  4 01:48:15 UTC 2010 on sn-devel-104

-----------------------------------------------------------------------

Summary of changes:
 lib/util/debug.c |    2 ++
 lib/util/debug.h |    6 +++++-
 2 files changed, 7 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/lib/util/debug.c b/lib/util/debug.c
index 54e7a5f..789abe1 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 a62db1a..055edcb 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


-- 
Samba Shared Repository