X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fbasic%2Flog.c;h=d84c9bf116b43c88d239079663e4e9f3ed235385;hb=26f0d9bd01bb3047c31e8e9586f47440cbce50bd;hp=e05dd65689cf0d226e3f1a22895ff3043049fca0;hpb=a1f1ad7cadfc2cf8afeeb953644a7508eaba957e;p=elogind.git

diff --git a/src/basic/log.c b/src/basic/log.c
index e05dd6568..d84c9bf11 100644
--- a/src/basic/log.c
+++ b/src/basic/log.c
@@ -798,7 +798,7 @@ static void log_assert(
                 return;
 
         DISABLE_WARNING_FORMAT_NONLITERAL;
-        xsprintf(buffer, format, text, file, line, func);
+        snprintf(buffer, sizeof buffer, format, text, file, line, func);
         REENABLE_WARNING;
 
         log_abort_msg = buffer;
@@ -1030,7 +1030,7 @@ void log_parse_environment(void) {
                 /* 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, NULL);
+                (void) parse_proc_cmdline(parse_proc_cmdline_item, NULL, true);
 
         e = secure_getenv("SYSTEMD_LOG_TARGET");
         if (e && log_set_target_from_string(e) < 0)