From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Fri, 6 Feb 2015 00:44:13 +0000 (-0500)
Subject: shared/log: read /proc/cmdline only in daemons
X-Git-Tag: v219~130
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=ee46e555702715f1adcc3381dac73e76e2d9a048;p=elogind.git

shared/log: read /proc/cmdline only in daemons

http://lists.freedesktop.org/archives/systemd-devel/2015-February/027960.html
---

diff --git a/src/shared/log.c b/src/shared/log.c
index 03ef018bd..646a1d638 100644
--- a/src/shared/log.c
+++ b/src/shared/log.c
@@ -949,7 +949,11 @@ static int parse_proc_cmdline_item(const char *key, const char *value) {
 void log_parse_environment(void) {
         const char *e;
 
-        (void) parse_proc_cmdline(parse_proc_cmdline_item);
+        if (get_ctty_devnr(0, NULL) < 0)
+                /* Only try to read the command line in daemons.
+                   We assume that anything that has a controlling
+                   tty is user stuff. */
+                (void) parse_proc_cmdline(parse_proc_cmdline_item);
 
         e = secure_getenv("SYSTEMD_LOG_TARGET");
         if (e && log_set_target_from_string(e) < 0)