Fix Hold-New-Jobs implementation (Issue #4767)

1 files changed, 21 insertions, 1 deletions

diff --git a/scheduler/job.c b/scheduler/job.c
index 784490e08..53af00319 100644
--- a/scheduler/job.c
+++ b/scheduler/job.c
@@ -227,6 +227,7 @@ cupsdCheckJobs(void)
 			*pclass;	/* Printer class destination */
   ipp_attribute_t	*attr;		/* Job attribute */
   time_t		curtime;	/* Current time */
+  const char		*reasons;	/* job-state-reasons value */
 
 
   curtime = time(NULL);
@@ -321,6 +322,25 @@ cupsdCheckJobs(void)
       cupsdContinueJob(job);
 
    /*
+    * Skip jobs that where held-on-create
+    */
+
+    reasons = ippGetString(job->reasons, 0, NULL);
+    if (reasons && !strcmp(reasons, "job-held-on-create"))
+    {
+     /*
+      * Check whether the printer is still holding new jobs...
+      */
+
+      printer = cupsdFindDest(job->dest);
+
+      if (printer->holding_new_jobs)
+        continue;
+
+      ippSetString(job->attrs, &job->reasons, 0, "none");
+    }
+
+   /*
     * Start pending jobs if the destination is available...
     */
 
@@ -357,7 +377,7 @@ cupsdCheckJobs(void)
 	                 "Job aborted because the destination printer/class "
 			 "has gone away.");
       }
-      else if (printer && !printer->holding_new_jobs)
+      else if (printer)
       {
        /*
         * See if the printer is available or remote and not printing a job;