Attachment 9066 Details for Bug 10015 – Patches for v4-1-test

[patch] Patches for v4-1-test

tmp41.diff (text/plain), 5.70 KB, created by Stefan Metzmacher on 2013-07-19 07:47:12 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Stefan Metzmacher

Created: 2013-07-19 07:47:12 UTC

Size: 5.70 KB

patch

obsolete

>From fa79df9bd2a7bf826e85bd8b36fde2961b9f335e Mon Sep 17 00:00:00 2001
>From: Stefan Metzmacher <metze@samba.org>
>Date: Tue, 9 Jul 2013 13:55:44 +0200
>Subject: [PATCH 1/4] lib/util: add 'ldb' debug class
>MIME-Version: 1.0
>Content-Type: text/plain; charset=UTF-8
>Content-Transfer-Encoding: 8bit
>
>Signed-off-by: Stefan Metzmacher <metze@samba.org>
>Reviewed-by: BjÃ¶rn Jacke <bj@sernet.de>
>(cherry picked from commit baecc863de0ceb64187c6eb3545bf28706bd84fc)
>---
> lib/util/debug.c |    1 +
> lib/util/debug.h |    3 ++-
> 2 files changed, 3 insertions(+), 1 deletion(-)
>
>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
>-- 
>1.7.9.5
>
>
>From bcfba9ed35344bbbad05328d2683f91db4d1b554 Mon Sep 17 00:00:00 2001
>From: Stefan Metzmacher <metze@samba.org>
>Date: Tue, 9 Jul 2013 13:56:08 +0200
>Subject: [PATCH 2/4] lib/ldb-samba: make use of DBGC_LDB
>MIME-Version: 1.0
>Content-Type: text/plain; charset=UTF-8
>Content-Transfer-Encoding: 8bit
>
>Signed-off-by: Stefan Metzmacher <metze@samba.org>
>Reviewed-by: BjÃ¶rn Jacke <bj@sernet.de>
>(cherry picked from commit 8e0752f4d6feea35304377222d3dd487355e4120)
>---
> lib/ldb-samba/ldb_wrap.c |    2 ++
> 1 file changed, 2 insertions(+)
>
>diff --git a/lib/ldb-samba/ldb_wrap.c b/lib/ldb-samba/ldb_wrap.c
>index 028bd6f..7cab98f 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
> */
>-- 
>1.7.9.5
>
>
>From 649a05091714e4059ee9151fd07e0248d8a0d922 Mon Sep 17 00:00:00 2001
>From: Stefan Metzmacher <metze@samba.org>
>Date: Tue, 9 Jul 2013 13:56:35 +0200
>Subject: [PATCH 3/4] lib/ldb-samba: only debug LDB_DEBUG_TRACE at level 10
>MIME-Version: 1.0
>Content-Type: text/plain; charset=UTF-8
>Content-Transfer-Encoding: 8bit
>
>Signed-off-by: Stefan Metzmacher <metze@samba.org>
>Reviewed-by: BjÃ¶rn Jacke <bj@sernet.de>
>(cherry picked from commit 5f93822ede7ec3dc79a8057174342b2c6bb94a3b)
>---
> lib/ldb-samba/ldb_wrap.c |    2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
>diff --git a/lib/ldb-samba/ldb_wrap.c b/lib/ldb-samba/ldb_wrap.c
>index 7cab98f..65956ef 100644
>--- a/lib/ldb-samba/ldb_wrap.c
>+++ b/lib/ldb-samba/ldb_wrap.c
>@@ -60,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;
> 
> 	};
>-- 
>1.7.9.5
>
>
>From 80628a03bf5513d67b9dd4d42200a5c8b1d485cb Mon Sep 17 00:00:00 2001
>From: Stefan Metzmacher <metze@samba.org>
>Date: Thu, 4 Jul 2013 18:11:02 +0200
>Subject: [PATCH 4/4] lib/param: sync debug related options with source3/param
>MIME-Version: 1.0
>Content-Type: text/plain; charset=UTF-8
>Content-Transfer-Encoding: 8bit
>
>The most important change is "debug hires timestamp = Yes"
>and "syslog = 1".
>
>Signed-off-by: Stefan Metzmacher <metze@samba.org>
>Reviewed-by: BjÃ¶rn Jacke <bj@sernet.de>
>
>Autobuild-User(master): BjÃ¶rn Jacke <bj@sernet.de>
>Autobuild-Date(master): Tue Jul  9 17:15:15 CEST 2013 on sn-devel-104
>(cherry picked from commit cd36a3e902813c065e14059d325f7628b06595aa)
>---
> lib/param/loadparm.c |   18 +++++++++++++++++-
> 1 file changed, 17 insertions(+), 1 deletion(-)
>
>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 
>-- 
>1.7.9.5
>

Flags:

abartlet: review+

Actions: View

Attachments on bug 10015: 9042 | 9066