Attachment 7470 Details for Bug 8877 – git-am fix for 3.6.x.

[patch] git-am fix for 3.6.x.

0001-Fix-bug-8877-Syslog-broken-owing-to-mistyping-of-deb.patch (text/plain), 1.21 KB, created by Jeremy Allison on 2012-04-20 17:05:23 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jeremy Allison

Created: 2012-04-20 17:05:23 UTC

Size: 1.21 KB

patch

obsolete

>From 47afc63688dafd1bcbcab4d03d803411928a5097 Mon Sep 17 00:00:00 2001
>From: Joseph Tam <jtam.home@gmail.com>
>Date: Thu, 19 Apr 2012 11:46:16 -0700
>Subject: [PATCH] Fix bug #8877 - Syslog broken owing to mistyping of
> debug_settings.syslog.
>
>Setting "syslog only = yes" did not divert log messages to syslog.  The test in
>lib/util/debug.c:Debug1():747
>
>   if( syslog_level < state.settings.syslog )
>
>produces wrong results since .syslog is typed "bool" rather than "int".
>The attached patch fixes this by typing this field correctly as "int".
>
>Autobuild-User: Jeremy Allison <jra@samba.org>
>Autobuild-Date: Fri Apr 20 00:06:12 CEST 2012 on sn-devel-104
>(cherry picked from commit 00d5f32025bf13285ab3f8ffae914107c9eca275)
>
>Signed-off-by: Jeremy Allison <jra@samba.org>
>---
> lib/util/debug.h |    2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
>diff --git a/lib/util/debug.h b/lib/util/debug.h
>index c01fa92..4117d3f 100644
>--- a/lib/util/debug.h
>+++ b/lib/util/debug.h
>@@ -201,7 +201,7 @@ enum debug_logtype {DEBUG_DEFAULT_STDERR = 0, DEBUG_STDOUT = 1, DEBUG_FILE = 2,
> 
> struct debug_settings {
> 	size_t max_log_size;
>-	bool syslog;
>+	int syslog;
> 	bool syslog_only;
> 	bool timestamp_logs;
> 	bool debug_prefix_timestamp;
>-- 
>1.7.7.3
>

Flags:

vl: review+

Actions: View

Attachments on bug 8877: 7466 | 7470