Fix DEFINE-DEFAULT support in IPP data files.

Add privacy attributes to requested-attributes support.

diff --git a/cups/ipp-file.c b/cups/ipp-file.c
index 286609120b6ee566077b688a7f7696aff39f1c1e..0234de55555f0d89ef7434df686b446406b9aaaa 100644 (file)
--- a/cups/ipp-file.c
+++ b/cups/ipp-file.c
@@ -81,8 +81,11 @@ _ippFileParse(
 
       if (_ippFileReadToken(&f, name, sizeof(name)) && _ippFileReadToken(&f, temp, sizeof(temp)))
       {
-        _ippVarsExpand(v, value, temp, sizeof(value));
-        _ippVarsSet(v, name, value);
+        if (_cups_strcasecmp(token, "DEFINE-DEFAULT") || !_ippVarsGet(v, name))
+        {
+         _ippVarsExpand(v, value, temp, sizeof(value));
+         _ippVarsSet(v, name, value);
+       }
       }
       else
       {

diff --git a/cups/ipp-support.c b/cups/ipp-support.c
index efc3f74a28da7cd7f0fad3f624449cdf3d7801f9..5512ce9bda2f505e5ba025aa25a15b5987b977d4 100644 (file)
--- a/cups/ipp-support.c
+++ b/cups/ipp-support.c
@@ -1609,6 +1609,8 @@ ippCreateRequestedArray(ipp_t *request)   /* I - IPP request */
     "document-natural-language-default",
     "document-natural-language-supported",
     "document-password-supported",
+    "document-privacy-attributes",     /* IPP Privacy Attributes */
+    "document-privacy-scope",          /* IPP Privacy Attributes */
     "generated-natural-language-supported",
     "identify-actions-default",
     "identify-actions-supported",
@@ -1630,6 +1632,8 @@ ippCreateRequestedArray(ipp_t *request)   /* I - IPP request */
     "job-password-encryption-supported",
     "job-password-supported",
     "job-presets-supported",           /* IPP Presets */
+    "job-privacy-attributes",          /* IPP Privacy Attributes */
+    "job-privacy-scope",               /* IPP Privacy Attributes */
     "job-quota-period",                        /* CUPS extension */
     "job-resolvers-supported",
     "job-settable-attributes-supported",
@@ -1734,6 +1738,8 @@ ippCreateRequestedArray(ipp_t *request)   /* I - IPP request */
     "requesting-user-name-denied",     /* CUPS extension */
     "requesting-user-uri-supported",
     "subordinate-printers-supported",
+    "subscription-privacy-attributes", /* IPP Privacy Attributes */
+    "subscription-privacy-scope",      /* IPP Privacy Attributes */
     "urf-supported",                   /* CUPS extension */
     "uri-authentication-supported",
     "uri-security-supported",