summaryrefslogtreecommitdiff
path: root/scheduler/log.c
diff options
context:
space:
mode:
authormsweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>2011-09-07 22:31:27 +0000
committermsweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>2011-09-07 22:31:27 +0000
commit85dda01c84763aecc4d31e15246d0ac5986eedae (patch)
tree4f8b999e8443b1c8def8c79d70338bd4e0179e29 /scheduler/log.c
parenta48458814a4c26a6430b27105c0ab747c907473f (diff)
downloadcups-85dda01c84763aecc4d31e15246d0ac5986eedae.tar.gz
Merge changes from CUPS 1.6svn-r9968.
git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@3411 a1ca3aef-8c08-0410-bb20-df032aa958be
Diffstat (limited to 'scheduler/log.c')
-rw-r--r--scheduler/log.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/scheduler/log.c b/scheduler/log.c
index c5dff9754..ecabb7f46 100644
--- 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);