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 088403a15ffae4405efa4d0517d1c01557ba9838..fc8ad87c30f7c206d6dd680d8a6ed3ad8f4a5c97 100644 (file)
--- 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 9ea549c93ba90070c9ddb4024d84fcc91d50419f..cb5d4f9e53f3fb27dd600efa12f343a78d479788 100644 (file)
--- 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 3d721421260e9ee8d474385a90ca1d780259a733..1e78af53d227369132594745c48f54bd5684b986 100755 (executable)
--- 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