From: Michael Sweet <michael.r.sweet@gmail.com>
Date: Wed, 19 Jul 2017 19:29:01 +0000 (-0400)
Subject: Fix logging when "-t" is used (always to stderr).
X-Git-Tag: v2.2.5~80
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9eb416ee89a4f808aeb5d5e11f55a3389dc3ca03;p=thirdparty%2Fcups.git

Fix logging when "-t" is used (always to stderr).
---

diff --git a/scheduler/log.c b/scheduler/log.c
index 243742d172..95aa23ed6f 100644
--- a/scheduler/log.c
+++ b/scheduler/log.c
@@ -703,7 +703,18 @@ cupsdLogMessage(int        level,	/* I - Log level */
   * See if we want to log this message...
   */
 
-  if ((TestConfigFile || !ErrorLog) && level <= CUPSD_LOG_WARN)
+  if (TestConfigFile && level <= CUPSD_LOG_WARN)
+  {
+    va_start(ap, message);
+
+    vfprintf(stderr, message, ap);
+    putc('\n', stderr);
+
+    va_end(ap);
+
+    return (1);
+  }
+  else if (!ErrorLog && level <= CUPSD_LOG_WARN)
   {
     va_start(ap, message);
 
@@ -722,12 +733,11 @@ cupsdLogMessage(int        level,	/* I - Log level */
 
     return (1);
   }
-
-  if (level > LogLevel || !ErrorLog)
+  else if (level > LogLevel || !ErrorLog)
     return (1);
 
 #ifdef HAVE_SYSTEMD_SD_JOURNAL_H
-  if (!strcmp(ErrorLog, "syslog"))
+  else if (!strcmp(ErrorLog, "syslog"))
   {
     va_start(ap, message);
     sd_journal_printv(log_levels[level], message, ap);