]> git.ipfire.org Git - thirdparty/cups.git/commitdiff
Merge fix from master
authorZdenek Dohnal <zdohnal@redhat.com>
Mon, 4 Sep 2023 12:26:28 +0000 (14:26 +0200)
committerZdenek Dohnal <zdohnal@redhat.com>
Mon, 4 Sep 2023 12:26:28 +0000 (14:26 +0200)
Commit in master:
https://github.com/OpenPrinting/cups/commit/b7a60b8c0357

CHANGES.md
scheduler/conf.c

index 7ef3a6667a3f87f0694a24719ce17b8ba4ade1e2..0245da82bfe92a5452c5b9af4d562e22c00b97fd 100644 (file)
@@ -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)
 
index b1853516224565b305e636bb9536f2da314396c7..4fa7eb1df058138c6046543b53e1933b7089519c 100644 (file)
@@ -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);
   }