Revert "Temporarily remove dlog_connect_fd()"

This reverts commit 34e316b4345a71a353c0ff622975144e0af98515.

Change-Id: I4f86bdfda8dd0a4b99dcb02bd2ad0a32a0602f93

diff --git a/meson.build b/meson.build
index 003bf2a..98d333b 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -859,7 +859,7 @@ if not libcap.found()
         libcap = cc.find_library('cap')
 endif
 
-#libdlog_redirect_stdout = dependency('dlog-redirect-stdout', required : true)
+libdlog_redirect_stdout = dependency('dlog-redirect-stdout', required : true)
 
 libmount = dependency('mount',
                       version : fuzzer_build ? '>= 0' : '>= 2.30')

diff --git a/packaging/systemd.spec b/packaging/systemd.spec
index 38d8a17..03feb75 100644 (file)
--- a/packaging/systemd.spec
+++ b/packaging/systemd.spec
@@ -84,7 +84,7 @@ BuildRequires:  pkgconfig(liblzma)
 BuildRequires:  pkgconfig(libkmod)
 BuildRequires:  pkgconfig(mount)
 BuildRequires:  pkgconfig(libdbuspolicy1)
-#BuildRequires:  pkgconfig(dlog-redirect-stdout)
+BuildRequires:  pkgconfig(dlog-redirect-stdout)
 BuildRequires:  meson
 BuildRequires:  acl
 BuildRequires:  python

diff --git a/src/core/execute.c b/src/core/execute.c
index 6f358ef..fc0146a 100644 (file)
--- a/src/core/execute.c
+++ b/src/core/execute.c
@@ -14,7 +14,7 @@
 #include <unistd.h>
 #include <utmpx.h>
 
-//#include <dlog/dlog-redirect-stdout.h>
+#include <dlog/dlog-redirect-stdout.h>
 
 #if HAVE_PAM
 #include <security/pam_appl.h>
@@ -588,9 +588,8 @@ static int wire_up_dlog(int fileno, const char *ident)
                 snprintf(tag, sizeof tag, "STDOUT_%s", ident);
         }
 
-               return -1;
-        //return dlog_connect_fd(2, // SYSTEM dlog buffer (consider also 0 for generic MAIN buffer)
-                //fileno, tag, priority);
+        return dlog_connect_fd(2, // SYSTEM dlog buffer (consider also 0 for generic MAIN buffer)
+                fileno, tag, priority);
 }
 
 static int setup_output(

diff --git a/src/core/meson.build b/src/core/meson.build
index 219f00b..a7afe19 100644 (file)
--- a/src/core/meson.build
+++ b/src/core/meson.build
@@ -181,7 +181,7 @@ libcore = static_library(
                         libkmod,
                         libapparmor,
                         libselinux,
-#libdlog_redirect_stdout,
+                        libdlog_redirect_stdout,
                         libmount])
 
 systemd_sources = files('main.c')