From: msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>
Date: Tue, 17 Nov 2015 21:23:16 +0000 (+0000)
Subject: The IPP backend incorrectly included the job-password attribute in Validate-Job
X-Git-Tag: v2.2b1~146
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=71a78e2fe48a969b0fe6a941354d83989917a730;p=thirdparty%2Fcups.git

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 ad807f2138..84a145672d 100644
--- 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 0966f106f8..c6fe05f5dc 100644
--- 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));