From: msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>
Date: Wed, 12 Nov 2014 16:23:39 +0000 (+0000)
Subject: Make "cancel -a" cancel jobs on all destinations.
X-Git-Tag: v2.2b1~443
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=242b936ad71ebfa6aeda849e73d0ecf0ad81efd3;p=thirdparty%2Fcups.git

Make "cancel -a" cancel jobs on all destinations.


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

diff --git a/CHANGES-2.0.txt b/CHANGES-2.0.txt
index 088403a15f..fc8ad87c30 100644
--- a/CHANGES-2.0.txt
+++ b/CHANGES-2.0.txt
@@ -25,6 +25,7 @@ CHANGES IN CUPS V2.0.1
 	- RPMs did not build (STR #4490)
 	- Added a USB quirk rule for the Brother HL-1250 (STR #4519)
 	- Fixed compiles on unsupported platforms (STR #4510)
+	- "cancel -a" did not cancel all jobs on all destinations (STR #4513)
 
 
 CHANGES IN CUPS V2.0.0
diff --git a/systemv/cancel.c b/systemv/cancel.c
index 9ea549c93b..cb5d4f9e53 100644
--- a/systemv/cancel.c
+++ b/systemv/cancel.c
@@ -315,7 +315,7 @@ main(int  argc,				/* I - Number of command-line arguments */
       ippDelete(response);
     }
 
-  if (num_dests == 0 && op == IPP_PURGE_JOBS)
+  if (num_dests == 0 && op != IPP_CANCEL_JOB)
   {
    /*
     * Open a connection to the server...
diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
index 3d72142126..1e78af53d2 100755
--- a/test/run-stp-tests.sh
+++ b/test/run-stp-tests.sh
@@ -875,7 +875,7 @@ fi
 
 # Requests logged
 count=`wc -l $BASE/log/access_log | awk '{print $1}'`
-expected=`expr 37 + 18 + 28 + $pjobs \* 8 + $pprinters \* $pjobs \* 4`
+expected=`expr 37 + 18 + 29 + $pjobs \* 8 + $pprinters \* $pjobs \* 4`
 if test $count != $expected; then
 	echo "FAIL: $count requests logged, expected $expected."
 	echo "<P>FAIL: $count requests logged, expected $expected.</P>" >>$strfile