From: msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>
Date: Wed, 13 Jan 2016 19:13:49 +0000 (+0000)
Subject: The "lp -H resume" command did not reset the "job-state-reasons" attribute
X-Git-Tag: v2.2b1~124
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f3d8ceb6855af4b1e819c33e2ae5a4fa636070f7;p=thirdparty%2Fcups.git

The "lp -H resume" command did not reset the "job-state-reasons" attribute
value (STR #4752)



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

diff --git a/CHANGES-2.1.txt b/CHANGES-2.1.txt
index 060ba1869c..2cbdd7e0c0 100644
--- a/CHANGES-2.1.txt
+++ b/CHANGES-2.1.txt
@@ -13,6 +13,8 @@ CHANGES IN CUPS V2.1.3
 	  (STR #4754)
 	- Fixed some issues in ipptool for skipped tests
 	  (<rdar://problem/24137160>)
+	- The "lp -H resume" command did not reset the "job-state-reasons"
+	  attribute value (STR #4752)
 
 
 CHANGES IN CUPS V2.1.2
diff --git a/scheduler/job.c b/scheduler/job.c
index e7c26805e5..36719d89a5 100644
--- a/scheduler/job.c
+++ b/scheduler/job.c
@@ -2316,7 +2316,10 @@ cupsdSetJobHoldUntil(cupsd_job_t *job,	/* I - Job */
 
   }
 
-  ippSetString(job->attrs, &job->reasons, 0, "job-hold-until-specified");
+  if (strcmp(when, "no-hold"))
+    ippSetString(job->attrs, &job->reasons, 0, "job-hold-until-specified");
+  else
+    ippSetString(job->attrs, &job->reasons, 0, "none");
 
  /*
   * Update the hold time...