From: Zdenek Dohnal <zdohnal@redhat.com>
Date: Mon, 4 Sep 2023 12:26:28 +0000 (+0200)
Subject: Merge fix from master
X-Git-Tag: v2.4.7~10
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5f37af7fc11beaae53b3e6de61e54590c137911e;p=thirdparty%2Fcups.git

Merge fix from master

Commit in master:
https://github.com/OpenPrinting/cups/commit/b7a60b8c0357
---

diff --git a/CHANGES.md b/CHANGES.md
index 7ef3a6667a..0245da82bf 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -5,6 +5,7 @@ Changes in CUPS v2.4.7 (TBA)
 -----------------------------------
 
 - Fixed delays in lpd backend (Issue #741)
+- Fixed printing to stderr if we can't open cups-files.conf (Issue #777)
 - Fixed purging job files via `cancel -x` (Issue #742)
 - Fixed a bug in the PPD command interpretation code (Issue #768)
 
diff --git a/scheduler/conf.c b/scheduler/conf.c
index b185351622..4fa7eb1df0 100644
--- a/scheduler/conf.c
+++ b/scheduler/conf.c
@@ -811,11 +811,7 @@ cupsdReadConfiguration(void)
     cupsdLogMessage(CUPSD_LOG_INFO, "No %s, using defaults.", CupsFilesFile);
   else
   {
-#ifdef HAVE_SYSTEMD_SD_JOURNAL_H
-    sd_journal_print(LOG_ERR, "Unable to open \"%s\" - %s", CupsFilesFile, strerror(errno));
-#else
-    syslog(LOG_LPR, "Unable to open \"%s\" - %s", CupsFilesFile, strerror(errno));
-#endif /* HAVE_SYSTEMD_SD_JOURNAL_H */
+    fprintf(stderr, "Unable to read \"%s\" - %s\n", CupsFilesFile, strerror(errno));
 
     return (0);
   }