From: Michael R Sweet <michael.r.sweet@gmail.com>
Date: Mon, 21 Jan 2019 17:01:11 +0000 (-0500)
Subject: Switch to using "all" and "media-col-database" because some vendors apparently
X-Git-Tag: v2.3b8~152
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=644dca1806e5052fc8fe068fa70aec2ba7324d43;p=thirdparty%2Fcups.git

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 2be0197074..0111d2dd66 100644
--- 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 9580bb0901..819499a6ff 100644
--- 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 da97f01aa1..4a8bc26c3e 100644
--- 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"
   };