Printer xxx-default values were not reported by Get-Printer-Attributes or

lpoptions (<rdar://problem/14401795>)

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

diff --git a/CHANGES-1.6.txt b/CHANGES-1.6.txt
index 896badedd2e9e65206a9ae16610ced54a6c9b46b..ef6db8d286d32233fa94b5da943554bfe48b0d4f 100644 (file)
--- a/CHANGES-1.6.txt
+++ b/CHANGES-1.6.txt
@@ -5,6 +5,8 @@ CHANGES IN CUPS V1.6.3
 
        - The configure script now prefers Clang over GCC.
        - Fixed a compile problem on AIX (STR #4307)
+       - Printer xxx-default values were not reported by Get-Printer-Attributes
+         or lpoptions (<rdar://problem/14401795>)
        - The default IPP version did not always get set before creating a new
          IPP request message (<rdar://problem/14401718>)
        - The lp, lpq, lpr, and lpstat now display an error message advising the

diff --git a/cups/encode.c b/cups/encode.c
index 62516a01dc646f3a50776caab9974b7f3a59d673..667e0d3041c6e6a2e0477ccae6f3b78dc8feb776 100644 (file)
--- a/cups/encode.c
+++ b/cups/encode.c
@@ -534,7 +534,7 @@ cupsEncodeOptions2(
       else
         ops ++;
 
-    if (*ops == IPP_OP_CUPS_NONE)
+    if (*ops == IPP_OP_CUPS_NONE && op != IPP_OP_CUPS_NONE)
     {
       DEBUG_printf(("2cupsEncodeOptions2: Skipping \"%s\".", option->name));
       continue;