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 03ef018bd4b870268806f8e2e890180236407c00..646a1d6389822a358a3d2ec30c4b01497e9d29cf 100644 (file)
--- 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 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)
 
         e = secure_getenv("SYSTEMD_LOG_TARGET");
         if (e && log_set_target_from_string(e) < 0)