From 7ddf270ce8cd2128aef7fe66a1bd2982d61b17b5848af49f24d945cd2ae5bc5a Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Wed, 23 Jul 2014 09:14:26 +0000 Subject: [PATCH] . OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=725 --- set-and-use-default-logconsole.patch | 20 +++++++++++++++----- systemd-mini.changes | 6 ++++++ systemd.changes | 6 ++++++ 3 files changed, 27 insertions(+), 5 deletions(-) diff --git a/set-and-use-default-logconsole.patch b/set-and-use-default-logconsole.patch index d9c82eb..59c5ff5 100644 --- a/set-and-use-default-logconsole.patch +++ b/set-and-use-default-logconsole.patch @@ -1,14 +1,13 @@ Use and set default logging console for both journald and kernel messages --- - src/journal/journald-console.c | 92 +++++++++++++++++++++++++++++++++++++++++ + src/journal/journald-console.c | 96 +++++++++++++++++++++++++++++++++++++++++ src/journal/journald-console.h | 4 + src/journal/journald-server.c | 5 ++ - src/journal/journald.conf | 2 - 4 files changed, 102 insertions(+), 1 deletion(-) + 3 files changed, 105 insertions(+) --- src/journal/journald-console.c -+++ src/journal/journald-console.c 2014-07-22 11:22:49.574235948 +0000 ++++ src/journal/journald-console.c 2014-07-23 09:08:29.522235688 +0000 @@ -23,6 +23,14 @@ #include #include @@ -99,7 +98,18 @@ Use and set default logging console for both journald and kernel messages void server_forward_console( Server *s, int priority, -@@ -101,7 +177,23 @@ void server_forward_console( +@@ -63,6 +139,10 @@ void server_forward_console( + + if (LOG_PRI(priority) > s->max_level_console) + return; ++ ++ /* Do not write security/authorization (private) messages to console */ ++ if (priority & LOG_AUTHPRIV) ++ return; + + /* First: timestamp */ + if (prefix_timestamp()) { +@@ -101,7 +181,23 @@ void server_forward_console( fd = open_terminal(tty, O_WRONLY|O_NOCTTY|O_CLOEXEC); if (fd < 0) { log_debug("Failed to open %s for logging: %m", tty); diff --git a/systemd-mini.changes b/systemd-mini.changes index a3ce208..8a67cd8 100644 --- a/systemd-mini.changes +++ b/systemd-mini.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Jul 23 09:13:43 UTC 2014 - werner@suse.de + +- Change patch set-and-use-default-logconsole.patch to avoid to + write security/authorization (private) messages to console + ------------------------------------------------------------------- Tue Jul 22 11:50:44 UTC 2014 - werner@suse.de diff --git a/systemd.changes b/systemd.changes index a3ce208..8a67cd8 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Jul 23 09:13:43 UTC 2014 - werner@suse.de + +- Change patch set-and-use-default-logconsole.patch to avoid to + write security/authorization (private) messages to console + ------------------------------------------------------------------- Tue Jul 22 11:50:44 UTC 2014 - werner@suse.de