The Samba-Bugzilla – Attachment 12217 Details for
Bug 11936
Samba build fails against systemd 230
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
additional patch for 4.4
0001-libutil-Support-systemd-230.patch (text/plain), 1.77 KB, created by
Andreas Schneider
on 2016-06-27 12:58:21 UTC
(
hide
)
Description:
additional patch for 4.4
Filename:
MIME Type:
Creator:
Andreas Schneider
Created:
2016-06-27 12:58:21 UTC
Size:
1.77 KB
patch
obsolete
>From d21c17a2f4cc18633c0660e01ab5233228f5115a Mon Sep 17 00:00:00 2001 >From: Andreas Schneider <asn@samba.org> >Date: Wed, 22 Jun 2016 11:13:15 +0200 >Subject: [PATCH] libutil: Support systemd 230 > >systemd 230 version finally deprecated >libsystemd-daemon/libsystemd-journal split and put everything in >libsystemd library. > >Make sure HAVE_LIBSYSTEMD define is supported in the code (we already >have it defined by the waf). > >BUG: https://bugzilla.samba.org/show_bug.cgi?id=11936 > >Signed-off-by: Andreas Schneider <asn@samba.org> >Reviewed-by: Richard Sharpe <rsharpe@samba.org> > >Autobuild-User(master): Richard Sharpe <sharpe@samba.org> >Autobuild-Date(master): Mon Jun 27 00:01:55 CEST 2016 on sn-devel-144 > >(cherry picked from commit 8813faffe3ce4b598b626afea4bf90405c8129d8) >--- > lib/util/debug.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > >diff --git a/lib/util/debug.c b/lib/util/debug.c >index 4bb54d7..20a0ff3 100644 >--- a/lib/util/debug.c >+++ b/lib/util/debug.c >@@ -102,7 +102,7 @@ static struct { > .fd = 2 /* stderr by default */ > }; > >-#if defined(WITH_SYSLOG) || defined(HAVE_LIBSYSTEMD_JOURNAL) >+#if defined(WITH_SYSLOG) || defined(HAVE_LIBSYSTEMD_JOURNAL) || defined(HAVE_LIBSYSTEMD) > static int debug_level_to_priority(int level) > { > /* >@@ -179,7 +179,7 @@ static void debug_syslog_log(int msg_level, > } > #endif /* WITH_SYSLOG */ > >-#ifdef HAVE_LIBSYSTEMD_JOURNAL >+#if defined(HAVE_LIBSYSTEMD_JOURNAL) || defined(HAVE_LIBSYSTEMD) > #include <systemd/sd-journal.h> > static void debug_systemd_log(int msg_level, > const char *msg, const char *msg_no_nl) >@@ -251,7 +251,7 @@ static struct debug_backend { > }, > #endif > >-#ifdef HAVE_LIBSYSTEMD_JOURNAL >+#if defined(HAVE_LIBSYSTEMD_JOURNAL) || defined(HAVE_LIBSYSTEMD) > { > .name = "systemd", > .log = debug_systemd_log, >-- >2.9.0 >
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:
ab
:
review+
Actions:
View
Attachments on
bug 11936
:
12145
|
12146
|
12147
|
12148
|
12149
| 12217 |
12218