Merge changes from CUPS 1.6svn-r9939.

git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@3392 a1ca3aef-8c08-0410-bb20-df032aa958be

1 files changed, 5 insertions, 8 deletions

diff --git a/scheduler/log.c b/scheduler/log.c
index de7b5458f..c5dff9754 100644
--- a/scheduler/log.c
+++ b/scheduler/log.c
@@ -516,15 +516,12 @@ cupsdLogMessage(int        level,	/* I - Log level */
   * See if we want to log this message...
   */
 
-  if (TestConfigFile)
+  if (TestConfigFile || (level <= LogLevel && !ErrorLog))
   {
-    if (level <= CUPSD_LOG_WARN)
-    {
-      va_start(ap, message);
-      vfprintf(stderr, message, ap);
-      putc('\n', stderr);
-      va_end(ap);
-    }
+    va_start(ap, message);
+    vfprintf(stderr, message, ap);
+    putc('\n', stderr);
+    va_end(ap);
 
     return (1);
   }