journal: move sockets into their own subdir

[elogind.git] / src / journal / journal-send.c

diff --git a/src/journal/journal-send.c b/src/journal/journal-send.c
index db5dbc0711c7c9a06d0b8f158529064178292ea2..176aac2792d4b77b0d49091e7ee76ce518aa7d26 100644 (file)
--- a/src/journal/journal-send.c
+++ b/src/journal/journal-send.c
@@ -195,7 +195,7 @@ _public_ int sd_journal_sendv(const struct iovec *iov, int n) {
 
         zero(sa);
         sa.sun_family = AF_UNIX;
-        strncpy(sa.sun_path,"/run/systemd/journal", sizeof(sa.sun_path));
+        strncpy(sa.sun_path,"/run/systemd/journal/socket", sizeof(sa.sun_path));
 
         zero(mh);
         mh.msg_name = &sa;
@@ -225,7 +225,7 @@ _public_ int sd_journal_stream_fd(const char *tag, int priority, int priority_pr
 
         zero(sa);
         sa.un.sun_family = AF_UNIX;
-        strncpy(sa.un.sun_path, "/run/systemd/stdout", sizeof(sa.un.sun_path));
+        strncpy(sa.un.sun_path, "/run/systemd/journal/stdout", sizeof(sa.un.sun_path));
 
         r = connect(fd, &sa.sa, offsetof(union sockaddr_union, un.sun_path) + strlen(sa.un.sun_path));
         if (r < 0) {
@@ -237,7 +237,7 @@ _public_ int sd_journal_stream_fd(const char *tag, int priority, int priority_pr
                 tag = "";
 
         l = strlen(tag);
-        header = alloca(l + 1 + 2 + 2 + 2);
+        header = alloca(l + 1 + 2 + 2 + 2 + 2 + 2);
 
         memcpy(header, tag, l);
         header[l++] = '\n';
@@ -247,6 +247,10 @@ _public_ int sd_journal_stream_fd(const char *tag, int priority, int priority_pr
         header[l++] = '\n';
         header[l++] = '0';
         header[l++] = '\n';
+        header[l++] = '0';
+        header[l++] = '\n';
+        header[l++] = '0';
+        header[l++] = '\n';
 
         r = loop_write(fd, header, l, false);
         if (r < 0) {