Merge fix for #829

diff --git a/CHANGES.md b/CHANGES.md
index 9ed7424630674c24a4e73a363ab917815097ab59..f50b6f5ed9c353cdf8296f01b8361483ccfcc195 100644 (file)
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -6,6 +6,8 @@ Changes in CUPS v2.4.8 (TBA)
 
 - Added new value for 'lpstat' option '-W' - successfull - for getting
   successfully printed jobs (Issue #830)
+- Added warning if the device has to be asked for 'all,media-col-database' separately
+  (Issue #829)
 - Fixed memory leak when creating color profiles (Issue #815)
 - Fixed memory leak when unloading a job (Issue #813)
 - Raised `cups_enum_dests()` timeout for listing available IPP printers (Issue #751)

diff --git a/scheduler/ipp.c b/scheduler/ipp.c
index 341c5e9cb118c7e3c896979af1f3ad3da584f7cb..e0caa98fe41f24f2dd998be510be9538cf467ab2 100644 (file)
--- a/scheduler/ipp.c
+++ b/scheduler/ipp.c
@@ -5409,6 +5409,10 @@ create_local_bg_thread(
       if ((attr = ippFindAttribute(response2, "media-col-database",
                                   IPP_TAG_ZERO)) != NULL)
       {
+       cupsdLogMessage(CUPSD_LOG_WARN, "The printer %s does not support requests"
+                       " with attribute set \"all,media-col-database\", which breaks IPP"
+                       " conformance (RFC 8011, 4.2.5.1 \"requested-attributes\")"
+                       " - report the issue to your printer manufacturer", printer->name);
        /*
        * Copy "media-col-database" attribute into the original
        * IPP response