From: Andrew Bartlett <abartlet@samba.org>
Date: Mon, 1 Nov 2010 07:42:36 +0000 (+1100)
Subject: debug Explain the behaviour of setup_logging() more clearly
X-Git-Tag: samba-4.0.0alpha14~1432
X-Git-Url: http://git.samba.org/samba.git/?p=sfrench%2Fsamba-autobuild%2F.git;a=commitdiff_plain;h=db2a61ab26f8dab5c9b8f27ae25f9b1ca5fe67b4;hp=4aeb608eca3be67498819000f5eea9ad63e9b7f8

debug Explain the behaviour of setup_logging() more clearly
---

diff --git a/lib/util/debug.c b/lib/util/debug.c
index 5760a709ef5..54e7a5fcf6b 100644
--- a/lib/util/debug.c
+++ b/lib/util/debug.c
@@ -190,7 +190,13 @@ void debug_setup_talloc_log(void)
 
 /**
   control the name of the logfile and whether logging will be to stdout, stderr
-  or a file
+  or a file, and set up syslog
+
+  new_log indicates the destination for the debug log (an enum in
+  order of precedence - once set to DEBUG_FILE, it is not possible to
+  reset to DEBUG_STDOUT 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
 */
 _PUBLIC_ void setup_logging(const char *prog_name, enum debug_logtype new_logtype)
 {
diff --git a/source3/include/debug.h b/source3/include/debug.h
index 6f7baec4619..92fa6e61453 100644
--- a/source3/include/debug.h
+++ b/source3/include/debug.h
@@ -248,8 +248,11 @@ extern bool *DEBUGLEVEL_CLASS_ISSET;
 
 /* The following definitions come from lib/debug.c  */
 
-/* Possible destinations for the debug log (in order of precedence,
- * only a higher value will override a lower value */
+/** Possible destinations for the debug log (in order of precedence -
+ * once set to DEBUG_FILE, it is not possible to reset to DEBUG_STDOUT
+ * 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};
 
 void setup_logging(const char *prog_name, enum debug_logtype new_logtype);
diff --git a/source3/lib/debug.c b/source3/lib/debug.c
index 026616babf5..f9f4cae000b 100644
--- a/source3/lib/debug.c
+++ b/source3/lib/debug.c
@@ -564,6 +564,12 @@ void debug_register_msgs(struct messaging_context *msg_ctx)
 /**
   control the name of the logfile and whether logging will be to stdout, stderr
   or a file, and set up syslog
+
+  new_log indicates the destination for the debug log (an enum in
+  order of precedence - once set to DEBUG_FILE, it is not possible to
+  reset to DEBUG_STDOUT 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
 */
 void setup_logging(const char *prog_name, enum debug_logtype new_logtype)
 {