Merge changes from CUPS 1.6svn-r9939.

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

diff --git a/scheduler/conf.c b/scheduler/conf.c
index f83d3de2696291242205711f135c863b2dc03185..2d30822b9531f71d9d248fb2f1902ce81559ac93 100644 (file)
--- a/scheduler/conf.c
+++ b/scheduler/conf.c
@@ -496,7 +496,7 @@ cupsdReadConfiguration(void)
   cupsdSetString(&DataDir, CUPS_DATADIR);
   cupsdSetString(&DocumentRoot, CUPS_DOCROOT);
   cupsdSetString(&AccessLog, CUPS_LOGDIR "/access_log");
-  cupsdSetString(&ErrorLog, CUPS_LOGDIR "/error_log");
+  cupsdClearString(&ErrorLog);
   cupsdSetString(&PageLog, CUPS_LOGDIR "/page_log");
   cupsdSetString(&PageLogFormat,
                  "%p %u %j %T %P %C %{job-billing} "
@@ -718,6 +718,9 @@ cupsdReadConfiguration(void)
   if (!status)
     return (0);
 
+  if (!ErrorLog)
+    cupsdSetString(&ErrorLog, CUPS_LOGDIR "/error_log");
+
   RunUser = getuid();
 
   cupsdLogMessage(CUPSD_LOG_INFO, "Remote access is %s.",