[SCM] Samba Shared Repository - branch master updated

[Björn Jacke]

The branch, master has been updated
       via  cd36a3e lib/param: sync debug related options with source3/param
       via  5f93822 lib/ldb-samba: only debug LDB_DEBUG_TRACE at level 10
       via  8e0752f lib/ldb-samba: make use of DBGC_LDB
       via  baecc86 lib/util: add 'ldb' debug class
      from  e6f79b9 tevent: document tevent_req_create state zeroing

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


- Log -----------------------------------------------------------------
commit cd36a3e902813c065e14059d325f7628b06595aa
Author: Stefan Metzmacher <metze at samba.org>
Date:   Thu Jul 4 18:11:02 2013 +0200

    lib/param: sync debug related options with source3/param
    
    The most important change is "debug hires timestamp = Yes"
    and "syslog = 1".
    
    Signed-off-by: Stefan Metzmacher <metze at samba.org>
    Reviewed-by: Björn Jacke <bj at sernet.de>
    
    Autobuild-User(master): Björn Jacke <bj at sernet.de>
    Autobuild-Date(master): Tue Jul  9 17:15:15 CEST 2013 on sn-devel-104

commit 5f93822ede7ec3dc79a8057174342b2c6bb94a3b
Author: Stefan Metzmacher <metze at samba.org>
Date:   Tue Jul 9 13:56:35 2013 +0200

    lib/ldb-samba: only debug LDB_DEBUG_TRACE at level 10
    
    Signed-off-by: Stefan Metzmacher <metze at samba.org>
    Reviewed-by: Björn Jacke <bj at sernet.de>

commit 8e0752f4d6feea35304377222d3dd487355e4120
Author: Stefan Metzmacher <metze at samba.org>
Date:   Tue Jul 9 13:56:08 2013 +0200

    lib/ldb-samba: make use of DBGC_LDB
    
    Signed-off-by: Stefan Metzmacher <metze at samba.org>
    Reviewed-by: Björn Jacke <bj at sernet.de>

commit baecc863de0ceb64187c6eb3545bf28706bd84fc
Author: Stefan Metzmacher <metze at samba.org>
Date:   Tue Jul 9 13:55:44 2013 +0200

    lib/util: add 'ldb' debug class
    
    Signed-off-by: Stefan Metzmacher <metze at samba.org>
    Reviewed-by: Björn Jacke <bj at sernet.de>

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

Summary of changes:
 lib/ldb-samba/ldb_wrap.c |    4 +++-
 lib/param/loadparm.c     |   18 +++++++++++++++++-
 lib/util/debug.c         |    1 +
 lib/util/debug.h         |    3 ++-
 4 files changed, 23 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/lib/ldb-samba/ldb_wrap.c b/lib/ldb-samba/ldb_wrap.c
index 028bd6f..65956ef 100644
--- a/lib/ldb-samba/ldb_wrap.c
+++ b/lib/ldb-samba/ldb_wrap.c
@@ -37,6 +37,8 @@
 #include "../lib/util/dlinklist.h"
 #include <tdb.h>
 
+#define DBGC_CLASS DBGC_LDB
+
 /*
   this is used to catch debug messages from ldb
 */
@@ -58,7 +60,7 @@ static void ldb_wrap_debug(void *context, enum ldb_debug_level level,
 		samba_level = 2;
 		break;
 	case LDB_DEBUG_TRACE:
-		samba_level = 5;
+		samba_level = 10;
 		break;
 
 	};
diff --git a/lib/param/loadparm.c b/lib/param/loadparm.c
index 310f95a..455c5e6 100644
--- a/lib/param/loadparm.c
+++ b/lib/param/loadparm.c
@@ -2083,6 +2083,15 @@ struct loadparm_context *loadparm_init(TALLOC_CTX *mem_ctx)
 
 	lpcfg_do_global_parameter(lp_ctx, "log level", "0");
 
+	lpcfg_do_global_parameter(lp_ctx, "syslog", "1");
+	lpcfg_do_global_parameter(lp_ctx, "syslog only", "No");
+	lpcfg_do_global_parameter(lp_ctx, "debug timestamp", "Yes");
+	lpcfg_do_global_parameter(lp_ctx, "debug prefix timestamp", "No");
+	lpcfg_do_global_parameter(lp_ctx, "debug hires timestamp", "Yes");
+	lpcfg_do_global_parameter(lp_ctx, "debug pid", "No");
+	lpcfg_do_global_parameter(lp_ctx, "debug uid", "No");
+	lpcfg_do_global_parameter(lp_ctx, "debug class", "No");
+
 	lpcfg_do_global_parameter(lp_ctx, "share backend", "classic");
 
 	lpcfg_do_global_parameter(lp_ctx, "server role", "auto");
@@ -2302,7 +2311,14 @@ static bool lpcfg_update(struct loadparm_context *lp_ctx)
 	ZERO_STRUCT(settings);
 	/* Add any more debug-related smb.conf parameters created in
 	 * future here */
-	settings.timestamp_logs = true;
+	settings.syslog = lp_ctx->globals->syslog;
+	settings.syslog_only = lp_ctx->globals->bSyslogOnly;
+	settings.timestamp_logs = lp_ctx->globals->bTimestampLogs;
+	settings.debug_prefix_timestamp = lp_ctx->globals->bDebugPrefixTimestamp;
+	settings.debug_hires_timestamp = lp_ctx->globals->bDebugHiresTimestamp;
+	settings.debug_pid = lp_ctx->globals->bDebugPid;
+	settings.debug_uid = lp_ctx->globals->bDebugUid;
+	settings.debug_class = lp_ctx->globals->bDebugClass;
 	debug_set_settings(&settings);
 
 	/* FIXME: This is a bit of a hack, but we can't use a global, since 
diff --git a/lib/util/debug.c b/lib/util/debug.c
index 34aa76f..a46b275 100644
--- a/lib/util/debug.c
+++ b/lib/util/debug.c
@@ -178,6 +178,7 @@ static const char *default_classname_table[] = {
 	"registry",          /* DBGC_REGISTRY     */
 	"scavenger",         /* DBGC_SCAVENGER    */
 	"dns",               /* DBGC_DNS          */
+	"ldb",               /* DBGC_LDB          */
 	NULL
 };
 
diff --git a/lib/util/debug.h b/lib/util/debug.h
index 30df787..f7ebfc0 100644
--- a/lib/util/debug.h
+++ b/lib/util/debug.h
@@ -81,9 +81,10 @@ bool dbghdr( int level, const char *location, const char *func);
 #define DBGC_REGISTRY		19
 #define DBGC_SCAVENGER		20
 #define DBGC_DNS		21
+#define DBGC_LDB		22
 
 /* Always ensure this is updated when new fixed classes area added, to ensure the array in debug.c is the right size */
-#define DBGC_MAX_FIXED		21
+#define DBGC_MAX_FIXED		22
 
 /* So you can define DBGC_CLASS before including debug.h */
 #ifndef DBGC_CLASS


-- 
Samba Shared Repository