Merge changes from CUPS 1.6svn-r9968.

[thirdparty/cups.git] / scheduler / log.c

diff --git a/scheduler/log.c b/scheduler/log.c
index c5dff97546e62bd3ee0028a67f8240cedf2d7b7c..ecabb7f469c571ef479729ea4c5f2862f4ef7f27 100644 (file)
--- a/scheduler/log.c
+++ b/scheduler/log.c
@@ -516,7 +516,7 @@ cupsdLogMessage(int        level,   /* I - Log level */
   * See if we want to log this message...
   */
 
-  if (TestConfigFile || (level <= LogLevel && !ErrorLog))
+  if ((TestConfigFile || !ErrorLog) && level <= CUPSD_LOG_WARN)
   {
     va_start(ap, message);
     vfprintf(stderr, message, ap);