]> git.ipfire.org Git - thirdparty/cups.git/blobdiff - backend/ipp.c
Merge changes from CUPS 1.5svn-r9214.
[thirdparty/cups.git] / backend / ipp.c
index 9feb672b094950f94047b73ce479b79960352d74..5d2a82963ad9c67447209acaef27d85459dca0f6 100644 (file)
@@ -1,37 +1,29 @@
 /*
- * "$Id: ipp.c 5133 2006-02-19 15:01:12Z mike $"
+ * "$Id: ipp.c 7948 2008-09-17 00:04:12Z mike $"
  *
- *   IPP backend for the Common UNIX Printing System (CUPS).
+ *   IPP backend for CUPS.
  *
- *   Copyright 1997-2006 by Easy Software Products, all rights reserved.
+ *   Copyright 2007-2010 by Apple Inc.
+ *   Copyright 1997-2007 by Easy Software Products, all rights reserved.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
  *   "LICENSE" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  *
  *   This file is subject to the Apple OS-Developed Software exception.
  *
  * Contents:
  *
  *   main()                 - Send a file to the printer or server.
+ *   cancel_job()           - Cancel a print job.
  *   check_printer_state()  - Check the printer state...
+ *   compress_files()       - Compress print files...
  *   password_cb()          - Disable the password prompt for
  *                            cupsDoFileRequest().
+ *   report_attr()          - Report an IPP attribute value.
  *   report_printer_state() - Report the printer state.
- *   run_pictwps_filter()   - Convert PICT files to PostScript when printing
- *                            remotely.
  *   sigterm_handler()      - Handle 'terminate' signals that stop the backend.
  */
 
  * Include necessary headers.
  */
 
-#include <cups/http-private.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <errno.h>
+#include "backend-private.h"
 #include <sys/types.h>
 #include <sys/stat.h>
-#include <cups/backend.h>
-#include <cups/cups.h>
-#include <cups/language.h>
-#include <cups/string.h>
-#include <signal.h>
 #include <sys/wait.h>
 
-
 /*
  * Globals...
  */
 
 static char    *password = NULL;       /* Password for device URI */
-#ifdef __APPLE__
-static char    pstmpname[1024] = "";   /* Temporary PostScript file name */
-#endif /* __APPLE__ */
-static char    tmpfilename[1024] = ""; /* Temporary spool file name */
-static int     job_cancelled = 0;      /* Job cancelled? */
+static int     password_tries = 0;     /* Password tries */
+static const char *auth_info_required = "none";
+                                       /* New auth-info-required value */
+static int     job_canceled = 0;       /* Job cancelled? */
 
 
 /*
@@ -73,13 +55,13 @@ static void cancel_job(http_t *http, const char *uri, int id,
                           const char *resource, const char *user, int version);
 static void    check_printer_state(http_t *http, const char *uri,
                                    const char *resource, const char *user,
-                                   int version);
+                                   int version, int job_id);
+#ifdef HAVE_LIBZ
+static void    compress_files(int num_files, char **files);
+#endif /* HAVE_LIBZ */
 static const char *password_cb(const char *);
-static int     report_printer_state(ipp_t *ipp);
-
-#ifdef __APPLE__
-static int     run_pictwps_filter(char **argv, const char *filename);
-#endif /* __APPLE__ */
+static void    report_attr(ipp_attribute_t *attr);
+static int     report_printer_state(ipp_t *ipp, int job_id);
 static void    sigterm_handler(int sig);
 
 
@@ -96,49 +78,75 @@ main(int  argc,                             /* I - Number of command-line args */
      char *argv[])                     /* I - Command-line arguments */
 {
   int          i;                      /* Looping var */
+  int          send_options;           /* Send job options? */
   int          num_options;            /* Number of printer options */
   cups_option_t        *options;               /* Printer options */
-  char         method[255],            /* Method in URI */
+  const char   *device_uri;            /* Device URI */
+  char         scheme[255],            /* Scheme in URI */
                hostname[1024],         /* Hostname */
                username[255],          /* Username info */
                resource[1024],         /* Resource info (printer name) */
+               addrname[256],          /* Address name */
                *optptr,                /* Pointer to URI options */
-               name[255],              /* Name of option */
-               value[255],             /* Value of option */
-               *ptr;                   /* Pointer into name or value */
+               *name,                  /* Name of option */
+               *value,                 /* Value of option */
+               sep;                    /* Separator character */
+  int          snmp_fd,                /* SNMP socket */
+               start_count,            /* Page count via SNMP at start */
+               page_count,             /* Page count via SNMP */
+               have_supplies;          /* Printer supports supply levels? */
   int          num_files;              /* Number of files to print */
-  char         **files,                /* Files to print */
-               *filename;              /* Pointer to single filename */
+  char         **files;                /* Files to print */
   int          port;                   /* Port number (not used) */
   char         uri[HTTP_MAX_URI];      /* Updated URI without user/pass */
+  http_status_t        http_status;            /* Status of HTTP request */
   ipp_status_t ipp_status;             /* Status of IPP request */
   http_t       *http;                  /* HTTP connection */
   ipp_t                *request,               /* IPP request */
                *response,              /* IPP response */
                *supported;             /* get-printer-attributes response */
-  int          waitjob,                /* Wait for job complete? */
+  time_t       start_time;             /* Time of first connect */
+  int          contimeout;             /* Connection timeout */
+  int          delay;                  /* Delay for retries... */
+  int          compression,            /* Do compression of the job data? */
+               waitjob,                /* Wait for job complete? */
                waitprinter;            /* Wait for printer ready? */
   ipp_attribute_t *job_id_attr;                /* job-id attribute */
   int          job_id;                 /* job-id value */
   ipp_attribute_t *job_sheets;         /* job-media-sheets-completed */
   ipp_attribute_t *job_state;          /* job-state */
   ipp_attribute_t *copies_sup;         /* copies-supported */
+  ipp_attribute_t *cups_version;       /* cups-version */
   ipp_attribute_t *format_sup;         /* document-format-supported */
+  ipp_attribute_t *media_col_sup;      /* media-col-supported */
   ipp_attribute_t *printer_state;      /* printer-state attribute */
   ipp_attribute_t *printer_accepting;  /* printer-is-accepting-jobs */
-  int          copies;                 /* Number of copies remaining */
-  const char   *content_type;          /* CONTENT_TYPE environment variable */
+  int          copies,                 /* Number of copies for job */
+               copies_remaining;       /* Number of copies remaining */
+  const char   *content_type,          /* CONTENT_TYPE environment variable */
+               *final_content_type;    /* FINAL_CONTENT_TYPE environment var */
+  int          fd;                     /* File descriptor */
+  off_t                bytes;                  /* Bytes copied */
+  char         buffer[16384];          /* Copy buffer */
 #if defined(HAVE_SIGACTION) && !defined(HAVE_SIGSET)
   struct sigaction action;             /* Actions for POSIX signals */
 #endif /* HAVE_SIGACTION && !HAVE_SIGSET */
   int          version;                /* IPP version */
-  int          reasons;                /* Number of printer-state-reasons */
   static const char * const pattrs[] =
                {                       /* Printer attributes we want */
                  "copies-supported",
                  "document-format-supported",
+                 "marker-colors",
+                 "marker-high-levels",
+                 "marker-levels",
+                 "marker-low-levels",
+                 "marker-message",
+                 "marker-names",
+                 "marker-types",
+                 "media-col-supported",
                  "printer-is-accepting-jobs",
                  "printer-state",
+                 "printer-state-message",
                  "printer-state-reasons",
                };
   static const char * const jattrs[] =
@@ -188,15 +196,16 @@ main(int  argc,                           /* I - Number of command-line args */
     else
       s = argv[0];
 
-    printf("network %s \"Unknown\" \"Internet Printing Protocol (%s)\"\n",
-           s, s);
+    printf("network %s \"Unknown\" \"%s (%s)\"\n",
+           s, _cupsLangString(cupsLangDefault(),
+                             _("Internet Printing Protocol")), s);
     return (CUPS_BACKEND_OK);
   }
   else if (argc < 6)
   {
-    fprintf(stderr,
-            "Usage: %s job-id user title copies options [file ... fileN]\n",
-            argv[0]);
+    _cupsLangPrintf(stderr,
+                    _("Usage: %s job-id user title copies options [file]\n"),
+                   argv[0]);
     return (CUPS_BACKEND_STOP);
   }
 
@@ -204,87 +213,45 @@ main(int  argc,                           /* I - Number of command-line args */
   * Get the (final) content type...
   */
 
-  if ((content_type = getenv("FINAL_CONTENT_TYPE")) == NULL)
+  if ((content_type = getenv("CONTENT_TYPE")) == NULL)
     content_type = "application/octet-stream";
 
- /*
-  * Extract the hostname and printer name from the URI...
-  */
-
-  if (httpSeparateURI(HTTP_URI_CODING_ALL, cupsBackendDeviceURI(argv),
-                      method, sizeof(method), username, sizeof(username),
-                     hostname, sizeof(hostname), &port,
-                     resource, sizeof(resource)) < HTTP_URI_OK)
+  if ((final_content_type = getenv("FINAL_CONTENT_TYPE")) == NULL)
   {
-    fputs("ERROR: Missing device URI on command-line and no DEVICE_URI "
-          "environment variable!\n", stderr);
-    return (CUPS_BACKEND_STOP);
-  }
+    final_content_type = content_type;
 
-  if (!strcmp(method, "https"))
-    cupsSetEncryption(HTTP_ENCRYPT_ALWAYS);
+    if (!strncmp(final_content_type, "printer/", 8))
+      final_content_type = "application/vnd.cups-raw";
+  }
 
  /*
-  * If we have 7 arguments, print the file named on the command-line.
-  * Otherwise, copy stdin to a temporary file and print the temporary
-  * file.
+  * Extract the hostname and printer name from the URI...
   */
 
-  if (argc == 6)
-  {
-   /*
-    * Copy stdin to a temporary file...
-    */
-
-    int  fd;           /* Temporary file */
-    char buffer[8192]; /* Buffer for copying */
-    int  bytes;                /* Number of bytes read */
-
-
-    if ((fd = cupsTempFd(tmpfilename, sizeof(tmpfilename))) < 0)
-    {
-      perror("ERROR: unable to create temporary file");
-      return (CUPS_BACKEND_FAILED);
-    }
-
-    while ((bytes = fread(buffer, 1, sizeof(buffer), stdin)) > 0)
-      if (write(fd, buffer, bytes) < bytes)
-      {
-        perror("ERROR: unable to write to temporary file");
-       close(fd);
-       unlink(tmpfilename);
-       return (CUPS_BACKEND_FAILED);
-      }
+  if ((device_uri = cupsBackendDeviceURI(argv)) == NULL)
+    return (CUPS_BACKEND_FAILED);
 
-    close(fd);
+  httpSeparateURI(HTTP_URI_CODING_ALL, device_uri, scheme, sizeof(scheme),
+                  username, sizeof(username), hostname, sizeof(hostname), &port,
+                 resource, sizeof(resource));
 
-   /*
-    * Point to the single file from stdin...
-    */
+  if (!port)
+    port = IPP_PORT;                   /* Default to port 631 */
 
-    filename  = tmpfilename;
-    files     = &filename;
-    num_files = 1;
-  }
+  if (!strcmp(scheme, "https"))
+    cupsSetEncryption(HTTP_ENCRYPT_ALWAYS);
   else
-  {
-   /*
-    * Point to the files on the command-line...
-    */
-
-    num_files = argc - 6;
-    files     = argv + 6;
-  }
-
-  fprintf(stderr, "DEBUG: %d files to send in job...\n", num_files);
+    cupsSetEncryption(HTTP_ENCRYPT_IF_REQUESTED);
 
  /*
   * See if there are any options...
   */
 
-  version     = 1;
+  compression = 0;
+  version     = 20;
   waitjob     = 1;
   waitprinter = 1;
+  contimeout  = 7 * 24 * 60 * 60;
 
   if ((optptr = strchr(resource, '?')) != NULL)
   {
@@ -305,29 +272,30 @@ main(int  argc,                           /* I - Number of command-line args */
       * Get the name...
       */
 
-      for (ptr = name; *optptr && *optptr != '=';)
-        if (ptr < (name + sizeof(name) - 1))
-          *ptr++ = *optptr++;
-      *ptr = '\0';
+      name = optptr;
 
-      if (*optptr == '=')
+      while (*optptr && *optptr != '=' && *optptr != '+' && *optptr != '&')
+        optptr ++;
+
+      if ((sep = *optptr) != '\0')
+        *optptr++ = '\0';
+
+      if (sep == '=')
       {
        /*
         * Get the value...
        */
 
-        optptr ++;
-
-       for (ptr = value; *optptr && *optptr != '+' && *optptr != '&';)
-          if (ptr < (value + sizeof(value) - 1))
-            *ptr++ = *optptr++;
-       *ptr = '\0';
+        value = optptr;
 
-       if (*optptr == '+')
+       while (*optptr && *optptr != '+' && *optptr != '&')
          optptr ++;
+
+        if (*optptr)
+         *optptr++ = '\0';
       }
       else
-        value[0] = '\0';
+        value = (char *)"";
 
      /*
       * Process the option...
@@ -369,34 +337,94 @@ main(int  argc,                           /* I - Number of command-line args */
          cupsSetEncryption(HTTP_ENCRYPT_IF_REQUESTED);
        else
        {
-         fprintf(stderr, "ERROR: Unknown encryption option value \"%s\"!\n",
-                 value);
+         _cupsLangPrintf(stderr,
+                         _("ERROR: Unknown encryption option value \"%s\"\n"),
+                         value);
         }
       }
       else if (!strcasecmp(name, "version"))
       {
         if (!strcmp(value, "1.0"))
-         version = 0;
+         version = 10;
        else if (!strcmp(value, "1.1"))
-         version = 1;
+         version = 11;
+       else if (!strcmp(value, "2.0"))
+         version = 20;
+       else if (!strcmp(value, "2.1"))
+         version = 21;
        else
        {
-         fprintf(stderr, "ERROR: Unknown version option value \"%s\"!\n",
-                 value);
+         _cupsLangPrintf(stderr,
+                         _("ERROR: Unknown version option value \"%s\"\n"),
+                         value);
        }
       }
+#ifdef HAVE_LIBZ
+      else if (!strcasecmp(name, "compression"))
+      {
+        compression = !strcasecmp(value, "true") ||
+                     !strcasecmp(value, "yes") ||
+                     !strcasecmp(value, "on") ||
+                     !strcasecmp(value, "gzip");
+      }
+#endif /* HAVE_LIBZ */
+      else if (!strcasecmp(name, "contimeout"))
+      {
+       /*
+        * Set the connection timeout...
+       */
+
+       if (atoi(value) > 0)
+         contimeout = atoi(value);
+      }
       else
       {
        /*
         * Unknown option...
        */
 
-       fprintf(stderr, "ERROR: Unknown option \"%s\" with value \"%s\"!\n",
-               name, value);
+       _cupsLangPrintf(stderr,
+                       _("ERROR: Unknown option \"%s\" with value \"%s\"\n"),
+                       name, value);
       }
     }
   }
 
+ /*
+  * If we have 7 arguments, print the file named on the command-line.
+  * Otherwise, copy stdin to a temporary file and print the temporary
+  * file.
+  */
+
+  if (argc == 6)
+  {
+    num_files    = 0;
+    send_options = !strcasecmp(final_content_type, "application/pdf") ||
+                   !strcasecmp(final_content_type, "application/vnd.cups-pdf") ||
+                   !strcasecmp(final_content_type, "image/jpeg") ||
+                   !strcasecmp(final_content_type, "image/png") ||
+                   !strcasecmp(final_content_type, "image/urf");
+
+    fputs("DEBUG: Sending stdin for job...\n", stderr);
+  }
+  else
+  {
+   /*
+    * Point to the files on the command-line...
+    */
+
+    num_files    = argc - 6;
+    files        = argv + 6;
+    send_options = 1;
+
+#ifdef HAVE_LIBZ
+    if (compression)
+      compress_files(num_files, files);
+#endif /* HAVE_LIBZ */
+
+    fprintf(stderr, "DEBUG: %d files to send in job...\n", num_files);
+  }
+
  /*
   * Set the authentication info, if any...
   */
@@ -417,72 +445,38 @@ main(int  argc,                           /* I - Number of command-line args */
   else if (!getuid())
   {
    /*
-    * Try loading authentication information from the a##### file.
+    * Try loading authentication information from the environment.
     */
 
-    const char *request_root;          /* CUPS_REQUESTROOT env var */
-    char       afilename[1024],        /* a##### filename */
-               aline[1024];            /* Line from file */
-    FILE       *fp;                    /* File pointer */
-
-
-    if ((request_root = getenv("CUPS_REQUESTROOT")) != NULL)
-    {
-     /*
-      * Try opening authentication cache file...
-      */
-
-      snprintf(afilename, sizeof(afilename), "%s/a%05d", request_root,
-               atoi(argv[1]));
-      if ((fp = fopen(afilename, "r")) != NULL)
-      {
-       /*
-        * Read username...
-       */
-
-        if (fgets(aline, sizeof(aline), fp))
-       {
-        /*
-         * Decode username...
-         */
-
-          i = sizeof(username);
-         httpDecode64_2(username, &i, aline);
-
-         /*
-         * Read password...
-         */
+    const char *ptr = getenv("AUTH_USERNAME");
 
-         if (fgets(aline, sizeof(aline), fp))
-         {
-          /*
-           * Decode password...
-           */
+    if (ptr)
+      cupsSetUser(ptr);
 
-           i = sizeof(password);
-           httpDecode64_2(password, &i, aline);
-         }
-       }
-
-       /*
-        * Close the file...
-       */
-
-        fclose(fp);
-      }
-    }
+    password = getenv("AUTH_PASSWORD");
   }
 
  /*
   * Try connecting to the remote server...
   */
 
+  delay      = 5;
+  start_time = time(NULL);
+
+  fputs("STATE: +connecting-to-device\n", stderr);
+
   do
   {
-    fprintf(stderr, "INFO: Connecting to %s on port %d...\n", hostname, port);
+    fprintf(stderr, "DEBUG: Connecting to %s:%d\n", hostname, port);
+    _cupsLangPuts(stderr, _("INFO: Connecting to printer...\n"));
 
     if ((http = httpConnectEncrypt(hostname, port, cupsEncryption())) == NULL)
     {
+      int error = errno;               /* Connection error */
+
+      if (job_canceled)
+       break;
+
       if (getenv("CLASS") != NULL)
       {
        /*
@@ -492,13 +486,9 @@ main(int  argc,                            /* I - Number of command-line args */
        * available printer in the class.
        */
 
-        fprintf(stderr,
-               "INFO: Unable to connect to %s, queuing on next printer in "
-               "class...\n",
-               hostname);
-
-        if (argc == 6 || strcmp(filename, argv[6]))
-         unlink(filename);
+        _cupsLangPuts(stderr,
+                     _("INFO: Unable to contact printer, queuing on next "
+                       "printer in class...\n"));
 
        /*
         * Sleep 5 seconds to keep the job from requeuing too rapidly...
@@ -509,31 +499,93 @@ main(int  argc,                           /* I - Number of command-line args */
         return (CUPS_BACKEND_FAILED);
       }
 
+      fprintf(stderr, "DEBUG: Connection error: %s\n", strerror(errno));
+
       if (errno == ECONNREFUSED || errno == EHOSTDOWN ||
           errno == EHOSTUNREACH)
       {
-       fprintf(stderr,
-               "INFO: Network host \'%s\' is busy; will retry in 30 "
-               "seconds...\n",
-                hostname);
-       sleep(30);
+        if (contimeout && (time(NULL) - start_time) > contimeout)
+       {
+         _cupsLangPuts(stderr, _("ERROR: The printer is not responding.\n"));
+         return (CUPS_BACKEND_FAILED);
+       }
+
+       switch (error)
+       {
+         case EHOSTDOWN :
+             _cupsLangPrintf(stderr,
+                             _("WARNING: Network printer \'%s\' may not exist "
+                               "or is unavailable at this time.\n"), 
+                             hostname);
+             break;
+
+         case EHOSTUNREACH :
+             _cupsLangPrintf(stderr,
+                             _("WARNING: Network printer \'%s\' is "
+                               "unreachable at this time.\n"), 
+                             hostname);
+             break;
+
+         case ECONNREFUSED :
+         default :
+             _cupsLangPrintf(stderr,
+                             _("WARNING: Network printer \'%s\' is busy.\n"),
+                             hostname);
+             break;
+        }
+
+       sleep(delay);
+
+       if (delay < 30)
+         delay += 5;
       }
       else if (h_errno)
       {
-        fprintf(stderr, "INFO: Unable to lookup host \'%s\' - %s\n",
-               hostname, hstrerror(h_errno));
-       sleep(30);
+       _cupsLangPrintf(stderr,
+                       _("ERROR: Unable to locate network printer \'%s\'.\n"),
+                       hostname);
+       return (CUPS_BACKEND_STOP);
       }
       else
       {
-       perror("ERROR: Unable to connect to IPP host");
+       _cupsLangPrintf(stderr, _("ERROR: Network printer \'%s\' is not "
+                                 "responding.\n"), hostname);
        sleep(30);
       }
+
+      if (job_canceled)
+       break;
     }
   }
   while (http == NULL);
 
-  fprintf(stderr, "INFO: Connected to %s...\n", hostname);
+  if (job_canceled || !http)
+    return (CUPS_BACKEND_FAILED);
+
+  fputs("STATE: -connecting-to-device\n", stderr);
+  _cupsLangPuts(stderr, _("INFO: Connected to printer...\n"));
+
+#ifdef AF_INET6
+  if (http->hostaddr->addr.sa_family == AF_INET6)
+    fprintf(stderr, "DEBUG: Connected to [%s]:%d (IPv6)...\n",
+           httpAddrString(http->hostaddr, addrname, sizeof(addrname)),
+           ntohs(http->hostaddr->ipv6.sin6_port));
+  else
+#endif /* AF_INET6 */
+    if (http->hostaddr->addr.sa_family == AF_INET)
+      fprintf(stderr, "DEBUG: Connected to %s:%d (IPv4)...\n",
+             httpAddrString(http->hostaddr, addrname, sizeof(addrname)),
+             ntohs(http->hostaddr->ipv4.sin_port));
+
+ /*
+  * See if the printer supports SNMP...
+  */
+
+  if ((snmp_fd = _cupsSNMPOpen(http->hostaddr->addr.sa_family)) >= 0)
+    have_supplies = !backendSNMPSupplies(snmp_fd, http->hostaddr, &start_count,
+                                         NULL);
+  else
+    have_supplies = start_count = 0;
 
  /*
   * Build a URI for the printer and fill the standard IPP attributes for
@@ -541,26 +593,35 @@ main(int  argc,                           /* I - Number of command-line args */
   * might contain username:password information...
   */
 
-  snprintf(uri, sizeof(uri), "%s://%s:%d%s", method, hostname, port, resource);
+  httpAssembleURI(HTTP_URI_CODING_ALL, uri, sizeof(uri), scheme, NULL, hostname,
+                 port, resource);
 
  /*
   * First validate the destination and see if the device supports multiple
-  * copies.  We have to do this because some IPP servers (e.g. HP JetDirect)
-  * don't support the copies attribute...
+  * copies...
   */
 
-  copies_sup = NULL;
-  format_sup = NULL;
-  supported  = NULL;
+  copies_sup    = NULL;
+  cups_version  = NULL;
+  format_sup    = NULL;
+  media_col_sup = NULL;
+  supported     = NULL;
 
   do
   {
+   /*
+    * Check for side-channel requests...
+    */
+
+    backendCheckSideChannel(snmp_fd, http->hostaddr);
+
    /*
     * Build the IPP request...
     */
 
     request = ippNewRequest(IPP_GET_PRINTER_ATTRIBUTES);
-    request->request.op.version[1] = version;
+    request->request.op.version[0] = version / 10;
+    request->request.op.version[1] = version % 10;
 
     ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, "printer-uri",
                 NULL, uri);
@@ -575,6 +636,17 @@ main(int  argc,                            /* I - Number of command-line args */
 
     fputs("DEBUG: Getting supported attributes...\n", stderr);
 
+    if (http->version < HTTP_1_1)
+    {
+      fprintf(stderr, "DEBUG: Printer responded with HTTP version %d.%d.\n",
+              http->version / 100, http->version % 100);
+
+      _cupsLangPuts(stderr,
+                    _("ERROR: Unable to print: the printer does not conform to "
+                     "the IPP standard.\n"));
+      exit(CUPS_BACKEND_STOP);
+    }
+
     if ((supported = cupsDoRequest(http, request, resource)) == NULL)
       ipp_status = cupsLastError();
     else
@@ -585,35 +657,70 @@ main(int  argc,                           /* I - Number of command-line args */
       if (ipp_status == IPP_PRINTER_BUSY ||
          ipp_status == IPP_SERVICE_UNAVAILABLE)
       {
-       fputs("INFO: Printer busy; will retry in 10 seconds...\n", stderr);
-        report_printer_state(supported);
-       sleep(10);
+        if (contimeout && (time(NULL) - start_time) > contimeout)
+       {
+         _cupsLangPuts(stderr, _("ERROR: The printer is not responding.\n"));
+         return (CUPS_BACKEND_FAILED);
+       }
+
+       _cupsLangPrintf(stderr,
+                       _("WARNING: Network host \'%s\' is busy; will retry in "
+                         "%d seconds...\n"), hostname, delay);
+
+        report_printer_state(supported, 0);
+
+       sleep(delay);
+
+       if (delay < 30)
+         delay += 5;
       }
       else if ((ipp_status == IPP_BAD_REQUEST ||
-               ipp_status == IPP_VERSION_NOT_SUPPORTED) && version == 1)
+               ipp_status == IPP_VERSION_NOT_SUPPORTED) && version > 10)
       {
        /*
-       * Switch to IPP/1.0...
+       * Switch to IPP/1.1 or IPP/1.0...
        */
 
-       fputs("INFO: Printer does not support IPP/1.1, trying IPP/1.0...\n",
-             stderr);
-       version = 0;
+        if (version >= 20)
+       {
+         _cupsLangPrintf(stderr,
+                         _("INFO: Printer does not support IPP/%d.%d, trying "
+                           "IPP/%s...\n"), version / 10, version % 10, "1.1");
+         version = 11;
+       }
+       else
+       {
+         _cupsLangPrintf(stderr,
+                         _("INFO: Printer does not support IPP/%d.%d, trying "
+                           "IPP/%s...\n"), version / 10, version % 10, "1.0");
+         version = 10;
+        }
+
        httpReconnect(http);
       }
       else if (ipp_status == IPP_NOT_FOUND)
       {
-        fputs("ERROR: Destination printer does not exist!\n", stderr);
+        _cupsLangPuts(stderr, _("ERROR: The printer URI is incorrect or no longer exists.\n"));
 
        if (supported)
           ippDelete(supported);
 
        return (CUPS_BACKEND_STOP);
       }
+      else if (ipp_status == IPP_NOT_AUTHORIZED || ipp_status == IPP_FORBIDDEN)
+      {
+       if (!strncmp(httpGetField(http, HTTP_FIELD_WWW_AUTHENTICATE),
+                    "Negotiate", 9))
+         auth_info_required = "negotiate";
+
+       fprintf(stderr, "ATTR: auth-info-required=%s\n", auth_info_required);
+       return (CUPS_BACKEND_AUTH_REQUIRED);
+      }
       else
       {
-       fprintf(stderr, "ERROR: Unable to get printer status (%s)!\n",
-               ippErrorString(ipp_status));
+       _cupsLangPrintf(stderr,
+                       _("ERROR: Unable to get printer status (%s)\n"),
+                       cupsLastErrorString());
         sleep(10);
       }
 
@@ -622,22 +729,31 @@ main(int  argc,                           /* I - Number of command-line args */
 
       continue;
     }
-    else if ((copies_sup = ippFindAttribute(supported, "copies-supported",
-                                           IPP_TAG_RANGE)) != NULL)
+
+   /*
+    * Check for supported attributes...
+    */
+
+    if ((copies_sup = ippFindAttribute(supported, "copies-supported",
+                                      IPP_TAG_RANGE)) != NULL)
     {
      /*
       * Has the "copies-supported" attribute - does it have an upper
       * bound > 1?
       */
 
+      fprintf(stderr, "DEBUG: copies-supported=%d-%d\n",
+             copies_sup->values[0].range.lower,
+             copies_sup->values[0].range.upper);
+
       if (copies_sup->values[0].range.upper <= 1)
        copies_sup = NULL; /* No */
     }
 
-    format_sup = ippFindAttribute(supported, "document-format-supported",
-                                 IPP_TAG_MIMETYPE);
+    cups_version = ippFindAttribute(supported, "cups-version", IPP_TAG_TEXT);
 
-    if (format_sup)
+    if ((format_sup = ippFindAttribute(supported, "document-format-supported",
+                                      IPP_TAG_MIMETYPE)) != NULL)
     {
       fprintf(stderr, "DEBUG: document-format-supported (%d values)\n",
              format_sup->num_values);
@@ -646,7 +762,17 @@ main(int  argc,                            /* I - Number of command-line args */
                format_sup->values[i].string.text);
     }
 
-    report_printer_state(supported);
+    if ((media_col_sup = ippFindAttribute(supported, "media-col-supported",
+                                         IPP_TAG_KEYWORD)) != NULL)
+    {
+      fprintf(stderr, "DEBUG: media-col-supported (%d values)\n",
+             media_col_sup->num_values);
+      for (i = 0; i < media_col_sup->num_values; i ++)
+       fprintf(stderr, "DEBUG: [%d] = \"%s\"\n", i,
+               media_col_sup->values[i].string.text);
+    }
+
+    report_printer_state(supported, 0);
   }
   while (ipp_status > IPP_OK_CONFLICT);
 
@@ -675,17 +801,13 @@ main(int  argc,                           /* I - Number of command-line args */
       * available printer in the class.
       */
 
-      fprintf(stderr,
-              "INFO: Unable to queue job on %s, queuing on next printer in "
-             "class...\n",
-             hostname);
+      _cupsLangPuts(stderr,
+                    _("INFO: Unable to contact printer, queuing on next "
+                     "printer in class...\n"));
 
       ippDelete(supported);
       httpClose(http);
 
-      if (argc == 6 || strcmp(filename, argv[6]))
-       unlink(filename);
-
      /*
       * Sleep 5 seconds to keep the job from requeuing too rapidly...
       */
@@ -700,25 +822,37 @@ main(int  argc,                           /* I - Number of command-line args */
   * See if the printer supports multiple copies...
   */
 
+  copies = atoi(argv[4]);
+
   if (copies_sup || argc < 7)
-    copies = 1;
+  {
+    copies_remaining = 1;
+
+    if (argc < 7)
+      copies = 1;
+  }
   else
-    copies = atoi(argv[4]);
+    copies_remaining = copies;
 
  /*
   * Then issue the print-job request...
   */
 
-  reasons = 0;
   job_id  = 0;
 
-  while (copies > 0)
+  while (copies_remaining > 0)
   {
+   /*
+    * Check for side-channel requests...
+    */
+
+    backendCheckSideChannel(snmp_fd, http->hostaddr);
+
    /*
     * Build the IPP request...
     */
 
-    if (job_cancelled)
+    if (job_canceled)
       break;
 
     if (num_files > 1)
@@ -726,24 +860,37 @@ main(int  argc,                           /* I - Number of command-line args */
     else
       request = ippNewRequest(IPP_PRINT_JOB);
 
-    request->request.op.version[1] = version;
+    request->request.op.version[0] = version / 10;
+    request->request.op.version[1] = version % 10;
+
+    fprintf(stderr, "DEBUG: %s IPP/%d.%d\n",
+            ippOpString(request->request.op.operation_id),
+           request->request.op.version[0],
+           request->request.op.version[1]);
 
     ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, "printer-uri",
                 NULL, uri);
-
-    fprintf(stderr, "DEBUG: printer-uri = \"%s\"\n", uri);
+    fprintf(stderr, "DEBUG: printer-uri=\"%s\"\n", uri);
 
     if (argv[2][0])
+    {
       ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_NAME,
                    "requesting-user-name", NULL, argv[2]);
-
-    fprintf(stderr, "DEBUG: requesting-user-name = \"%s\"\n", argv[2]);
+      fprintf(stderr, "DEBUG: requesting-user-name=\"%s\"\n", argv[2]);
+    }
 
     if (argv[3][0])
+    {
       ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_NAME, "job-name", NULL,
                   argv[3]);
+      fprintf(stderr, "DEBUG: job-name=\"%s\"\n", argv[3]);
+    }
 
-    fprintf(stderr, "DEBUG: job-name = \"%s\"\n", argv[3]);
+#ifdef HAVE_LIBZ
+    if (compression)
+      ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_KEYWORD,
+                   "compression", NULL, "gzip");
+#endif /* HAVE_LIBZ */
 
    /*
     * Handle options on the command-line...
@@ -752,78 +899,147 @@ main(int  argc,                          /* I - Number of command-line args */
     options     = NULL;
     num_options = cupsParseOptions(argv[5], 0, &options);
 
-#ifdef __APPLE__
-    if (content_type != NULL &&
-        !strcasecmp(content_type, "application/pictwps") && num_files == 1)
+    if (format_sup != NULL)
     {
-      if (format_sup != NULL)
+      for (i = 0; i < format_sup->num_values; i ++)
+        if (!strcasecmp(final_content_type, format_sup->values[i].string.text))
+          break;
+
+      if (i < format_sup->num_values)
+        ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_MIMETYPE,
+                    "document-format", NULL, final_content_type);
+    }
+
+    if (send_options)
+    {
+      if (cups_version || !media_col_sup)
       {
-       for (i = 0; i < format_sup->num_values; i ++)
-         if (!strcasecmp(content_type, format_sup->values[i].string.text))
-           break;
-      }
+       /*
+        * When talking to another CUPS server, send all options...
+       */
 
-      if (format_sup == NULL || i >= format_sup->num_values)
+        cupsEncodeOptions(request, num_options, options);
+      }
+      else
       {
        /*
-       * Remote doesn't support "application/pictwps" (i.e. it's not MacOS X)
-       * so convert the document to PostScript...
+        * Otherwise send standard IPP attributes...
        */
 
-       if (run_pictwps_filter(argv, filename))
-         return (CUPS_BACKEND_FAILED);
+       char            cachefile[1024];/* Printer PWG cache file */
+       const char      *cups_cachedir; /* Location of cache file */
+        _pwg_t         *pwg;           /* PWG mapping data */
+       const char      *keyword;       /* PWG keyword */
+       _pwg_size_t     *size;          /* PWG media size */
 
-        filename = pstmpname;
 
-       /*
-       * Change the MIME type to application/postscript and change the
-       * number of copies to 1...
-       */
+        if ((cups_cachedir = getenv("CUPS_CACHEDIR")) == NULL)
+         cups_cachedir = CUPS_CACHEDIR;
 
-       content_type = "application/postscript";
-       copies       = 1;
-      }
-    }
-#endif /* __APPLE__ */
+       snprintf(cachefile, sizeof(cachefile), "%s/%s.pwg", cups_cachedir,
+                getenv("PRINTER"));
 
-    if (content_type != NULL && format_sup != NULL)
-    {
-      for (i = 0; i < format_sup->num_values; i ++)
-        if (!strcasecmp(content_type, format_sup->values[i].string.text))
-          break;
+       if ((keyword = cupsGetOption("PageSize", num_options, options)) == NULL)
+         keyword = cupsGetOption("media", num_options, options);
 
-      if (i < format_sup->num_values)
-        num_options = cupsAddOption("document-format", content_type,
-                                   num_options, &options);
-    }
+        pwg  = _pwgCreateWithFile(cachefile);
+       size = _pwgGetSize(pwg, keyword);
 
-    if (copies_sup)
-    {
-     /*
-      * Only send options if the destination printer supports the copies
-      * attribute.  This is a hack for the HP JetDirect implementation of
-      * IPP, which does not accept extension attributes and incorrectly
-      * reports a client-error-bad-request error instead of the
-      * successful-ok-unsupported-attributes status.  In short, at least
-      * some HP implementations of IPP are non-compliant.
-      */
+       if (media_col_sup && size)
+       {
+         ipp_t         *media_col,     /* media-col value */
+                       *media_size;    /* media-size value */
+         const char    *media_source,  /* media-source value */
+                       *media_type;    /* media-type value */
+
+         media_size = ippNew();
+         ippAddInteger(media_size, IPP_TAG_ZERO, IPP_TAG_INTEGER,
+                       "x-dimension", size->width);
+         ippAddInteger(media_size, IPP_TAG_ZERO, IPP_TAG_INTEGER,
+                       "y-dimension", size->length);
+
+         media_col = ippNew();
+         ippAddCollection(media_col, IPP_TAG_ZERO, "media-size", media_size);
+
+         media_source = _pwgGetSource(pwg, cupsGetOption("InputSlot",
+                                                         num_options,
+                                                         options));
+         media_type   = _pwgGetType(pwg, cupsGetOption("MediaType",
+                                                       num_options, options));
+
+         for (i = 0; i < media_col_sup->num_values; i ++)
+         {
+           if (!strcmp(media_col_sup->values[i].string.text,
+                       "media-left-margin"))
+             ippAddInteger(media_col, IPP_TAG_ZERO, IPP_TAG_INTEGER,
+                           "media-left-margin", size->left);
+           else if (!strcmp(media_col_sup->values[i].string.text,
+                            "media-bottom-margin"))
+             ippAddInteger(media_col, IPP_TAG_ZERO, IPP_TAG_INTEGER,
+                           "media-bottom-margin", size->left);
+           else if (!strcmp(media_col_sup->values[i].string.text,
+                            "media-right-margin"))
+             ippAddInteger(media_col, IPP_TAG_ZERO, IPP_TAG_INTEGER,
+                           "media-right-margin", size->left);
+           else if (!strcmp(media_col_sup->values[i].string.text,
+                            "media-top-margin"))
+             ippAddInteger(media_col, IPP_TAG_ZERO, IPP_TAG_INTEGER,
+                           "media-top-margin", size->left);
+           else if (!strcmp(media_col_sup->values[i].string.text,
+                            "media-source") && media_source)
+             ippAddString(media_col, IPP_TAG_ZERO, IPP_TAG_KEYWORD,
+                          "media-source", NULL, media_source);
+           else if (!strcmp(media_col_sup->values[i].string.text,
+                            "media-type") && media_type)
+             ippAddString(media_col, IPP_TAG_ZERO, IPP_TAG_KEYWORD,
+                          "media-type", NULL, media_type);
+          }
+
+          ippAddCollection(request, IPP_TAG_JOB, "media-col", media_col);
+       }
+       else if (size)
+         ippAddString(request, IPP_TAG_JOB, IPP_TAG_KEYWORD, "media",
+                      NULL, size->map.pwg);
+        else if (keyword)
+        {
+         _pwg_media_t  *found;         /* PWG media */
 
-      cupsEncodeOptions(request, num_options, options);
-      ippAddInteger(request, IPP_TAG_JOB, IPP_TAG_INTEGER, "copies",
-                    atoi(argv[4]));
-    }
 
-    cupsFreeOptions(num_options, options);
+          if ((found = _pwgMediaForPPD(keyword)) == NULL)
+           keyword = found->pwg;
+         else if ((found = _pwgMediaForLegacy(keyword)) == NULL)
+           keyword = found->pwg;
 
-   /*
-    * If copies aren't supported, then we are likely dealing with an HP
-    * JetDirect.  The HP IPP implementation seems to close the connection
-    * after every request (that is, it does *not* implement HTTP Keep-
-    * Alive, which is REQUIRED by HTTP/1.1...
-    */
+         ippAddString(request, IPP_TAG_JOB, IPP_TAG_KEYWORD, "media",
+                      NULL, keyword);
+        }
 
-    if (!copies_sup)
-      httpReconnect(http);
+        if ((keyword = cupsGetOption("output-bin", num_options,
+                                    options)) == NULL)
+         keyword = _pwgGetBin(pwg, cupsGetOption("OutputBin", num_options,
+                                                 options));
+
+       if (keyword)
+          ippAddString(request, IPP_TAG_JOB, IPP_TAG_KEYWORD, "output-bin",
+                      NULL, keyword);
+
+       if ((keyword = cupsGetOption("output-mode", num_options,
+                                    options)) != NULL)
+         ippAddString(request, IPP_TAG_JOB, IPP_TAG_KEYWORD, "output-mode",
+                      NULL, keyword);
+
+       if ((keyword = cupsGetOption("sides", num_options, options)) != NULL)
+         ippAddString(request, IPP_TAG_JOB, IPP_TAG_KEYWORD, "sides",
+                      NULL, keyword);
+                              
+       _pwgDestroy(pwg);
+      }
+
+      if (copies_sup && copies > 1)
+        ippAddInteger(request, IPP_TAG_JOB, IPP_TAG_INTEGER, "copies", copies);
+    }
+
+    cupsFreeOptions(num_options, options);
 
    /*
     * Do the request...
@@ -832,7 +1048,39 @@ main(int  argc,                           /* I - Number of command-line args */
     if (num_files > 1)
       response = cupsDoRequest(http, request, resource);
     else
-      response = cupsDoFileRequest(http, request, resource, files[0]);
+    {
+      fputs("DEBUG: Sending file using chunking...\n", stderr);
+      http_status = cupsSendRequest(http, request, resource, 0);
+      if (http_status == HTTP_CONTINUE && request->state == IPP_DATA)
+      {
+        if (num_files == 1)
+         fd = open(files[0], O_RDONLY);
+       else
+         fd = 0;
+
+        while ((bytes = read(fd, buffer, sizeof(buffer))) > 0)
+       {
+         fprintf(stderr, "DEBUG: Read %d bytes...\n", (int)bytes);
+
+         if (cupsWriteRequestData(http, buffer, bytes) != HTTP_CONTINUE)
+            break;
+          else
+         {
+          /*
+           * Check for side-channel requests...
+           */
+
+           backendCheckSideChannel(snmp_fd, http->hostaddr);
+         }
+       }
+
+        if (num_files == 1)
+         close(fd);
+      }
+
+      response = cupsGetResponse(http, resource);
+      ippDelete(request);
+    }
 
     ipp_status = cupsLastError();
 
@@ -840,43 +1088,79 @@ main(int  argc,                          /* I - Number of command-line args */
     {
       job_id = 0;
 
-      if (job_cancelled)
+      if (job_canceled)
         break;
 
       if (ipp_status == IPP_SERVICE_UNAVAILABLE ||
          ipp_status == IPP_PRINTER_BUSY)
       {
-       fputs("INFO: Printer is busy; retrying print job...\n", stderr);
+        _cupsLangPuts(stderr,
+                     _("INFO: Printer busy; will retry in 10 seconds...\n"));
        sleep(10);
       }
       else
-        fprintf(stderr, "ERROR: Print file was not accepted (%s)!\n",
-               cupsLastErrorString());
+      {
+       /*
+       * Update auth-info-required as needed...
+       */
+
+        _cupsLangPrintf(stderr, _("ERROR: Print file was not accepted (%s)\n"),
+                       cupsLastErrorString());
+
+       if (ipp_status == IPP_NOT_AUTHORIZED || ipp_status == IPP_FORBIDDEN)
+       {
+         fprintf(stderr, "DEBUG: WWW-Authenticate=\"%s\"\n",
+                 httpGetField(http, HTTP_FIELD_WWW_AUTHENTICATE));
+
+         /*
+         * Normal authentication goes through the password callback, which sets
+         * auth_info_required to "username,password".  Kerberos goes directly
+         * through GSSAPI, so look for Negotiate in the WWW-Authenticate header
+         * here and set auth_info_required as needed...
+         */
+
+         if (!strncmp(httpGetField(http, HTTP_FIELD_WWW_AUTHENTICATE),
+                      "Negotiate", 9))
+           auth_info_required = "negotiate";
+       }
+      }
     }
     else if ((job_id_attr = ippFindAttribute(response, "job-id",
                                              IPP_TAG_INTEGER)) == NULL)
     {
-      fputs("NOTICE: Print file accepted - job ID unknown.\n", stderr);
+      _cupsLangPuts(stderr,
+                    _("NOTICE: Print file accepted - job ID unknown.\n"));
       job_id = 0;
     }
     else
     {
       job_id = job_id_attr->values[0].integer;
-      fprintf(stderr, "NOTICE: Print file accepted - job ID %d.\n", job_id);
+      _cupsLangPrintf(stderr, _("NOTICE: Print file accepted - job ID %d.\n"),
+                      job_id);
     }
 
     ippDelete(response);
 
-    if (job_cancelled)
+    if (job_canceled)
       break;
 
     if (job_id && num_files > 1)
     {
       for (i = 0; i < num_files; i ++)
       {
-       request = ippNewRequest(IPP_SEND_DOCUMENT);
+       /*
+       * Check for side-channel requests...
+       */
 
-       request->request.op.version[1] = version;
+       backendCheckSideChannel(snmp_fd, http->hostaddr);
+
+       /*
+        * Send the next file in the job...
+       */
+
+       request = ippNewRequest(IPP_SEND_DOCUMENT);
+       request->request.op.version[0] = version / 10;
+       request->request.op.version[1] = version % 10;
 
        ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, "printer-uri",
                     NULL, uri);
@@ -894,14 +1178,38 @@ main(int  argc,                          /* I - Number of command-line args */
         ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_MIMETYPE,
                     "document-format", NULL, content_type);
 
-        ippDelete(cupsDoFileRequest(http, request, resource, files[i]));
+       fprintf(stderr, "DEBUG: Sending file %d using chunking...\n", i + 1);
+       http_status = cupsSendRequest(http, request, resource, 0);
+       if (http_status == HTTP_CONTINUE && request->state == IPP_DATA &&
+           (fd = open(files[i], O_RDONLY)) >= 0)
+       {
+         while ((bytes = read(fd, buffer, sizeof(buffer))) > 0)
+         {
+           if (cupsWriteRequestData(http, buffer, bytes) != HTTP_CONTINUE)
+             break;
+           else
+           {
+            /*
+             * Check for side-channel requests...
+             */
+
+             backendCheckSideChannel(snmp_fd, http->hostaddr);
+           }
+         }
+
+         close(fd);
+       }
+
+       ippDelete(cupsGetResponse(http, resource));
+       ippDelete(request);
 
        if (cupsLastError() > IPP_OK_CONFLICT)
        {
          ipp_status = cupsLastError();
 
-         fprintf(stderr, "ERROR: Unable to add file %d to job: %s\n",
-                 job_id, cupsLastErrorString());
+         _cupsLangPrintf(stderr,
+                         _("ERROR: Unable to add file %d to job: %s\n"),
+                         job_id, cupsLastErrorString());
          break;
        }
       }
@@ -910,13 +1218,13 @@ main(int  argc,                          /* I - Number of command-line args */
     if (ipp_status <= IPP_OK_CONFLICT && argc > 6)
     {
       fprintf(stderr, "PAGE: 1 %d\n", copies_sup ? atoi(argv[4]) : 1);
-      copies --;
+      copies_remaining --;
     }
     else if (ipp_status == IPP_SERVICE_UNAVAILABLE ||
             ipp_status == IPP_PRINTER_BUSY)
-      break;
+      continue;
     else
-      copies --;
+      copies_remaining --;
 
    /*
     * Wait for the job to complete...
@@ -925,16 +1233,23 @@ main(int  argc,                          /* I - Number of command-line args */
     if (!job_id || !waitjob)
       continue;
 
-    fputs("INFO: Waiting for job to complete...\n", stderr);
+    _cupsLangPuts(stderr, _("INFO: Waiting for job to complete...\n"));
 
-    for (; !job_cancelled;)
+    for (delay = 1; !job_canceled;)
     {
+     /*
+      * Check for side-channel requests...
+      */
+
+      backendCheckSideChannel(snmp_fd, http->hostaddr);
+
      /*
       * Build an IPP_GET_JOB_ATTRIBUTES request...
       */
 
       request = ippNewRequest(IPP_GET_JOB_ATTRIBUTES);
-      request->request.op.version[1] = version;
+      request->request.op.version[0] = version / 10;
+      request->request.op.version[1] = version % 10;
 
       ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, "printer-uri",
                   NULL, uri);
@@ -954,9 +1269,6 @@ main(int  argc,                            /* I - Number of command-line args */
       * Do the request...
       */
 
-      if (!copies_sup)
-       httpReconnect(http);
-
       response   = cupsDoRequest(http, request, resource);
       ipp_status = cupsLastError();
 
@@ -979,8 +1291,9 @@ main(int  argc,                            /* I - Number of command-line args */
        {
          ippDelete(response);
 
-          fprintf(stderr, "ERROR: Unable to get job %d attributes (%s)!\n",
-                 job_id, ippErrorString(ipp_status));
+          _cupsLangPrintf(stderr,
+                         _("ERROR: Unable to get job %d attributes (%s)\n"),
+                         job_id, cupsLastErrorString());
           break;
        }
       }
@@ -994,8 +1307,7 @@ main(int  argc,                            /* I - Number of command-line args */
           * Stop polling if the job is finished or pending-held...
          */
 
-          if (job_state->values[0].integer > IPP_JOB_PROCESSING ||
-             job_state->values[0].integer == IPP_JOB_HELD)
+          if (job_state->values[0].integer > IPP_JOB_STOPPED)
          {
            if ((job_sheets = ippFindAttribute(response, 
                                               "job-media-sheets-completed",
@@ -1007,6 +1319,19 @@ main(int  argc,                          /* I - Number of command-line args */
            break;
          }
        }
+       else
+       {
+        /*
+         * If the printer does not return a job-state attribute, it does not
+         * conform to the IPP specification - break out immediately and fail
+         * the job...
+         */
+
+          fputs("DEBUG: No job-state available from printer - stopping queue.\n",
+               stderr);
+         ipp_status = IPP_INTERNAL_ERROR;
+         break;
+       }
       }
 
       ippDelete(response);
@@ -1015,13 +1340,17 @@ main(int  argc,                         /* I - Number of command-line args */
       * Check the printer state and report it if necessary...
       */
 
-      check_printer_state(http, uri, resource, argv[2], version);
+      check_printer_state(http, uri, resource, argv[2], version, job_id);
 
      /*
-      * Wait 10 seconds before polling again...
+      * Wait 1-10 seconds before polling again...
       */
 
-      sleep(10);
+      sleep(delay);
+
+      delay ++;
+      if (delay > 10)
+        delay = 1;
     }
   }
 
@@ -1029,14 +1358,32 @@ main(int  argc,                         /* I - Number of command-line args */
   * Cancel the job as needed...
   */
 
-  if (job_cancelled && job_id)
+  if (job_canceled && job_id)
     cancel_job(http, uri, job_id, resource, argv[2], version);
 
  /*
   * Check the printer state and report it if necessary...
   */
 
-  check_printer_state(http, uri, resource, argv[2], version);
+  check_printer_state(http, uri, resource, argv[2], version, job_id);
+
+ /*
+  * Collect the final page count as needed...
+  */
+
+  if (have_supplies && 
+      !backendSNMPSupplies(snmp_fd, http->hostaddr, &page_count, NULL) &&
+      page_count > start_count)
+    fprintf(stderr, "PAGE: total %d\n", page_count - start_count);
+
+#ifdef HAVE_GSSAPI
+ /*
+  * See if we used Kerberos at all...
+  */
+
+  if (http->gssctx)
+    auth_info_required = "negotiate";
+#endif /* HAVE_GSSAPI */
 
  /*
   * Free memory...
@@ -1050,19 +1397,31 @@ main(int  argc,                         /* I - Number of command-line args */
   * Remove the temporary file(s) if necessary...
   */
 
-  if (tmpfilename[0])
-    unlink(tmpfilename);
-
-#ifdef __APPLE__
-  if (pstmpname[0])
-    unlink(pstmpname);
-#endif /* __APPLE__ */
+#ifdef HAVE_LIBZ
+  if (compression)
+  {
+    for (i = 0; i < num_files; i ++)
+      unlink(files[i]);
+  }
+#endif /* HAVE_LIBZ */
 
  /*
   * Return the queue status...
   */
 
-  return (ipp_status > IPP_OK_CONFLICT ? CUPS_BACKEND_FAILED : CUPS_BACKEND_OK);
+  fprintf(stderr, "ATTR: auth-info-required=%s\n", auth_info_required);
+
+  if (ipp_status == IPP_NOT_AUTHORIZED || ipp_status == IPP_FORBIDDEN)
+    return (CUPS_BACKEND_AUTH_REQUIRED);
+  else if (ipp_status == IPP_INTERNAL_ERROR)
+    return (CUPS_BACKEND_STOP);
+  else if (ipp_status > IPP_OK_CONFLICT)
+    return (CUPS_BACKEND_FAILED);
+  else
+  {
+    _cupsLangPuts(stderr, _("INFO: Ready to print.\n"));
+    return (CUPS_BACKEND_OK);
+  }
 }
 
 
@@ -1081,10 +1440,11 @@ cancel_job(http_t     *http,            /* I - HTTP connection */
   ipp_t        *request;                       /* Cancel-Job request */
 
 
-  fputs("INFO: Cancelling print job...\n", stderr);
+  _cupsLangPuts(stderr, _("INFO: Canceling print job...\n"));
 
   request = ippNewRequest(IPP_CANCEL_JOB);
-  request->request.op.version[1] = version;
+  request->request.op.version[0] = version / 10;
+  request->request.op.version[1] = version % 10;
 
   ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, "printer-uri",
                NULL, uri);
@@ -1101,8 +1461,8 @@ cancel_job(http_t     *http,              /* I - HTTP connection */
   ippDelete(cupsDoRequest(http, request, resource));
 
   if (cupsLastError() > IPP_OK_CONFLICT)
-    fprintf(stderr, "ERROR: Unable to cancel job %d: %s\n", id,
-            cupsLastErrorString());
+    _cupsLangPrintf(stderr, _("ERROR: Unable to cancel job %d: %s\n"), id,
+                   cupsLastErrorString());
 }
 
 
@@ -1116,10 +1476,21 @@ check_printer_state(
     const char  *uri,                  /* I - Printer URI */
     const char  *resource,             /* I - Resource path */
     const char  *user,                 /* I - Username, if any */
-    int         version)               /* I - IPP version */
+    int         version,               /* I - IPP version */
+    int         job_id)                        /* I - Current job ID */
 {
   ipp_t        *request,                       /* IPP request */
        *response;                      /* IPP response */
+  static const char * const attrs[] =  /* Attributes we want */
+  {
+    "marker-colors",
+    "marker-levels",
+    "marker-message",
+    "marker-names",
+    "marker-types",
+    "printer-state-message",
+    "printer-state-reasons"
+  };
 
 
  /*
@@ -1127,7 +1498,8 @@ check_printer_state(
   */
 
   request = ippNewRequest(IPP_GET_PRINTER_ATTRIBUTES);
-  request->request.op.version[1] = version;
+  request->request.op.version[0] = version / 10;
+  request->request.op.version[1] = version % 10;
 
   ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, "printer-uri",
                NULL, uri);
@@ -1136,8 +1508,9 @@ check_printer_state(
     ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_NAME,
                  "requesting-user-name", NULL, user);
 
-  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_KEYWORD,
-               "requested-attributes", NULL, "printer-state-reasons");
+  ippAddStrings(request, IPP_TAG_OPERATION, IPP_TAG_KEYWORD,
+                "requested-attributes",
+               (int)(sizeof(attrs) / sizeof(attrs[0])), NULL, attrs);
 
  /*
   * Do the request...
@@ -1145,322 +1518,260 @@ check_printer_state(
 
   if ((response = cupsDoRequest(http, request, resource)) != NULL)
   {
-    report_printer_state(response);
+    report_printer_state(response, job_id);
     ippDelete(response);
   }
 }
 
 
+#ifdef HAVE_LIBZ
 /*
- * 'password_cb()' - Disable the password prompt for cupsDoFileRequest().
+ * 'compress_files()' - Compress print files...
  */
 
-static const char *                    /* O - Password  */
-password_cb(const char *prompt)                /* I - Prompt (not used) */
+static void
+compress_files(int  num_files,         /* I - Number of files */
+               char **files)           /* I - Files */
 {
-  (void)prompt;
-
-  if (password)
-    return (password);
-  else
+  int          i,                      /* Looping var */
+               fd;                     /* Temporary file descriptor */
+  ssize_t      bytes;                  /* Bytes read/written */
+  size_t       total;                  /* Total bytes read */
+  cups_file_t  *in,                    /* Input file */
+               *out;                   /* Output file */
+  struct stat  outinfo;                /* Output file information */
+  char         filename[1024],         /* Temporary filename */
+               buffer[32768];          /* Copy buffer */
+
+
+  fprintf(stderr, "DEBUG: Compressing %d job files...\n", num_files);
+  for (i = 0; i < num_files; i ++)
   {
-   /*
-    * If there is no password set in the device URI, return the
-    * "authentication required" exit code...
-    */
+    if ((fd = cupsTempFd(filename, sizeof(filename))) < 0)
+    {
+      _cupsLangPrintf(stderr,
+                     _("ERROR: Unable to create temporary compressed print "
+                       "file: %s\n"), strerror(errno));
+      exit(CUPS_BACKEND_FAILED);
+    }
+
+    if ((out = cupsFileOpenFd(fd, "w9")) == NULL)
+    {
+      _cupsLangPrintf(stderr,
+                     _("ERROR: Unable to open temporary compressed print "
+                       "file: %s\n"), strerror(errno));
+      exit(CUPS_BACKEND_FAILED);
+    }
 
-    if (tmpfilename[0])
-      unlink(tmpfilename);
+    if ((in = cupsFileOpen(files[i], "r")) == NULL)
+    {
+      _cupsLangPrintf(stderr,
+                      _("ERROR: Unable to open print file \"%s\": %s\n"),
+                     files[i], strerror(errno));
+      cupsFileClose(out);
+      exit(CUPS_BACKEND_FAILED);
+    }
+
+    total = 0;
+    while ((bytes = cupsFileRead(in, buffer, sizeof(buffer))) > 0)
+      if (cupsFileWrite(out, buffer, bytes) < bytes)
+      {
+        _cupsLangPrintf(stderr,
+                       _("ERROR: Unable to write %d bytes to \"%s\": %s\n"),
+                       (int)bytes, filename, strerror(errno));
+        cupsFileClose(in);
+        cupsFileClose(out);
+       exit(CUPS_BACKEND_FAILED);
+      }
+      else
+        total += bytes;
+
+    cupsFileClose(out);
+    cupsFileClose(in);
 
-#ifdef __APPLE__
-    if (pstmpname[0])
-      unlink(pstmpname);
-#endif /* __APPLE__ */
+    files[i] = strdup(filename);
 
-    exit(CUPS_BACKEND_AUTH_REQUIRED);
+    if (!stat(filename, &outinfo))
+      fprintf(stderr,
+              "DEBUG: File %d compressed to %.1f%% of original size, "
+             CUPS_LLFMT " bytes...\n",
+              i + 1, 100.0 * outinfo.st_size / total,
+             CUPS_LLCAST outinfo.st_size);
   }
 }
+#endif /* HAVE_LIBZ */
 
 
 /*
- * 'report_printer_state()' - Report the printer state.
+ * 'password_cb()' - Disable the password prompt for cupsDoFileRequest().
  */
 
-static int                             /* O - Number of reasons shown */
-report_printer_state(ipp_t *ipp)       /* I - IPP response */
+static const char *                    /* O - Password  */
+password_cb(const char *prompt)                /* I - Prompt (not used) */
 {
-  int                  i;              /* Looping var */
-  int                  count;          /* Count of reasons shown... */
-  ipp_attribute_t      *reasons;       /* printer-state-reasons */
-  const char           *reason;        /* Current reason */
-  const char           *message;       /* Message to show */
-  char                 unknown[1024];  /* Unknown message string */
-  const char           *prefix;        /* Prefix for STATE: line */
-  char                 state[1024];    /* State string */
-
+  (void)prompt;
 
-  if ((reasons = ippFindAttribute(ipp, "printer-state-reasons",
-                                  IPP_TAG_KEYWORD)) == NULL)
-    return (0);
+ /*
+  * Remember that we need to authenticate...
+  */
 
-  state[0] = '\0';
-  prefix   = "STATE: ";
+  auth_info_required = "username,password";
 
-  for (i = 0, count = 0; i < reasons->num_values; i ++)
+  if (password && *password && password_tries < 3)
   {
-    reason = reasons->values[i].string.text;
-
-    strlcat(state, prefix, sizeof(state));
-    strlcat(state, reason, sizeof(state));
-
-    prefix  = ",";
-    message = NULL;
-
-    if (!strncmp(reason, "media-needed", 12))
-      message = "Media tray needs to be filled.";
-    else if (!strncmp(reason, "media-jam", 9))
-      message = "Media jam!";
-    else if (!strncmp(reason, "moving-to-paused", 16) ||
-             !strncmp(reason, "paused", 6) ||
-            !strncmp(reason, "shutdown", 8))
-      message = "Printer off-line.";
-    else if (!strncmp(reason, "toner-low", 9))
-      message = "Toner low.";
-    else if (!strncmp(reason, "toner-empty", 11))
-      message = "Out of toner!";
-    else if (!strncmp(reason, "cover-open", 10))
-      message = "Cover open.";
-    else if (!strncmp(reason, "interlock-open", 14))
-      message = "Interlock open.";
-    else if (!strncmp(reason, "door-open", 9))
-      message = "Door open.";
-    else if (!strncmp(reason, "input-tray-missing", 18))
-      message = "Media tray missing!";
-    else if (!strncmp(reason, "media-low", 9))
-      message = "Media tray almost empty.";
-    else if (!strncmp(reason, "media-empty", 11))
-      message = "Media tray empty!";
-    else if (!strncmp(reason, "output-tray-missing", 19))
-      message = "Output tray missing!";
-    else if (!strncmp(reason, "output-area-almost-full", 23))
-      message = "Output bin almost full.";
-    else if (!strncmp(reason, "output-area-full", 16))
-      message = "Output bin full!";
-    else if (!strncmp(reason, "marker-supply-low", 17))
-      message = "Ink/toner almost empty.";
-    else if (!strncmp(reason, "marker-supply-empty", 19))
-      message = "Ink/toner empty!";
-    else if (!strncmp(reason, "marker-waste-almost-full", 24))
-      message = "Ink/toner waste bin almost full.";
-    else if (!strncmp(reason, "marker-waste-full", 17))
-      message = "Ink/toner waste bin full!";
-    else if (!strncmp(reason, "fuser-over-temp", 15))
-      message = "Fuser temperature high!";
-    else if (!strncmp(reason, "fuser-under-temp", 16))
-      message = "Fuser temperature low!";
-    else if (!strncmp(reason, "opc-near-eol", 12))
-      message = "OPC almost at end-of-life.";
-    else if (!strncmp(reason, "opc-life-over", 13))
-      message = "OPC at end-of-life!";
-    else if (!strncmp(reason, "developer-low", 13))
-      message = "Developer almost empty.";
-    else if (!strncmp(reason, "developer-empty", 15))
-      message = "Developer empty!";
-    else if (strstr(reason, "error") != NULL)
-    {
-      message = unknown;
+    password_tries ++;
 
-      snprintf(unknown, sizeof(unknown), "Unknown printer error (%s)!",
-               reason);
-    }
-
-    if (message)
-    {
-      count ++;
-      if (strstr(reasons->values[i].string.text, "error"))
-        fprintf(stderr, "ERROR: %s\n", message);
-      else if (strstr(reasons->values[i].string.text, "warning"))
-        fprintf(stderr, "WARNING: %s\n", message);
-      else
-        fprintf(stderr, "INFO: %s\n", message);
-    }
+    return (password);
   }
+  else
+  {
+   /*
+    * Give up after 3 tries or if we don't have a password to begin with...
+    */
 
-  fprintf(stderr, "%s\n", state);
-
-  return (count);
+    return (NULL);
+  }
 }
 
 
-#ifdef __APPLE__
 /*
- * 'run_pictwps_filter()' - Convert PICT files to PostScript when printing
- *                          remotely.
- *
- * This step is required because the PICT format is not documented and
- * subject to change, so developing a filter for other OS's is infeasible.
- * Also, fonts required by the PICT file need to be embedded on the
- * client side (which has the fonts), so we run the filter to get a
- * PostScript file for printing...
+ * 'report_attr()' - Report an IPP attribute value.
  */
 
-static int                             /* O - Exit status of filter */
-run_pictwps_filter(char       **argv,  /* I - Command-line arguments */
-                   const char *filename)/* I - Filename */
+static void
+report_attr(ipp_attribute_t *attr)     /* I - Attribute */
 {
-  struct stat  fileinfo;               /* Print file information */
-  const char   *ppdfile;               /* PPD file for destination printer */
-  int          pid;                    /* Child process ID */
-  int          fd;                     /* Temporary file descriptor */
-  int          status;                 /* Exit status of filter */
-  const char   *printer;               /* PRINTER env var */
-  static char  ppdenv[1024];           /* PPD environment variable */
+  int  i;                              /* Looping var */
+  char value[1024],                    /* Value string */
+       *valptr,                        /* Pointer into value string */
+       *attrptr;                       /* Pointer into attribute value */
 
 
  /*
-  * First get the PPD file for the printer...
+  * Convert the attribute values into quoted strings...
   */
 
-  printer = getenv("PRINTER");
-  if (!printer)
-  {
-    fputs("ERROR: PRINTER environment variable not defined!\n", stderr);
-    return (-1);
-  }
-
-  if ((ppdfile = cupsGetPPD(printer)) == NULL)
+  for (i = 0, valptr = value;
+       i < attr->num_values && valptr < (value + sizeof(value) - 10);
+       i ++)
   {
-    fprintf(stderr, "ERROR: Unable to get PPD file for printer \"%s\" - %s.\n",
-            printer, ippErrorString(cupsLastError()));
-    /*return (-1);*/
-  }
-  else
-  {
-    snprintf(ppdenv, sizeof(ppdenv), "PPD=%s", ppdfile);
-    putenv(ppdenv);
-  }
+    if (i > 0)
+      *valptr++ = ',';
 
- /*
-  * Then create a temporary file for printing...
-  */
+    switch (attr->value_tag)
+    {
+      case IPP_TAG_INTEGER :
+      case IPP_TAG_ENUM :
+          snprintf(valptr, sizeof(value) - (valptr - value), "%d",
+                  attr->values[i].integer);
+         valptr += strlen(valptr);
+         break;
 
-  if ((fd = cupsTempFd(pstmpname, sizeof(pstmpname))) < 0)
-  {
-    fprintf(stderr, "ERROR: Unable to create temporary file - %s.\n",
-            strerror(errno));
-    if (ppdfile)
-      unlink(ppdfile);
-    return (-1);
-  }
+      case IPP_TAG_TEXT :
+      case IPP_TAG_NAME :
+      case IPP_TAG_KEYWORD :
+          *valptr++ = '\"';
+         for (attrptr = attr->values[i].string.text;
+              *attrptr && valptr < (value + sizeof(value) - 10);
+              attrptr ++)
+         {
+           if (*attrptr == '\\' || *attrptr == '\"')
+             *valptr++ = '\\';
 
- /*
-  * Get the owner of the spool file - it is owned by the user we want to run
-  * as...
-  */
+           *valptr++ = *attrptr;
+         }
+          *valptr++ = '\"';
+          break;
 
-  if (argv[6])
-    stat(argv[6], &fileinfo);
-  else
-  {
-   /*
-    * Use the OSX defaults, as an up-stream filter created the PICT
-    * file...
-    */
+      default :
+         /*
+         * Unsupported value type...
+         */
 
-    fileinfo.st_uid = 1;
-    fileinfo.st_gid = 80;
+          return;
+    }
   }
 
-  if (ppdfile)
-    chown(ppdfile, fileinfo.st_uid, fileinfo.st_gid);
-
-  fchown(fd, fileinfo.st_uid, fileinfo.st_gid);
+  *valptr = '\0';
 
  /*
-  * Finally, run the filter to convert the file...
+  * Tell the scheduler about the new values...
   */
 
-  if ((pid = fork()) == 0)
-  {
-   /*
-    * Child process for pictwpstops...  Redirect output of pictwpstops to a
-    * file...
-    */
+  fprintf(stderr, "ATTR: %s=%s\n", attr->name, value);
+}
 
-    close(1);
-    dup(fd);
-    close(fd);
 
-    if (!getuid())
-    {
-     /*
-      * Change to an unpriviledged user...
-      */
+/*
+ * 'report_printer_state()' - Report the printer state.
+ */
 
-      setgid(fileinfo.st_gid);
-      setuid(fileinfo.st_uid);
-    }
+static int                             /* O - Number of reasons shown */
+report_printer_state(ipp_t *ipp,       /* I - IPP response */
+                     int   job_id)     /* I - Current job ID */
+{
+  int                  i;              /* Looping var */
+  int                  count;          /* Count of reasons shown... */
+  ipp_attribute_t      *psm,           /* printer-state-message */
+                       *reasons,       /* printer-state-reasons */
+                       *marker;        /* marker-* attributes */
+  const char           *reason;        /* Current reason */
+  const char           *prefix;        /* Prefix for STATE: line */
+  char                 state[1024];    /* State string */
 
-    execlp("pictwpstops", printer, argv[1], argv[2], argv[3], argv[4], argv[5],
-           filename, NULL);
-    perror("ERROR: Unable to exec pictwpstops");
-    return (errno);
-  }
 
-  close(fd);
+  if ((psm = ippFindAttribute(ipp, "printer-state-message",
+                              IPP_TAG_TEXT)) != NULL)
+    fprintf(stderr, "INFO: %s\n", psm->values[0].string.text);
 
-  if (pid < 0)
-  {
-   /*
-    * Error!
-    */
-
-    perror("ERROR: Unable to fork pictwpstops");
-    unlink(filename);
-    if (ppdfile)
-      unlink(ppdfile);
-    return (-1);
-  }
+  if ((reasons = ippFindAttribute(ipp, "printer-state-reasons",
+                                  IPP_TAG_KEYWORD)) == NULL)
+    return (0);
 
- /*
-  * Now wait for the filter to complete...
-  */
+  state[0] = '\0';
+  prefix   = "STATE: ";
 
-  if (wait(&status) < 0)
+  for (i = 0, count = 0; i < reasons->num_values; i ++)
   {
-    perror("ERROR: Unable to wait for pictwpstops");
-    close(fd);
-    unlink(filename);
-    if (ppdfile)
-      unlink(ppdfile);
-    return (-1);
-  }
-
-  if (ppdfile)
-    unlink(ppdfile);
-
-  close(fd);
+    reason = reasons->values[i].string.text;
 
-  if (status)
-  {
-    if (status >= 256)
-      fprintf(stderr, "ERROR: pictwpstops exited with status %d!\n",
-              status / 256);
-    else
-      fprintf(stderr, "ERROR: pictwpstops exited on signal %d!\n",
-              status);
+    if (strcmp(reason, "paused") &&
+       strcmp(reason, "com.apple.print.recoverable-warning"))
+    {
+      strlcat(state, prefix, sizeof(state));
+      strlcat(state, reason, sizeof(state));
 
-    unlink(filename);
-    return (status);
+      prefix  = ",";
+    }
   }
 
+  if (state[0])
+    fprintf(stderr, "%s\n", state);
+
  /*
-  * Return with no errors..
+  * Relay the current marker-* attribute values...
   */
 
-  return (0);
+  if ((marker = ippFindAttribute(ipp, "marker-colors", IPP_TAG_NAME)) != NULL)
+    report_attr(marker);
+  if ((marker = ippFindAttribute(ipp, "marker-high-levels",
+                                 IPP_TAG_INTEGER)) != NULL)
+    report_attr(marker);
+  if ((marker = ippFindAttribute(ipp, "marker-levels",
+                                 IPP_TAG_INTEGER)) != NULL)
+    report_attr(marker);
+  if ((marker = ippFindAttribute(ipp, "marker-low-levels",
+                                 IPP_TAG_INTEGER)) != NULL)
+    report_attr(marker);
+  if ((marker = ippFindAttribute(ipp, "marker-message", IPP_TAG_TEXT)) != NULL)
+    report_attr(marker);
+  if ((marker = ippFindAttribute(ipp, "marker-names", IPP_TAG_NAME)) != NULL)
+    report_attr(marker);
+  if ((marker = ippFindAttribute(ipp, "marker-types", IPP_TAG_KEYWORD)) != NULL)
+    report_attr(marker);
+
+  return (count);
 }
-#endif /* __APPLE__ */
 
 
 /*
@@ -1472,33 +1783,20 @@ sigterm_handler(int sig)                /* I - Signal */
 {
   (void)sig;   /* remove compiler warnings... */
 
-  if (!job_cancelled)
+  if (!job_canceled)
   {
    /*
     * Flag that the job should be cancelled...
     */
 
-    job_cancelled = 1;
+    job_canceled = 1;
     return;
   }
 
- /*
-  * The scheduler already tried to cancel us once, now just terminate
-  * after removing our temp files!
-  */
-
-  if (tmpfilename[0])
-    unlink(tmpfilename);
-
-#ifdef __APPLE__
-  if (pstmpname[0])
-    unlink(pstmpname);
-#endif /* __APPLE__ */
-
   exit(1);
 }
 
 
 /*
- * End of "$Id: ipp.c 5133 2006-02-19 15:01:12Z mike $".
+ * End of "$Id: ipp.c 7948 2008-09-17 00:04:12Z mike $".
  */