Switch to using "all" and "media-col-database" because some vendors apparently

do not know how to read (Issue #5484)

diff --git a/cgi-bin/admin.c b/cgi-bin/admin.c
index 2be01970745e9e797edc0d31bf29498116ed9bf9..0111d2dd661220323c6984328ff29b3feda14861 100644 (file)
--- a/cgi-bin/admin.c
+++ b/cgi-bin/admin.c
@@ -3932,9 +3932,7 @@ get_printer_ppd(const char *uri,  /* I - Printer URI */
   int          port;                   /* Port number */
   static const char * const pattrs[] = /* Printer attributes we need */
   {
-    "job-template",
-    "printer-defaults",
-    "printer-description",
+    "all",
     "media-col-database"
   };
 

diff --git a/scheduler/ipp.c b/scheduler/ipp.c
index 9580bb0901f0bebc69bc5d3524bc970b9c1739d8..819499a6ff77b8308400023159dac147df6517ba 100644 (file)
--- a/scheduler/ipp.c
+++ b/scheduler/ipp.c
@@ -5258,9 +5258,7 @@ create_local_bg_thread(
   ipp_status_t status;                 /* Status code */
   static const char * const pattrs[] = /* Printer attributes we need */
   {
-    "job-template",
-    "printer-defaults",
-    "printer-description",
+    "all",
     "media-col-database"
   };
 

diff --git a/systemv/lpadmin.c b/systemv/lpadmin.c
index da97f01aa15d3970ba6d98cf1e6f03229350104d..4a8bc26c3eb1ebab16aee5bb545690cd98ebec47 100644 (file)
--- a/systemv/lpadmin.c
+++ b/systemv/lpadmin.c
@@ -1,7 +1,7 @@
 /*
  * "lpadmin" command for CUPS.
  *
- * Copyright © 2007-2018 by Apple Inc.
+ * Copyright © 2007-2019 by Apple Inc.
  * Copyright © 1997-2006 by Easy Software Products.
  *
  * Licensed under Apache License v2.0.  See the file "LICENSE" for more
@@ -1192,9 +1192,7 @@ get_printer_ppd(
   int          port;                   /* Port number */
   static const char * const pattrs[] = /* Attributes to use */
   {
-    "job-template",
-    "printer-defaults",
-    "printer-description",
+    "all",
     "media-col-database"
   };