The Samba-Bugzilla – Attachment 9042 Details for
Bug 10015
Fix/Improve debug options
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Patches for v4-0-test
tmp40.diff (text/plain), 7.09 KB, created by
Stefan Metzmacher
on 2013-07-12 09:13:40 UTC
(
hide
)
Description:
Patches for v4-0-test
Filename:
MIME Type:
Creator:
Stefan Metzmacher
Created:
2013-07-12 09:13:40 UTC
Size:
7.09 KB
patch
obsolete
>From 1e447c14a7cccf0143c54b1b570783ac16d8b393 Mon Sep 17 00:00:00 2001 >From: Kai Blin <kai@samba.org> >Date: Mon, 14 Jan 2013 01:13:47 +0100 >Subject: [PATCH 1/5] debug: Add debugclass for DNS server > >Signed-off-by: Kai Blin <kai@samba.org> >Reviewed-By: Amitay Isaacs <amitay@gmail.com> >(cherry picked from commit 4b010997486b059b90be1f69783a451f400d7df7) >--- > 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 6207b61..34aa76f 100644 >--- a/lib/util/debug.c >+++ b/lib/util/debug.c >@@ -177,6 +177,7 @@ static const char *default_classname_table[] = { > "dmapi", /* DBGC_DMAPI */ > "registry", /* DBGC_REGISTRY */ > "scavenger", /* DBGC_SCAVENGER */ >+ "dns", /* DBGC_DNS */ > NULL > }; > >diff --git a/lib/util/debug.h b/lib/util/debug.h >index c61fd13..feea0a8 100644 >--- a/lib/util/debug.h >+++ b/lib/util/debug.h >@@ -80,9 +80,10 @@ bool dbghdr( int level, const char *location, const char *func); > #define DBGC_DMAPI 18 > #define DBGC_REGISTRY 19 > #define DBGC_SCAVENGER 20 >+#define DBGC_DNS 21 > > /* 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 20 >+#define DBGC_MAX_FIXED 21 > > /* So you can define DBGC_CLASS before including debug.h */ > #ifndef DBGC_CLASS >-- >1.7.9.5 > > >From f5a5160f545b900b08cd816a2e0a43a077e7dbc7 Mon Sep 17 00:00:00 2001 >From: Stefan Metzmacher <metze@samba.org> >Date: Tue, 9 Jul 2013 13:55:44 +0200 >Subject: [PATCH 2/5] 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 feea0a8..bd7056e 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 5f9ec52f45594883ea960f7ec5d744334ac0ae36 Mon Sep 17 00:00:00 2001 >From: Stefan Metzmacher <metze@samba.org> >Date: Tue, 9 Jul 2013 13:56:08 +0200 >Subject: [PATCH 3/5] 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 3090d75af1e398acc277bc37259beb6efb07be63 Mon Sep 17 00:00:00 2001 >From: Stefan Metzmacher <metze@samba.org> >Date: Tue, 9 Jul 2013 13:56:35 +0200 >Subject: [PATCH 4/5] 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 5e8aaaeda6e86a63ee258209a461d3adf23eeb7a Mon Sep 17 00:00:00 2001 >From: Stefan Metzmacher <metze@samba.org> >Date: Thu, 4 Jul 2013 18:11:02 +0200 >Subject: [PATCH 5/5] 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 b2e4218..aa4589d 100644 >--- a/lib/param/loadparm.c >+++ b/lib/param/loadparm.c >@@ -2080,6 +2080,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 >
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Raw
Flags:
abartlet
:
review+
Actions:
View
Attachments on
bug 10015
: 9042 |
9066