The IPP backend incorrectly included the job-password attribute in Validate-Job

requests (<rdar://problem/23531939>)

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

diff --git a/CHANGES-2.1.txt b/CHANGES-2.1.txt
index ad807f2138ad461ad5195a1e619e3f11f1fe8130..84a145672dbd04c83b5d1728d2cc88fe57257d74 100644 (file)
--- a/CHANGES-2.1.txt
+++ b/CHANGES-2.1.txt
@@ -30,6 +30,8 @@ CHANGES IN CUPS V2.1.1
          classes (STR #4733)
        - Changing the printer-is-shared value for a remote queue did not
          produce an error (STR #4738)
+       - The IPP backend incorrectly included the job-password attribute in
+         Validate-Job requests (<rdar://problem/23531939>)
        - Updated localizations (STR #4709)
 
 

diff --git a/cups/ppd-cache.c b/cups/ppd-cache.c
index 0966f106f8862d3c4e86445b8a4a1e7050c9c28f..c6fe05f5dc13e050e435e127e609179926f225a0 100644 (file)
--- a/cups/ppd-cache.c
+++ b/cups/ppd-cache.c
@@ -85,7 +85,7 @@ _cupsConvertOptions(ipp_t           *request, /* I - IPP request */
   * Send standard IPP attributes...
   */
 
-  if (pc->password && (keyword = cupsGetOption("job-password", num_options, options)) != NULL)
+  if (pc->password && (keyword = cupsGetOption("job-password", num_options, options)) != NULL && ippGetOperation(request) != IPP_OP_VALIDATE_JOB)
   {
     ippAddOctetString(request, IPP_TAG_OPERATION, "job-password", keyword, (int)strlen(keyword));