X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=src%2Fjournal%2Fjournald-syslog.c;h=fc69cd7d9e1301513e06be3c034c4fe81272cce6;hb=07630cea1f3a845c09309f197ac7c4f11edd3b62;hp=90b753094636a35ed6833ff8fcc6624824555398;hpb=4a61c3e51e96a747c30598d78ee3a24e7c569e9f;p=thirdparty%2Fsystemd.git diff --git a/src/journal/journald-syslog.c b/src/journal/journald-syslog.c index 90b75309463..fc69cd7d9e1 100644 --- a/src/journal/journald-syslog.c +++ b/src/journal/journald-syslog.c @@ -19,20 +19,22 @@ along with systemd; If not, see . ***/ -#include #include #include +#include -#include "systemd/sd-messages.h" -#include "socket-util.h" -#include "selinux-util.h" -#include "journald-server.h" -#include "journald-syslog.h" -#include "journald-kmsg.h" +#include "sd-messages.h" + +#include "formats-util.h" #include "journald-console.h" +#include "journald-kmsg.h" +#include "journald-server.h" #include "journald-wall.h" -#include "formats-util.h" #include "process-util.h" +#include "selinux-util.h" +#include "socket-util.h" +#include "string-util.h" +#include "journald-syslog.h" /* Warn once every 30s if we missed syslog message */ #define WARN_FORWARD_SYSLOG_MISSED_USEC (30 * USEC_PER_SEC) @@ -234,7 +236,8 @@ size_t syslog_parse_identifier(const char **buf, char **identifier, char **pid) if (t) *identifier = t; - e += strspn(p + e, WHITESPACE); + if (strchr(WHITESPACE, p[e])) + e++; *buf = p + e; return e; }