From: Andreas Schneider Date: Wed, 22 Jun 2016 09:13:15 +0000 (+0200) Subject: libutil: Support systemd 230 X-Git-Tag: samba-4.3.12~106 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=58210c05eedd929f1753c8287530826c191ee30c;p=thirdparty%2Fsamba.git 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 Reviewed-by: Richard Sharpe Autobuild-User(master): Richard Sharpe Autobuild-Date(master): Mon Jun 27 00:01:55 CEST 2016 on sn-devel-144 (cherry picked from commit 8813faffe3ce4b598b626afea4bf90405c8129d8) Autobuild-User(v4-3-test): Karolin Seeger Autobuild-Date(v4-3-test): Tue Jun 28 19:35:32 CEST 2016 on sn-devel-104 --- diff --git a/lib/util/debug.c b/lib/util/debug.c index f2a445ba5ee..c5551ce9adf 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 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,