rename basic.la to shared.la and put selinux deps in shared-selinx.la

[elogind.git] / src / journal / journald.c

diff --git a/src/journal/journald.c b/src/journal/journald.c
index f0f5103bf038b485d8e9963874a331a54a7a886a..073bb890aba6a69068514d16fea58b8d514f1fd0 100644 (file)
--- a/src/journal/journald.c
+++ b/src/journal/journald.c
@@ -35,6 +35,7 @@
 #include <systemd/sd-messages.h>
 #include <systemd/sd-daemon.h>
 
+#include "mkdir.h"
 #include "hashmap.h"
 #include "journal-file.h"
 #include "socket-util.h"
@@ -50,7 +51,7 @@
 #ifdef HAVE_ACL
 #include <sys/acl.h>
 #include <acl/libacl.h>
-#include "acl-util.h"
+#include "acl.h"
 #endif
 
 #ifdef HAVE_SELINUX
@@ -2584,7 +2585,7 @@ static int server_parse_config_file(Server *s) {
 
         assert(s);
 
-        fn = "/etc/systemd/systemd-journald.conf";
+        fn = "/etc/systemd/journald.conf";
         f = fopen(fn, "re");
         if (!f) {
                 if (errno == ENOENT)
@@ -2765,6 +2766,7 @@ int main(int argc, char *argv[]) {
         }
 
         log_set_target(LOG_TARGET_CONSOLE);
+        log_set_facility(LOG_SYSLOG);
         log_parse_environment();
         log_open();