X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fjournal%2Fjournald-kmsg.c;h=548f65311ce0e502f149adb86824f94613df5114;hp=aebca5dbed1de58a0ddea63d12d02e3b39b1fffe;hb=e88baee88fad8bc59d33b55a7a2d640ef9e16cd6;hpb=5809560d858f45351856d6fe786a8117306dd0f2

diff --git a/src/journal/journald-kmsg.c b/src/journal/journald-kmsg.c
index aebca5dbe..548f65311 100644
--- a/src/journal/journald-kmsg.c
+++ b/src/journal/journald-kmsg.c
@@ -23,6 +23,7 @@
 #include <sys/epoll.h>
 #include <fcntl.h>
 #include <sys/mman.h>
+#include <sys/socket.h>
 
 #include <systemd/sd-messages.h>
 #include <libudev.h>
@@ -274,7 +275,7 @@ static void dev_kmsg_record(Server *s, char *p, size_t l) {
         if ((priority & LOG_FACMASK) == LOG_KERN)
                 IOVEC_SET_STRING(iovec[n++], "SYSLOG_IDENTIFIER=kernel");
         else {
-                syslog_parse_identifier((const char**) &p, &identifier, &pid);
+                pl -= syslog_parse_identifier((const char**) &p, &identifier, &pid);
 
                 /* Avoid any messages we generated ourselves via
                  * log_info() and friends. */
@@ -358,7 +359,7 @@ int server_flush_dev_kmsg(Server *s) {
         if (!s->dev_kmsg_readable)
                 return 0;
 
-        log_info("Flushing /dev/kmsg...");
+        log_debug("Flushing /dev/kmsg...");
 
         for (;;) {
                 r = server_read_dev_kmsg(s);
@@ -410,7 +411,7 @@ int server_open_kernel_seqnum(Server *s) {
 
         /* We store the seqnum we last read in an mmaped file. That
          * way we can just use it like a variable, but it is
-         * persistant and automatically flushed at reboot. */
+         * persistent and automatically flushed at reboot. */
 
         fd = open("/run/systemd/journal/kernel-seqnum", O_RDWR|O_CREAT|O_CLOEXEC|O_NOCTTY|O_NOFOLLOW, 0644);
         if (fd < 0) {