The branch, master has been updated
via 8813faf libutil: Support systemd 230
from becc43b krb5_wrap: Fix build error when not using heimdal.
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 8813faffe3ce4b598b626afea4bf90405c8129d8
Author: Andreas Schneider <[email protected]>
Date: Wed Jun 22 11:13:15 2016 +0200
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 <[email protected]>
Reviewed-by: Richard Sharpe <[email protected]>
Autobuild-User(master): Richard Sharpe <[email protected]>
Autobuild-Date(master): Mon Jun 27 00:01:55 CEST 2016 on sn-devel-144
-----------------------------------------------------------------------
Summary of changes:
lib/util/debug.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
Changeset truncated at 500 lines:
diff --git a/lib/util/debug.c b/lib/util/debug.c
index 95b3d95..ed89944 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)
{
/*
@@ -183,7 +183,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)
@@ -255,7 +255,7 @@ static struct debug_backend {
},
#endif
-#ifdef HAVE_LIBSYSTEMD_JOURNAL
+#if defined(HAVE_LIBSYSTEMD_JOURNAL) || defined(HAVE_LIBSYSTEMD)
{
.name = "systemd",
.log = debug_systemd_log,
--
Samba Shared Repository
