[systemd-devel] [PATCH] journald: fix syslog facility for messages coming from kmsg

[Zbigniew Jędrzejewski-Szmek]

Hm, what was wrong with the facility before?

Zbyszek

On Fri, Jul 25, 2014 at 03:04:44PM +0200, Michal Sekletar wrote:
> ---
>  src/journal/journald-kmsg.c | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/src/journal/journald-kmsg.c b/src/journal/journald-kmsg.c
> index 12992e7..8d24344 100644
> --- a/src/journal/journald-kmsg.c
> +++ b/src/journal/journald-kmsg.c
> @@ -274,6 +274,9 @@ static void dev_kmsg_record(Server *s, char *p, size_t l) {
>          if (asprintf(&syslog_priority, "PRIORITY=%i", priority & LOG_PRIMASK) >= 0)
>                  IOVEC_SET_STRING(iovec[n++], syslog_priority);
>  
> +        if (asprintf(&syslog_facility, "SYSLOG_FACILITY=%i", priority & LOG_FACMASK) >= 0)
> +                IOVEC_SET_STRING(iovec[n++], syslog_facility);
> +
>          if ((priority & LOG_FACMASK) == LOG_KERN)
>                  IOVEC_SET_STRING(iovec[n++], "SYSLOG_IDENTIFIER=kernel");
>          else {
> @@ -295,9 +298,6 @@ static void dev_kmsg_record(Server *s, char *p, size_t l) {
>                          if (syslog_pid)
>                                  IOVEC_SET_STRING(iovec[n++], syslog_pid);
>                  }
> -
> -                if (asprintf(&syslog_facility, "SYSLOG_FACILITY=%i", LOG_FAC(priority)) >= 0)
> -                        IOVEC_SET_STRING(iovec[n++], syslog_facility);
>          }
>  
>          message = cunescape_length_with_prefix(p, pl, "MESSAGE=");
> -- 
> 2.0.1
> 
> _______________________________________________
> systemd-devel mailing list
> systemd-devel at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/systemd-devel
>