Merge changes from CUPS 1.6svn-r10112.

[thirdparty/cups.git] / backend / ipp.c

diff --git a/backend/ipp.c b/backend/ipp.c
index 4ef67a4e2f2cdb8a84bb210fa301a324ba361240..99df346aea1da5d97eba1b4b6188aea10ebb683a 100644 (file)
--- a/backend/ipp.c
+++ b/backend/ipp.c
@@ -1393,6 +1393,7 @@ main(int  argc,                           /* I - Number of command-line args */
         break;
 
       if (ipp_status == IPP_SERVICE_UNAVAILABLE ||
+          ipp_status == IPP_NOT_POSSIBLE ||
          ipp_status == IPP_PRINTER_BUSY)
       {
        _cupsLangPrintFilter(stderr, "INFO", _("The printer is busy."));
@@ -1550,6 +1551,7 @@ main(int  argc,                           /* I - Number of command-line args */
       copies_remaining --;
     }
     else if (ipp_status == IPP_SERVICE_UNAVAILABLE ||
+             ipp_status == IPP_NOT_POSSIBLE ||
             ipp_status == IPP_PRINTER_BUSY)
       continue;
     else
@@ -1622,6 +1624,7 @@ main(int  argc,                           /* I - Number of command-line args */
       if (ipp_status > IPP_OK_CONFLICT)
       {
        if (ipp_status != IPP_SERVICE_UNAVAILABLE &&
+           ipp_status != IPP_NOT_POSSIBLE &&
            ipp_status != IPP_PRINTER_BUSY)
        {
          ippDelete(response);
@@ -1669,7 +1672,9 @@ main(int  argc,                           /* I - Number of command-line args */
            break;
          }
        }
-       else
+       else if (ipp_status != IPP_SERVICE_UNAVAILABLE &&
+                ipp_status != IPP_NOT_POSSIBLE &&
+                ipp_status != IPP_PRINTER_BUSY)
        {
         /*
          * If the printer does not return a job-state attribute, it does not