cupsGetPPD* sent bad requests (STR #4567)

Use IPP_TAG_KEYWORD for requested-attributes in get_printer_uri.

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@12448 a1ca3aef-8c08-0410-bb20-df032aa958be

diff --git a/CHANGES-2.0.txt b/CHANGES-2.0.txt
index 5ff4ac0291bab075a0b654849b6248be94be7fbd..a92d32e594b4ad36fb04183c1a75ba280aa16187 100644 (file)
--- a/CHANGES-2.0.txt
+++ b/CHANGES-2.0.txt
@@ -24,6 +24,7 @@ CHANGES IN CUPS V2.0.2
          (<rdar://problem/19015679>)
        - Mapping of PPD keywords to IPP keywords did not work if the PPD
          keyword was already an IPP keyword (<rdar://problem/19121005>)
+       - cupsGetPPD* sent bad requests (STR #4567)
 
 
 CHANGES IN CUPS V2.0.1

diff --git a/cups/util.c b/cups/util.c
index ac43bb4149378aa6e17a3837269c3b24efb7347e..7b70b15db58c05b4a19b15088f5876586e50ddef 100644 (file)
--- a/cups/util.c
+++ b/cups/util.c
@@ -3,7 +3,7 @@
  *
  * Printing utilities for CUPS.
  *
- * Copyright 2007-2014 by Apple Inc.
+ * Copyright 2007-2015 by Apple Inc.
  * Copyright 1997-2006 by Easy Software Products.
  *
  * These coded instructions, statements, and computer programs are the
@@ -1509,7 +1509,7 @@ cups_get_printer_uri(
 
   ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, "printer-uri", NULL, uri);
 
-  ippAddStrings(request, IPP_TAG_OPERATION, IPP_TAG_NAME, "requested-attributes", sizeof(requested_attrs) / sizeof(requested_attrs[0]), NULL, requested_attrs);
+  ippAddStrings(request, IPP_TAG_OPERATION, IPP_TAG_KEYWORD, "requested-attributes", sizeof(requested_attrs) / sizeof(requested_attrs[0]), NULL, requested_attrs);
 
  /*
   * Do the request and get back a response...