]> git.ipfire.org Git - thirdparty/cups.git/blobdiff - backend/ipp.c
The IPP backend could get into an infinite loop for certain errors, causing a
[thirdparty/cups.git] / backend / ipp.c
index 13a688574f504b7bcf38b4344e2f20c38c114e1c..685d4d9dff602b55332bfba57262b043ed8cdfc7 100644 (file)
@@ -1,32 +1,16 @@
 /*
- * "$Id: ipp.c 7948 2008-09-17 00:04:12Z mike $"
+ * IPP backend for CUPS.
  *
- *   IPP backend for CUPS.
+ * Copyright 2007-2017 by Apple Inc.
+ * Copyright 1997-2007 by Easy Software Products, all rights reserved.
  *
- *   Copyright 2007-2011 by Apple Inc.
- *   Copyright 1997-2007 by Easy Software Products, all rights reserved.
+ * These coded instructions, statements, and computer programs are the
+ * 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, see the license at "http://www.cups.org/".
  *
- *   These coded instructions, statements, and computer programs are the
- *   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, 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...
- *   monitor_printer()      - Monitor the printer state...
- *   new_request()          - Create a new print creation or validation request.
- *   password_cb()          - Disable the password prompt for
- *                            cupsDoFileRequest().
- *   report_attr()          - Report an IPP attribute value.
- *   report_printer_state() - Report the printer state.
- *   sigterm_handler()      - Handle 'terminate' signals that stop the backend.
+ * This file is subject to the Apple OS-Developed Software exception.
  */
 
 /*
  */
 
 #include "backend-private.h"
+#include <cups/ppd-private.h>
+#include <cups/array-private.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/wait.h>
+#if defined(HAVE_GSSAPI) && defined(HAVE_XPC)
+#  include <xpc/xpc.h>
+#  define kPMPrintUIToolAgent  "com.apple.printuitool.agent"
+#  define kPMStartJob          100
+#  define kPMWaitForJob                101
+#  ifdef HAVE_XPC_PRIVATE_H
+#    include <xpc/private.h>
+#  else
+extern void    xpc_connection_set_target_uid(xpc_connection_t connection,
+                                             uid_t uid);
+#  endif /* HAVE_XPC_PRIVATE_H */
+#endif /* HAVE_GSSAPI && HAVE_XPC */
+
+
+/*
+ * Bits for job-state-reasons we care about...
+ */
+
+#define _CUPS_JSR_ACCOUNT_AUTHORIZATION_FAILED 0x01
+#define _CUPS_JSR_ACCOUNT_CLOSED               0x02
+#define _CUPS_JSR_ACCOUNT_INFO_NEEDED          0x04
+#define _CUPS_JSR_ACCOUNT_LIMIT_REACHED                0x08
+#define _CUPS_JSR_JOB_PASSWORD_WAIT            0x10
+#define _CUPS_JSR_JOB_RELEASE_WAIT             0x20
 
 
 /*
@@ -51,7 +61,11 @@ typedef struct _cups_monitor_s               /**** Monitoring data ****/
                        *resource;      /* Resource path */
   int                  port,           /* Port number */
                        version,        /* IPP version */
-                       job_id;         /* Job ID for submitted job */
+                       job_id,         /* Job ID for submitted job */
+                       job_reasons,    /* Job state reasons bits */
+                       create_job,     /* Support Create-Job? */
+                       get_job_attrs;  /* Support Get-Job-Attributes? */
+  const char           *job_name;      /* Job name for submitted job */
   http_encryption_t    encryption;     /* Use encryption? */
   ipp_jstate_t         job_state;      /* Current job state */
   ipp_pstate_t         printer_state;  /* Current printer state */
@@ -62,22 +76,38 @@ typedef struct _cups_monitor_s              /**** Monitoring data ****/
  * Globals...
  */
 
-static const char *auth_info_required = "none";
+static const char      *auth_info_required;
                                        /* New auth-info-required value */
+#if defined(HAVE_GSSAPI) && defined(HAVE_XPC)
+static pid_t           child_pid = 0;  /* Child process ID */
+#endif /* HAVE_GSSAPI && HAVE_XPC */
 static const char * const jattrs[] =   /* Job attributes we want */
 {
+  "job-id",
+  "job-impressions-completed",
   "job-media-sheets-completed",
+  "job-name",
+  "job-originating-user-name",
   "job-state",
   "job-state-reasons"
 };
-static int     job_canceled = 0;       /* Job cancelled? */
-static char    *password = NULL;       /* Password for device URI */
-static int     password_tries = 0;     /* Password tries */
+static int             job_canceled = 0,
+                                       /* Job cancelled? */
+                       uri_credentials = 0;
+                                       /* Credentials supplied in URI? */
+static char            username[256] = "",
+                                       /* Username for device URI */
+                       *password = NULL;
+                                       /* Password for device URI */
 static const char * const pattrs[] =   /* Printer attributes we want */
 {
+#ifdef HAVE_LIBZ
+  "compression-supported",
+#endif /* HAVE_LIBZ */
   "copies-supported",
   "cups-version",
   "document-format-supported",
+  "job-password-encryption-supported",
   "marker-colors",
   "marker-high-levels",
   "marker-levels",
@@ -86,13 +116,38 @@ static const char * const pattrs[] =       /* Printer attributes we want */
   "marker-names",
   "marker-types",
   "media-col-supported",
+  "multiple-document-handling-supported",
+  "operations-supported",
+  "print-color-mode-supported",
   "printer-alert",
   "printer-alert-description",
   "printer-is-accepting-jobs",
+  "printer-mandatory-job-attributes",
   "printer-state",
   "printer-state-message",
-  "printer-state-reasons",
+  "printer-state-reasons"
 };
+static const char * const remote_job_states[] =
+{                                      /* Remote job state keywords */
+  "+cups-remote-pending",
+  "+cups-remote-pending-held",
+  "+cups-remote-processing",
+  "+cups-remote-stopped",
+  "+cups-remote-canceled",
+  "+cups-remote-aborted",
+  "+cups-remote-completed"
+};
+static _cups_mutex_t   report_mutex = _CUPS_MUTEX_INITIALIZER;
+                                       /* Mutex to control access */
+static int             num_attr_cache = 0;
+                                       /* Number of cached attributes */
+static cups_option_t   *attr_cache = NULL;
+                                       /* Cached attributes */
+static cups_array_t    *state_reasons; /* Array of printe-state-reasons keywords */
+static char            tmpfilename[1024] = "";
+                                       /* Temporary spool file name */
+static char            mandatory_attrs[1024] = "";
+                                       /* cupsMandatory value */
 
 
 /*
@@ -104,22 +159,31 @@ static void               cancel_job(http_t *http, const char *uri, int id,
                                   int version);
 static ipp_pstate_t    check_printer_state(http_t *http, const char *uri,
                                            const char *resource,
-                                           const char *user, int version,
-                                           int job_id);
-#ifdef HAVE_LIBZ
-static void            compress_files(int num_files, char **files);
-#endif /* HAVE_LIBZ */
+                                           const char *user, int version);
+static void            debug_attributes(ipp_t *ipp);
 static void            *monitor_printer(_cups_monitor_t *monitor);
 static ipp_t           *new_request(ipp_op_t op, int version, const char *uri,
                                     const char *user, const char *title,
                                     int num_options, cups_option_t *options,
                                     const char *compression, int copies,
-                                    const char *format, _pwg_t *pwg,
-                                    ipp_attribute_t *media_col_sup);
-static const char      *password_cb(const char *);
+                                    const char *format, _ppd_cache_t *pc,
+                                    ppd_file_t *ppd,
+                                    ipp_attribute_t *media_col_sup,
+                                    ipp_attribute_t *doc_handling_sup,
+                                    ipp_attribute_t *print_color_mode_sup);
+static const char      *password_cb(const char *prompt, http_t *http,
+                                    const char *method, const char *resource,
+                                    int *user_data);
+static const char      *quote_string(const char *s, char *q, size_t qsize);
 static void            report_attr(ipp_attribute_t *attr);
-static int             report_printer_state(ipp_t *ipp, int job_id);
+static void            report_printer_state(ipp_t *ipp);
+#if defined(HAVE_GSSAPI) && defined(HAVE_XPC)
+static int             run_as_user(char *argv[], uid_t uid,
+                                   const char *device_uri, int fd);
+#endif /* HAVE_GSSAPI && HAVE_XPC */
 static void            sigterm_handler(int sig);
+static int             timeout_cb(http_t *http, void *user_data);
+static void            update_reasons(ipp_attribute_t *attr, const char *s);
 
 
 /*
@@ -141,21 +205,26 @@ main(int  argc,                           /* I - Number of command-line args */
   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,                  /* Name of option */
                *value,                 /* Value of option */
                sep;                    /* Separator character */
+  int          password_tries = 0;     /* Password tries */
+  http_addrlist_t *addrlist;           /* Address of printer */
+  int          snmp_enabled = 1;       /* Is SNMP enabled? */
   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 */
+  char         **files,                /* Files to print */
+               *compatfile = NULL;     /* Compatibility filename */
+  off_t                compatsize = 0;         /* Size of compatibility file */
   int          port;                   /* Port number (not used) */
   char         uri[HTTP_MAX_URI];      /* Updated URI without user/pass */
+  char         print_job_name[1024];   /* Update job-name for Print-Job */
   http_status_t        http_status;            /* Status of HTTP request */
   ipp_status_t ipp_status;             /* Status of IPP request */
   http_t       *http;                  /* HTTP connection */
@@ -164,37 +233,51 @@ main(int  argc,                           /* I - Number of command-line args */
                *supported;             /* get-printer-attributes response */
   time_t       start_time;             /* Time of first connect */
   int          contimeout;             /* Connection timeout */
-  int          delay;                  /* Delay for retries... */
+  int          delay,                  /* Delay for retries */
+               prev_delay;             /* Previous delay */
   const char   *compression;           /* Compression mode */
-  int          waitjob,                /* Wait for job complete? */
+  int          waitjob,                        /* Wait for job complete? */
+               waitjob_tries = 0,      /* Number of times we've waited */
                waitprinter;            /* Wait for printer ready? */
+  time_t       waittime;               /* Wait time for held jobs */
   _cups_monitor_t monitor;             /* Monitoring data */
   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 */
+#ifdef HAVE_LIBZ
+  ipp_attribute_t *compression_sup;    /* compression-supported */
+#endif /* HAVE_LIBZ */
   ipp_attribute_t *copies_sup;         /* copies-supported */
   ipp_attribute_t *cups_version;       /* cups-version */
+  ipp_attribute_t *encryption_sup;     /* job-password-encryption-supported */
   ipp_attribute_t *format_sup;         /* document-format-supported */
+  ipp_attribute_t *job_auth;           /* job-authorization-uri */
   ipp_attribute_t *media_col_sup;      /* media-col-supported */
   ipp_attribute_t *operations_sup;     /* operations-supported */
+  ipp_attribute_t *doc_handling_sup;   /* multiple-document-handling-supported */
   ipp_attribute_t *printer_state;      /* printer-state attribute */
   ipp_attribute_t *printer_accepting;  /* printer-is-accepting-jobs */
-  int          validate_job;           /* Does printer support Validate-Job? */
-  int          copies,                 /* Number of copies for job */
+  ipp_attribute_t *print_color_mode_sup;/* Does printer support print-color-mode? */
+  int          create_job = 0,         /* Does printer support Create-Job? */
+               get_job_attrs = 0,      /* Does printer support Get-Job-Attributes? */
+               send_document = 0,      /* Does printer support Send-Document? */
+               validate_job = 0,       /* Does printer support Validate-Job? */
+               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 */
                *document_format;       /* document-format value */
   int          fd;                     /* File descriptor */
-  off_t                bytes;                  /* Bytes copied */
+  off_t                bytes = 0;              /* 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 */
-  ppd_file_t   *ppd;                   /* PPD file */
-  _pwg_t       *pwg;                   /* PWG<->PPD mapping data */
+  ppd_file_t   *ppd = NULL;            /* PPD file */
+  _ppd_cache_t *pc = NULL;             /* PPD cache and mapping data */
+  fd_set       input;                  /* Input set for select() */
 
 
  /*
@@ -250,6 +333,70 @@ main(int  argc,                            /* I - Number of command-line args */
     return (CUPS_BACKEND_STOP);
   }
 
+ /*
+  * Get the device URI...
+  */
+
+  while ((device_uri = cupsBackendDeviceURI(argv)) == NULL)
+  {
+    _cupsLangPrintFilter(stderr, "INFO", _("Unable to locate printer."));
+    sleep(10);
+
+    if (getenv("CLASS") != NULL)
+      return (CUPS_BACKEND_FAILED);
+  }
+
+  if ((auth_info_required = getenv("AUTH_INFO_REQUIRED")) == NULL)
+    auth_info_required = "none";
+
+  state_reasons = _cupsArrayNewStrings(getenv("PRINTER_STATE_REASONS"), ',');
+
+#ifdef HAVE_GSSAPI
+ /*
+  * For Kerberos, become the printing user (if we can) to get the credentials
+  * that way.
+  */
+
+  if (!getuid() && (value = getenv("AUTH_UID")) != NULL &&
+      !getenv("AUTH_PASSWORD"))
+  {
+    uid_t      uid = (uid_t)atoi(value);
+                                       /* User ID */
+
+#  ifdef HAVE_XPC
+    if (uid > 0)
+    {
+      if (argc == 6)
+        return (run_as_user(argv, uid, device_uri, 0));
+      else
+      {
+        int status = 0;                        /* Exit status */
+
+        for (i = 6; i < argc && !status && !job_canceled; i ++)
+       {
+         if ((fd = open(argv[i], O_RDONLY)) >= 0)
+         {
+           status = run_as_user(argv, uid, device_uri, fd);
+           close(fd);
+         }
+         else
+         {
+           _cupsLangPrintError("ERROR", _("Unable to open print file"));
+           status = CUPS_BACKEND_FAILED;
+         }
+       }
+
+       return (status);
+      }
+    }
+
+#  else /* No XPC, just try to run as the user ID */
+    if (uid > 0)
+      seteuid(uid);
+#  endif /* HAVE_XPC */
+  }
+#endif /* HAVE_GSSAPI */
+
  /*
   * Get the (final) content type...
   */
@@ -269,15 +416,6 @@ main(int  argc,                            /* I - Number of command-line args */
   * Extract the hostname and printer name from the URI...
   */
 
-  while ((device_uri = cupsBackendDeviceURI(argv)) == NULL)
-  {
-    _cupsLangPrintFilter(stderr, "INFO", _("Unable to locate printer."));
-    sleep(10);
-
-    if (getenv("CLASS") != NULL)
-      return (CUPS_BACKEND_FAILED);
-  }
-
   httpSeparateURI(HTTP_URI_CODING_ALL, device_uri, scheme, sizeof(scheme),
                   username, sizeof(username), hostname, sizeof(hostname), &port,
                  resource, sizeof(resource));
@@ -285,7 +423,7 @@ main(int  argc,                             /* I - Number of command-line args */
   if (!port)
     port = IPP_PORT;                   /* Default to port 631 */
 
-  if (!strcmp(scheme, "https"))
+  if (!strcmp(scheme, "https") || !strcmp(scheme, "ipps"))
     cupsSetEncryption(HTTP_ENCRYPT_ALWAYS);
   else
     cupsSetEncryption(HTTP_ENCRYPT_IF_REQUESTED);
@@ -348,39 +486,39 @@ main(int  argc,                           /* I - Number of command-line args */
       * Process the option...
       */
 
-      if (!strcasecmp(name, "waitjob"))
+      if (!_cups_strcasecmp(name, "waitjob"))
       {
        /*
         * Wait for job completion?
        */
 
-        waitjob = !strcasecmp(value, "on") ||
-                 !strcasecmp(value, "yes") ||
-                 !strcasecmp(value, "true");
+        waitjob = !_cups_strcasecmp(value, "on") ||
+                 !_cups_strcasecmp(value, "yes") ||
+                 !_cups_strcasecmp(value, "true");
       }
-      else if (!strcasecmp(name, "waitprinter"))
+      else if (!_cups_strcasecmp(name, "waitprinter"))
       {
        /*
         * Wait for printer idle?
        */
 
-        waitprinter = !strcasecmp(value, "on") ||
-                     !strcasecmp(value, "yes") ||
-                     !strcasecmp(value, "true");
+        waitprinter = !_cups_strcasecmp(value, "on") ||
+                     !_cups_strcasecmp(value, "yes") ||
+                     !_cups_strcasecmp(value, "true");
       }
-      else if (!strcasecmp(name, "encryption"))
+      else if (!_cups_strcasecmp(name, "encryption"))
       {
        /*
         * Enable/disable encryption?
        */
 
-        if (!strcasecmp(value, "always"))
+        if (!_cups_strcasecmp(value, "always"))
          cupsSetEncryption(HTTP_ENCRYPT_ALWAYS);
-        else if (!strcasecmp(value, "required"))
+        else if (!_cups_strcasecmp(value, "required"))
          cupsSetEncryption(HTTP_ENCRYPT_REQUIRED);
-        else if (!strcasecmp(value, "never"))
+        else if (!_cups_strcasecmp(value, "never"))
          cupsSetEncryption(HTTP_ENCRYPT_NEVER);
-        else if (!strcasecmp(value, "ifrequested"))
+        else if (!_cups_strcasecmp(value, "ifrequested"))
          cupsSetEncryption(HTTP_ENCRYPT_IF_REQUESTED);
        else
        {
@@ -389,7 +527,17 @@ main(int  argc,                            /* I - Number of command-line args */
                               value);
         }
       }
-      else if (!strcasecmp(name, "version"))
+      else if (!_cups_strcasecmp(name, "snmp"))
+      {
+        /*
+         * Enable/disable SNMP stuff...
+         */
+
+         snmp_enabled = !value[0] || !_cups_strcasecmp(value, "on") ||
+                        !_cups_strcasecmp(value, "yes") ||
+                        !_cups_strcasecmp(value, "true");
+      }
+      else if (!_cups_strcasecmp(name, "version"))
       {
         if (!strcmp(value, "1.0"))
          version = 10;
@@ -409,14 +557,21 @@ main(int  argc,                           /* I - Number of command-line args */
        }
       }
 #ifdef HAVE_LIBZ
-      else if (!strcasecmp(name, "compression"))
+      else if (!_cups_strcasecmp(name, "compression"))
       {
-        if (!strcasecmp(value, "true") || !strcasecmp(value, "yes") ||
-           !strcasecmp(value, "on") || !strcasecmp(value, "gzip"))
+        if (!_cups_strcasecmp(value, "true") || !_cups_strcasecmp(value, "yes") ||
+           !_cups_strcasecmp(value, "on") || !_cups_strcasecmp(value, "gzip"))
          compression = "gzip";
+        else if (!_cups_strcasecmp(value, "deflate"))
+         compression = "deflate";
+        else if (!_cups_strcasecmp(value, "false") ||
+                 !_cups_strcasecmp(value, "no") ||
+                !_cups_strcasecmp(value, "off") ||
+                !_cups_strcasecmp(value, "none"))
+         compression = "none";
       }
 #endif /* HAVE_LIBZ */
-      else if (!strcasecmp(name, "contimeout"))
+      else if (!_cups_strcasecmp(name, "contimeout"))
       {
        /*
         * Set the connection timeout...
@@ -447,9 +602,10 @@ main(int  argc,                            /* I - Number of command-line args */
   if (argc == 6)
   {
     num_files    = 0;
-    send_options = !strcasecmp(final_content_type, "application/pdf") ||
-                   !strcasecmp(final_content_type, "application/vnd.cups-pdf") ||
-                   !strncasecmp(final_content_type, "image/", 6);
+    files        = NULL;
+    send_options = !_cups_strcasecmp(final_content_type, "application/pdf") ||
+                   !_cups_strcasecmp(final_content_type, "application/vnd.cups-pdf") ||
+                   !_cups_strncasecmp(final_content_type, "image/", 6);
 
     fputs("DEBUG: Sending stdin for job...\n", stderr);
   }
@@ -463,11 +619,6 @@ main(int  argc,                            /* I - Number of command-line args */
     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);
   }
 
@@ -475,20 +626,21 @@ main(int  argc,                           /* I - Number of command-line args */
   * Set the authentication info, if any...
   */
 
-  cupsSetPasswordCB(password_cb);
+  cupsSetPasswordCB2((cups_password_cb2_t)password_cb, &password_tries);
 
   if (username[0])
   {
    /*
-    * Use authenticaion information in the device URI...
+    * Use authentication information in the device URI...
     */
 
     if ((password = strchr(username, ':')) != NULL)
       *password++ = '\0';
 
     cupsSetUser(username);
+    uri_credentials = 1;
   }
-  else if (!getuid())
+  else
   {
    /*
     * Try loading authentication information from the environment.
@@ -497,35 +649,71 @@ main(int  argc,                           /* I - Number of command-line args */
     const char *ptr = getenv("AUTH_USERNAME");
 
     if (ptr)
+    {
+      strlcpy(username, ptr, sizeof(username));
       cupsSetUser(ptr);
+    }
 
     password = getenv("AUTH_PASSWORD");
   }
 
  /*
-  * Try connecting to the remote server...
+  * Try finding the remote server...
   */
 
-  delay      = 5;
   start_time = time(NULL);
 
-  fputs("STATE: +connecting-to-device\n", stderr);
+  addrlist = backendLookup(hostname, port, &job_canceled);
+
+  http = httpConnect2(hostname, port, addrlist, AF_UNSPEC, cupsEncryption(), 1,
+                      0, NULL);
+  httpSetTimeout(http, 30.0, timeout_cb, NULL);
+
+ /*
+  * See if the printer supports SNMP...
+  */
+
+  if (snmp_enabled)
+    snmp_fd = _cupsSNMPOpen(addrlist->addr.addr.sa_family);
+  else
+    snmp_fd = -1;
+
+  if (snmp_fd >= 0)
+    have_supplies = !backendSNMPSupplies(snmp_fd, &(addrlist->addr),
+                                         &start_count, NULL);
+  else
+    have_supplies = start_count = 0;
+
+ /*
+  * Wait for data from the filter...
+  */
+
+  if (num_files == 0)
+  {
+    if (!backendWaitLoop(snmp_fd, &(addrlist->addr), 0, backendNetworkSideCB))
+      return (CUPS_BACKEND_OK);
+    else if ((bytes = read(0, buffer, sizeof(buffer))) <= 0)
+      return (CUPS_BACKEND_OK);
+  }
+
+ /*
+  * Try connecting to the remote server...
+  */
+
+  delay = _cupsNextDelay(0, &prev_delay);
 
   do
   {
     fprintf(stderr, "DEBUG: Connecting to %s:%d\n", hostname, port);
     _cupsLangPrintFilter(stderr, "INFO", _("Connecting to printer."));
 
-    if ((http = httpConnectEncrypt(hostname, port,
-                                  cupsEncryption())) == NULL)
+    if (httpReconnect(http))
     {
-#if 0 /* These need to go in here someplace when we see HTTP_PKI_ERROR or IPP_PKI_ERROR */
-      fputs("STATE: +cups-certificate-error\n", stderr);
-      fputs("STATE: -cups-certificate-error\n", stderr);
-#endif /* 0 */
-
       int error = errno;               /* Connection error */
 
+      if (http->status == HTTP_PKI_ERROR)
+       update_reasons(NULL, "+cups-certificate-error");
+
       if (job_canceled)
        break;
 
@@ -548,6 +736,8 @@ main(int  argc,                             /* I - Number of command-line args */
 
        sleep(5);
 
+       update_reasons(NULL, "-connecting-to-device");
+
         return (CUPS_BACKEND_FAILED);
       }
 
@@ -560,6 +750,7 @@ main(int  argc,                             /* I - Number of command-line args */
        {
          _cupsLangPrintFilter(stderr, "ERROR",
                               _("The printer is not responding."));
+         update_reasons(NULL, "-connecting-to-device");
          return (CUPS_BACKEND_FAILED);
        }
 
@@ -567,78 +758,123 @@ main(int  argc,                          /* I - Number of command-line args */
        {
          case EHOSTDOWN :
              _cupsLangPrintFilter(stderr, "WARNING",
-                                  _("Network printer \"%s\" may not exist or "
-                                    "is unavailable at this time."),
-                                  hostname);
+                                  _("The printer may not exist or "
+                                    "is unavailable at this time."));
              break;
 
          case EHOSTUNREACH :
              _cupsLangPrintFilter(stderr, "WARNING",
-                                  _("Network printer \"%s\" is unreachable at "
-                                    "this time."), hostname);
+                                  _("The printer is unreachable at this "
+                                    "time."));
              break;
 
          case ECONNREFUSED :
          default :
              _cupsLangPrintFilter(stderr, "WARNING",
-                                  _("Network printer \"%s\" is busy."),
-                                  hostname);
+                                  _("The printer is in use."));
              break;
         }
 
-       sleep(delay);
+       sleep((unsigned)delay);
 
-       if (delay < 30)
-         delay += 5;
-      }
-      else if (h_errno)
-      {
-       _cupsLangPrintFilter(stderr, "ERROR",
-                            _("Unable to locate network printer \"%s\"."),
-                            hostname);
-       return (CUPS_BACKEND_STOP);
+        delay = _cupsNextDelay(delay, &prev_delay);
       }
       else
       {
        _cupsLangPrintFilter(stderr, "ERROR",
-                            _("Network printer \"%s\" is not responding."),
-                            hostname);
+                            _("The printer is not responding."));
        sleep(30);
       }
 
       if (job_canceled)
        break;
     }
+    else
+      update_reasons(NULL, "-cups-certificate-error");
   }
-  while (http == NULL);
+  while (http->fd < 0);
 
-  if (job_canceled || !http)
+  if (job_canceled)
+    return (CUPS_BACKEND_OK);
+  else if (!http)
     return (CUPS_BACKEND_FAILED);
 
-  fputs("STATE: -connecting-to-device\n", stderr);
-  _cupsLangPrintFilter(stderr, "INFO", _("Connected to printer."));
+  if (httpIsEncrypted(http))
+  {
+   /*
+    * Validate TLS credentials...
+    */
 
-#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));
+    cups_array_t       *creds;         /* TLS credentials */
+    cups_array_t       *lcreds = NULL; /* Loaded credentials */
+    http_trust_t       trust;          /* Trust level */
+    char               credinfo[1024], /* Information on credentials */
+                       lcredinfo[1024];/* Information on saved credentials */
+    static const char  * const trusts[] = { NULL, "+cups-pki-invalid", "+cups-pki-changed", "+cups-pki-expired", NULL, "+cups-pki-unknown" };
+                                       /* Trust keywords */
+    static const char  * const trust_msgs[] =
+    {
+      "Credentials are OK/trusted",
+      "Credentials are invalid",
+      "Credentials have changed",
+      "Credentials are expired",
+      "Credentials have been renewed",
+      "Credentials are unknown/new"
+    };
 
- /*
-  * See if the printer supports SNMP...
-  */
+    fputs("DEBUG: Connection is encrypted.\n", stderr);
 
-  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;
+    if (!httpCopyCredentials(http, &creds))
+    {
+      trust = httpCredentialsGetTrust(creds, hostname);
+      httpCredentialsString(creds, credinfo, sizeof(credinfo));
+
+      fprintf(stderr, "DEBUG: %s (%s)\n", trust_msgs[trust], cupsLastErrorString());
+      fprintf(stderr, "DEBUG: Printer credentials: %s\n", credinfo);
+
+      if (!httpLoadCredentials(NULL, &lcreds, hostname))
+      {
+        httpCredentialsString(lcreds, lcredinfo, sizeof(lcredinfo));
+       fprintf(stderr, "DEBUG: Stored credentials: %s\n", lcredinfo);
+      }
+      else
+        fputs("DEBUG: No stored credentials.\n", stderr);
+
+      update_reasons(NULL, "-cups-pki-invalid,cups-pki-changed,cups-pki-expired,cups-pki-unknown");
+      if (trusts[trust])
+      {
+        update_reasons(NULL, trusts[trust]);
+        return (CUPS_BACKEND_STOP);
+      }
+
+      if (!lcreds)
+      {
+       /*
+        * Could not load the credentials, let's save the ones we have so we
+        * can detect changes...
+        */
+
+        httpSaveCredentials(NULL, creds, hostname);
+      }
+
+      httpFreeCredentials(lcreds);
+      httpFreeCredentials(creds);
+    }
+    else
+    {
+      fputs("DEBUG: No printer credentials.\n", stderr);
+
+      update_reasons(NULL, "cups-pki-unknown");
+      return (CUPS_BACKEND_STOP);
+    }
+  }
+
+  update_reasons(NULL, "-connecting-to-device");
+  _cupsLangPrintFilter(stderr, "INFO", _("Connected to printer."));
+
+  fprintf(stderr, "DEBUG: Connected to %s:%d...\n",
+         httpAddrString(http->hostaddr, addrname, sizeof(addrname)),
+         httpAddrPort(http->hostaddr));
 
  /*
   * Build a URI for the printer and fill the standard IPP attributes for
@@ -654,13 +890,18 @@ main(int  argc,                           /* I - Number of command-line args */
   * copies...
   */
 
-  copies_sup     = NULL;
-  cups_version   = NULL;
-  format_sup     = NULL;
-  media_col_sup  = NULL;
-  supported      = NULL;
-  operations_sup = NULL;
-  validate_job   = 0;
+#ifdef HAVE_LIBZ
+  compression_sup      = NULL;
+#endif /* HAVE_LIBZ */
+  copies_sup           = NULL;
+  cups_version         = NULL;
+  encryption_sup       = NULL;
+  format_sup           = NULL;
+  media_col_sup        = NULL;
+  supported            = NULL;
+  operations_sup       = NULL;
+  doc_handling_sup     = NULL;
+  print_color_mode_sup = NULL;
 
   do
   {
@@ -675,9 +916,7 @@ main(int  argc,                             /* I - Number of command-line args */
     */
 
     request = ippNewRequest(IPP_GET_PRINTER_ATTRIBUTES);
-    request->request.op.version[0] = version / 10;
-    request->request.op.version[1] = version % 10;
-
+    ippSetVersion(request, version / 10, version % 10);
     ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, "printer-uri",
                 NULL, uri);
 
@@ -695,17 +934,19 @@ main(int  argc,                           /* I - Number of command-line args */
     {
       fprintf(stderr, "DEBUG: Printer responded with HTTP version %d.%d.\n",
               http->version / 100, http->version % 100);
-
-      _cupsLangPrintFilter(stderr, "ERROR",
-                           _("Unable to print: the printer does not conform to "
-                            "the IPP standard."));
-      exit(CUPS_BACKEND_STOP);
+      update_reasons(NULL, "+cups-ipp-conformance-failure-report,"
+                          "cups-ipp-wrong-http-version");
     }
 
     supported  = cupsDoRequest(http, request, resource);
     ipp_status = cupsLastError();
 
-    if (ipp_status > IPP_OK_CONFLICT)
+    fprintf(stderr, "DEBUG: Get-Printer-Attributes: %s (%s)\n",
+            ippErrorString(ipp_status), cupsLastErrorString());
+
+    if (ipp_status <= IPP_OK_CONFLICT)
+      password_tries = 0;
+    else
     {
       fprintf(stderr, "DEBUG: Get-Printer-Attributes returned %s.\n",
               ippErrorString(ipp_status));
@@ -720,16 +961,13 @@ main(int  argc,                           /* I - Number of command-line args */
          return (CUPS_BACKEND_FAILED);
        }
 
-       _cupsLangPrintFilter(stderr, "WARNING",
-                            _("Network host \"%s\" is busy; will retry in %d "
-                              "seconds."), hostname, delay);
+       _cupsLangPrintFilter(stderr, "INFO", _("The printer is in use."));
 
-        report_printer_state(supported, 0);
+        report_printer_state(supported);
 
-       sleep(delay);
+       sleep((unsigned)delay);
 
-       if (delay < 30)
-         delay += 5;
+        delay = _cupsNextDelay(delay, &prev_delay);
       }
       else if ((ipp_status == IPP_BAD_REQUEST ||
                ipp_status == IPP_VERSION_NOT_SUPPORTED) && version > 10)
@@ -740,16 +978,18 @@ main(int  argc,                           /* I - Number of command-line args */
 
         if (version >= 20)
        {
-         _cupsLangPrintFilter(stderr, "INFO",
-                              _("Printer does not support IPP/%d.%d, trying "
-                                "IPP/%s."), version / 10, version % 10, "1.1");
+         _cupsLangPrintFilter(stderr, "INFO", _("Preparing to print."));
+         fprintf(stderr,
+                 "DEBUG: The printer does not support IPP/%d.%d, trying "
+                 "IPP/1.1.\n", version / 10, version % 10);
          version = 11;
        }
        else
        {
-         _cupsLangPrintFilter(stderr, "INFO",
-                              _("Printer does not support IPP/%d.%d, trying "
-                                "IPP/%s."), version / 10, version % 10, "1.0");
+         _cupsLangPrintFilter(stderr, "INFO", _("Preparing to print."));
+         fprintf(stderr,
+                 "DEBUG: The printer does not support IPP/%d.%d, trying "
+                 "IPP/1.0.\n", version / 10, version % 10);
          version = 10;
         }
 
@@ -758,41 +998,131 @@ main(int  argc,                          /* I - Number of command-line args */
       else if (ipp_status == IPP_NOT_FOUND)
       {
         _cupsLangPrintFilter(stderr, "ERROR",
-                            _("The printer URI is incorrect or no longer "
-                              "exists."));
+                            _("The printer configuration is incorrect or the "
+                              "printer no longer exists."));
 
-       if (supported)
-          ippDelete(supported);
+       ippDelete(supported);
 
        return (CUPS_BACKEND_STOP);
       }
-      else if (ipp_status == IPP_NOT_AUTHORIZED || ipp_status == IPP_FORBIDDEN)
+      else if (ipp_status == IPP_FORBIDDEN ||
+               ipp_status == IPP_AUTHENTICATION_CANCELED)
       {
-       if (!strncmp(httpGetField(http, HTTP_FIELD_WWW_AUTHENTICATE),
-                    "Negotiate", 9))
+        const char *www_auth = httpGetField(http, HTTP_FIELD_WWW_AUTHENTICATE);
+                                       /* WWW-Authenticate field value */
+
+       if (!strncmp(www_auth, "Negotiate", 9))
          auth_info_required = "negotiate";
+        else if (www_auth[0])
+          auth_info_required = "username,password";
 
        fprintf(stderr, "ATTR: auth-info-required=%s\n", auth_info_required);
        return (CUPS_BACKEND_AUTH_REQUIRED);
       }
-      else
+      else if (ipp_status != IPP_NOT_AUTHORIZED)
       {
        _cupsLangPrintFilter(stderr, "ERROR",
-                            _("Unable to get printer status: %s"),
-                            cupsLastErrorString());
+                            _("Unable to get printer status."));
         sleep(10);
-      }
 
-      if (supported)
-        ippDelete(supported);
+       httpReconnect(http);
+      }
 
+      ippDelete(supported);
+      supported = NULL;
       continue;
     }
 
+    if (!getenv("CLASS"))
+    {
+     /*
+      * Check printer-is-accepting-jobs = false and printer-state-reasons for the
+      * "spool-area-full" keyword...
+      */
+
+      int busy = 0;
+
+      if ((printer_accepting = ippFindAttribute(supported,
+                                               "printer-is-accepting-jobs",
+                                               IPP_TAG_BOOLEAN)) != NULL &&
+         !printer_accepting->values[0].boolean)
+        busy = 1;
+      else if (!printer_accepting)
+        update_reasons(NULL, "+cups-ipp-conformance-failure-report,"
+                            "cups-ipp-missing-printer-is-accepting-jobs");
+
+      if ((printer_state = ippFindAttribute(supported,
+                                           "printer-state-reasons",
+                                           IPP_TAG_KEYWORD)) == NULL)
+      {
+        update_reasons(NULL, "+cups-ipp-conformance-failure-report,"
+                            "cups-ipp-missing-printer-state-reasons");
+      }
+      else if (!busy)
+      {
+       for (i = 0; i < printer_state->num_values; i ++)
+       {
+         if (!strcmp(printer_state->values[0].string.text,
+                     "spool-area-full") ||
+             !strncmp(printer_state->values[0].string.text, "spool-area-full-",
+                      16))
+         {
+           busy = 1;
+           break;
+         }
+       }
+      }
+
+      if (busy)
+      {
+       _cupsLangPrintFilter(stderr, "INFO", _("The printer is in use."));
+
+       report_printer_state(supported);
+
+       sleep((unsigned)delay);
+
+       delay = _cupsNextDelay(delay, &prev_delay);
+
+       ippDelete(supported);
+       supported  = NULL;
+       ipp_status = IPP_STATUS_ERROR_BUSY;
+       continue;
+      }
+    }
+
    /*
     * Check for supported attributes...
     */
 
+#ifdef HAVE_LIBZ
+    if ((compression_sup = ippFindAttribute(supported, "compression-supported",
+                                            IPP_TAG_KEYWORD)) != NULL)
+    {
+     /*
+      * Check whether the requested compression is supported and/or default to
+      * compression if supported...
+      */
+
+      if (compression && !ippContainsString(compression_sup, compression))
+      {
+        fprintf(stderr, "DEBUG: Printer does not support the requested "
+                        "compression value \"%s\".\n", compression);
+        compression = NULL;
+      }
+      else if (!compression && (!strcmp(final_content_type, "image/pwg-raster") || !strcmp(final_content_type, "image/urf")))
+      {
+        if (ippContainsString(compression_sup, "gzip"))
+          compression = "gzip";
+        else if (ippContainsString(compression_sup, "deflate"))
+          compression = "deflate";
+
+        if (compression)
+          fprintf(stderr, "DEBUG: Automatically using \"%s\" compression.\n",
+                  compression);
+      }
+    }
+#endif /* HAVE_LIBZ */
+
     if ((copies_sup = ippFindAttribute(supported, "copies-supported",
                                       IPP_TAG_RANGE)) != NULL)
     {
@@ -811,6 +1141,8 @@ main(int  argc,                            /* I - Number of command-line args */
 
     cups_version = ippFindAttribute(supported, "cups-version", IPP_TAG_TEXT);
 
+    encryption_sup = ippFindAttribute(supported, "job-password-encryption-supported", IPP_TAG_KEYWORD);
+
     if ((format_sup = ippFindAttribute(supported, "document-format-supported",
                                       IPP_TAG_MIMETYPE)) != NULL)
     {
@@ -831,37 +1163,89 @@ main(int  argc,                          /* I - Number of command-line args */
                media_col_sup->values[i].string.text);
     }
 
+    print_color_mode_sup = ippFindAttribute(supported, "print-color-mode-supported", IPP_TAG_KEYWORD);
+
     if ((operations_sup = ippFindAttribute(supported, "operations-supported",
                                           IPP_TAG_ENUM)) != NULL)
     {
+      fprintf(stderr, "DEBUG: operations-supported (%d values)\n",
+              operations_sup->num_values);
+      for (i = 0; i < operations_sup->num_values; i ++)
+        fprintf(stderr, "DEBUG: [%d] = %s\n", i,
+                ippOpString(operations_sup->values[i].integer));
+
+      for (i = 0; i < operations_sup->num_values; i ++)
+        if (operations_sup->values[i].integer == IPP_PRINT_JOB)
+         break;
+
+      if (i >= operations_sup->num_values)
+       update_reasons(NULL, "+cups-ipp-conformance-failure-report,"
+                            "cups-ipp-missing-print-job");
+
+      for (i = 0; i < operations_sup->num_values; i ++)
+        if (operations_sup->values[i].integer == IPP_CANCEL_JOB)
+         break;
+
+      if (i >= operations_sup->num_values)
+       update_reasons(NULL, "+cups-ipp-conformance-failure-report,"
+                            "cups-ipp-missing-cancel-job");
+
+      for (i = 0; i < operations_sup->num_values; i ++)
+        if (operations_sup->values[i].integer == IPP_GET_JOB_ATTRIBUTES)
+         break;
+
+      if (i >= operations_sup->num_values)
+       update_reasons(NULL, "+cups-ipp-conformance-failure-report,"
+                             "cups-ipp-missing-get-job-attributes");
+
+      for (i = 0; i < operations_sup->num_values; i ++)
+        if (operations_sup->values[i].integer == IPP_GET_PRINTER_ATTRIBUTES)
+         break;
+
+      if (i >= operations_sup->num_values)
+       update_reasons(NULL, "+cups-ipp-conformance-failure-report,"
+                            "cups-ipp-missing-get-printer-attributes");
+
       for (i = 0; i < operations_sup->num_values; i ++)
+      {
         if (operations_sup->values[i].integer == IPP_VALIDATE_JOB)
-       {
          validate_job = 1;
-         break;
-       }
+        else if (operations_sup->values[i].integer == IPP_CREATE_JOB)
+         create_job = 1;
+        else if (operations_sup->values[i].integer == IPP_SEND_DOCUMENT)
+         send_document = 1;
+        else if (operations_sup->values[i].integer == IPP_GET_JOB_ATTRIBUTES)
+         get_job_attrs = 1;
+      }
 
-      if (!validate_job)
+      if (create_job && !send_document)
       {
-        _cupsLangPrintFilter(stderr, "WARNING",
-                            _("This printer does not conform to the IPP "
-                              "standard and may not work."));
-        fputs("DEBUG: operations-supported does not list Validate-Job.\n",
-             stderr);
+        fputs("DEBUG: Printer supports Create-Job but not Send-Document.\n",
+              stderr);
+        create_job = 0;
+
+       update_reasons(NULL, "+cups-ipp-conformance-failure-report,"
+                             "cups-ipp-missing-send-document");
       }
+
+      if (!validate_job)
+       update_reasons(NULL, "+cups-ipp-conformance-failure-report,"
+                             "cups-ipp-missing-validate-job");
     }
     else
-    {
-      _cupsLangPrintFilter(stderr, "WARNING",
-                          _("This printer does not conform to the IPP "
-                            "standard and may not work."));
-      fputs("DEBUG: operations-supported not returned in "
-            "Get-Printer-Attributes request.\n", stderr);
-    }
+      update_reasons(NULL, "+cups-ipp-conformance-failure-report,"
+                          "cups-ipp-missing-operations-supported");
+
+    doc_handling_sup = ippFindAttribute(supported,
+                                       "multiple-document-handling-supported",
+                                       IPP_TAG_KEYWORD);
 
-    report_printer_state(supported, 0);
+    report_printer_state(supported);
   }
-  while (ipp_status > IPP_OK_CONFLICT);
+  while (!job_canceled && ipp_status > IPP_OK_CONFLICT);
+
+  if (job_canceled)
+    return (CUPS_BACKEND_OK);
 
  /*
   * See if the printer is accepting jobs and is not stopped; if either
@@ -912,12 +1296,7 @@ main(int  argc,                           /* I - Number of command-line args */
   copies = atoi(argv[4]);
 
   if (copies_sup || argc < 7)
-  {
     copies_remaining = 1;
-
-    if (argc < 7)
-      copies = 1;
-  }
   else
     copies_remaining = copies;
 
@@ -926,7 +1305,6 @@ main(int  argc,                            /* I - Number of command-line args */
   */
 
   options = NULL;
-  pwg     = NULL;
 
   if (send_options)
   {
@@ -938,10 +1316,51 @@ main(int  argc,                          /* I - Number of command-line args */
       * Load the PPD file and generate PWG attribute mapping information...
       */
 
+      ppd_attr_t *mandatory;           /* cupsMandatory value */
+
       ppd = ppdOpenFile(getenv("PPD"));
-      pwg = _pwgCreateWithPPD(ppd);
+      pc  = _ppdCacheCreateWithPPD(ppd);
 
-      ppdClose(ppd);
+      ppdMarkDefaults(ppd);
+      cupsMarkOptions(ppd, num_options, options);
+
+      if ((mandatory = ppdFindAttr(ppd, "cupsMandatory", NULL)) != NULL)
+        strlcpy(mandatory_attrs, mandatory->value, sizeof(mandatory_attrs));
+    }
+
+   /*
+    * Validate job-password/-encryption...
+    */
+
+    if (cupsGetOption("job-password", num_options, options))
+    {
+      const char *keyword;             /* job-password-encryption value */
+      static const char * const hashes[] =
+      {                                        /* List of supported hash algorithms, in order of preference */
+        "sha-512",
+        "sha-384",
+        "sha-512_256",
+        "sha-512-224",
+        "sha-256",
+        "sha-224",
+        "sha",
+        "none"
+      };
+
+      if ((keyword = cupsGetOption("job-password-encryption", num_options, options)) == NULL || !ippContainsString(encryption_sup, keyword))
+      {
+       /*
+        * Either no job-password-encryption or the value isn't supported by
+        * the printer...
+        */
+
+        for (i = 0; i < (int)(sizeof(hashes) / sizeof(hashes[0])); i ++)
+          if (ippContainsString(encryption_sup, hashes[i]))
+            break;
+
+        if (i < (int)(sizeof(hashes) / sizeof(hashes[0])))
+          num_options = cupsAddOption("job-password-encryption", hashes[i], num_options, &options);
+      }
     }
   }
   else
@@ -951,28 +1370,96 @@ main(int  argc,                          /* I - Number of command-line args */
 
   if (format_sup != NULL)
   {
-    for (i = 0; i < format_sup->num_values; i ++)
-      if (!strcasecmp(final_content_type, format_sup->values[i].string.text))
-      {
-        document_format = final_content_type;
-       break;
-      }
+    if (ippContainsString(format_sup, final_content_type))
+      document_format = final_content_type;
+    else if (ippContainsString(format_sup, "application/octet-stream"))
+      document_format = "application/octet-stream";
   }
 
+  fprintf(stderr, "DEBUG: final_content_type=\"%s\", document_format=\"%s\"\n",
+          final_content_type, document_format ? document_format : "(null)");
+
  /*
-  * Start monitoring the printer in the background...
+  * If the printer does not support HTTP/1.1 (which IPP requires), copy stdin
+  * to a temporary file so that we can do a HTTP/1.0 submission...
+  *
+  * (I hate compatibility hacks!)
   */
 
-  monitor.uri           = uri;
-  monitor.hostname      = hostname;
-  monitor.user          = argv[2];
-  monitor.resource      = resource;
-  monitor.port          = port;
-  monitor.version       = version;
-  monitor.job_id        = 0;
-  monitor.encryption    = cupsEncryption();
-  monitor.job_state     = IPP_JOB_PENDING;
-  monitor.printer_state = IPP_PRINTER_IDLE;
+  if (http->version < HTTP_1_1 && num_files == 0)
+  {
+    if ((fd = cupsTempFd(tmpfilename, sizeof(tmpfilename))) < 0)
+    {
+      perror("DEBUG: Unable to create temporary file");
+      return (CUPS_BACKEND_FAILED);
+    }
+
+    _cupsLangPrintFilter(stderr, "INFO", _("Copying print data."));
+
+    if ((compatsize = write(fd, buffer, (size_t)bytes)) < 0)
+    {
+      perror("DEBUG: Unable to write temporary file");
+      return (CUPS_BACKEND_FAILED);
+    }
+
+    if ((bytes = backendRunLoop(-1, fd, snmp_fd, &(addrlist->addr), 0, 0,
+                               backendNetworkSideCB)) < 0)
+      return (CUPS_BACKEND_FAILED);
+
+    compatsize += bytes;
+
+    close(fd);
+
+    compatfile = tmpfilename;
+    files      = &compatfile;
+    num_files  = 1;
+  }
+  else if (http->version < HTTP_1_1 && num_files == 1)
+  {
+    struct stat        fileinfo;               /* File information */
+
+    if (!stat(files[0], &fileinfo))
+      compatsize = fileinfo.st_size;
+  }
+
+ /*
+  * If the printer only claims to support IPP/1.0, or if the user specifically
+  * included version=1.0 in the URI, then do not try to use Create-Job or
+  * Send-Document.  This is another dreaded compatibility hack, but
+  * unfortunately there are enough broken printers out there that we need
+  * this for now...
+  */
+
+  if (version == 10)
+    create_job = send_document = 0;
+
+ /*
+  * Start monitoring the printer in the background...
+  */
+
+  monitor.uri           = uri;
+  monitor.hostname      = hostname;
+  monitor.user          = argv[2];
+  monitor.resource      = resource;
+  monitor.port          = port;
+  monitor.version       = version;
+  monitor.job_id        = 0;
+  monitor.create_job    = create_job;
+  monitor.get_job_attrs = get_job_attrs;
+  monitor.encryption    = cupsEncryption();
+  monitor.job_state     = IPP_JOB_PENDING;
+  monitor.printer_state = IPP_PRINTER_IDLE;
+
+  if (create_job)
+  {
+    monitor.job_name = argv[3];
+  }
+  else
+  {
+    snprintf(print_job_name, sizeof(print_job_name), "%s - %s", argv[1],
+             argv[3]);
+    monitor.job_name = print_job_name;
+  }
 
   _cupsThreadCreate((_cups_thread_func_t)monitor_printer, &monitor);
 
@@ -980,59 +1467,74 @@ main(int  argc,                          /* I - Number of command-line args */
   * Validate access to the printer...
   */
 
-  while (!job_canceled)
+  while (!job_canceled && validate_job)
   {
-    request = new_request(IPP_VALIDATE_JOB, version, uri, argv[2], argv[3],
-                          num_options, options, compression,
-                         copies_sup ? copies : 1, document_format, pwg,
-                         media_col_sup);
+    request = new_request(IPP_OP_VALIDATE_JOB, version, uri, argv[2],
+                          monitor.job_name, num_options, options, compression,
+                         copies_sup ? copies : 1, document_format, pc, ppd,
+                         media_col_sup, doc_handling_sup, print_color_mode_sup);
 
-    ippDelete(cupsDoRequest(http, request, resource));
+    response = cupsDoRequest(http, request, resource);
 
     ipp_status = cupsLastError();
 
-    if (ipp_status > IPP_OK_CONFLICT)
-    {
-      if (job_canceled)
-        break;
+    fprintf(stderr, "DEBUG: Validate-Job: %s (%s)\n",
+            ippErrorString(ipp_status), cupsLastErrorString());
+    debug_attributes(response);
 
-      if (ipp_status == IPP_SERVICE_UNAVAILABLE ||
-         ipp_status == IPP_PRINTER_BUSY)
-      {
-        _cupsLangPrintFilter(stderr, "INFO",
-                            _("Printer busy; will retry in 10 seconds."));
-       sleep(10);
-      }
-      else
-      {
-       /*
-       * Update auth-info-required as needed...
-       */
+    if ((job_auth = ippFindAttribute(response, "job-authorization-uri",
+                                    IPP_TAG_URI)) != NULL)
+      num_options = cupsAddOption("job-authorization-uri",
+                                  ippGetString(job_auth, 0, NULL), num_options,
+                                  &options);
 
-        _cupsLangPrintFilter(stderr, "ERROR", "%s", cupsLastErrorString());
+    ippDelete(response);
 
-       if (ipp_status == IPP_NOT_AUTHORIZED || ipp_status == IPP_FORBIDDEN)
-       {
-         fprintf(stderr, "DEBUG: WWW-Authenticate=\"%s\"\n",
-                 httpGetField(http, HTTP_FIELD_WWW_AUTHENTICATE));
+    if (job_canceled)
+      break;
 
-         /*
-         * 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 (ipp_status == IPP_STATUS_ERROR_SERVICE_UNAVAILABLE ||
+        ipp_status == IPP_STATUS_ERROR_BUSY)
+    {
+      _cupsLangPrintFilter(stderr, "INFO", _("The printer is in use."));
+      sleep(10);
+    }
+    else if (ipp_status == IPP_STATUS_ERROR_DOCUMENT_FORMAT_NOT_SUPPORTED ||
+             ipp_status == IPP_STATUS_ERROR_ATTRIBUTES_OR_VALUES ||
+             ipp_status == IPP_STATUS_ERROR_CUPS_ACCOUNT_INFO_NEEDED ||
+             ipp_status == IPP_STATUS_ERROR_CUPS_ACCOUNT_CLOSED ||
+             ipp_status == IPP_STATUS_ERROR_CUPS_ACCOUNT_LIMIT_REACHED ||
+             ipp_status == IPP_STATUS_ERROR_CUPS_ACCOUNT_AUTHORIZATION_FAILED)
+      goto cleanup;
+    else if (ipp_status == IPP_STATUS_ERROR_FORBIDDEN ||
+             ipp_status == IPP_STATUS_ERROR_NOT_AUTHORIZED ||
+            ipp_status == IPP_STATUS_ERROR_CUPS_AUTHENTICATION_CANCELED)
+    {
+      const char *www_auth = httpGetField(http, HTTP_FIELD_WWW_AUTHENTICATE);
+                                       /* WWW-Authenticate field value */
 
-         if (!strncmp(httpGetField(http, HTTP_FIELD_WWW_AUTHENTICATE),
-                      "Negotiate", 9))
-           auth_info_required = "negotiate";
-       }
+      if (!strncmp(www_auth, "Negotiate", 9))
+       auth_info_required = "negotiate";
+      else if (www_auth[0])
+       auth_info_required = "username,password";
 
-       goto cleanup;
-      }
+      goto cleanup;
     }
-    else
+    else if (ipp_status == IPP_STATUS_ERROR_OPERATION_NOT_SUPPORTED)
+    {
+     /*
+      * This is all too common...
+      */
+
+      update_reasons(NULL, "+cups-ipp-conformance-failure-report,"
+                          "cups-ipp-missing-validate-job");
+      break;
+    }
+    else if (ipp_status < IPP_REDIRECTION_OTHER_SITE ||
+             ipp_status == IPP_BAD_REQUEST)
       break;
+    else if (job_auth == NULL && ipp_status > IPP_BAD_REQUEST)
+      goto cleanup;
   }
 
  /*
@@ -1056,44 +1558,88 @@ main(int  argc,                         /* I - Number of command-line args */
     if (job_canceled)
       break;
 
-    request = new_request(num_files > 1 ? IPP_CREATE_JOB : IPP_PRINT_JOB,
-                         version, uri, argv[2], argv[3], num_options, options,
-                         compression, copies_sup ? copies : 1, document_format,
-                         pwg, media_col_sup);
+    request = new_request((num_files > 1 || create_job) ? IPP_CREATE_JOB :
+                                                          IPP_PRINT_JOB,
+                         version, uri, argv[2], monitor.job_name, num_options,
+                         options, compression, copies_sup ? copies : 1,
+                         document_format, pc, ppd, media_col_sup,
+                         doc_handling_sup, print_color_mode_sup);
 
    /*
     * Do the request...
     */
 
-    if (num_files > 1)
+    if (num_files > 1 || create_job)
       response = cupsDoRequest(http, request, resource);
     else
     {
-      fputs("DEBUG: Sending file using chunking...\n", stderr);
-      http_status = cupsSendRequest(http, request, resource, 0);
+      size_t   length = 0;             /* Length of request */
+
+      if (compatsize > 0)
+      {
+        fputs("DEBUG: Sending file using HTTP/1.0 Content-Length...\n", stderr);
+        length = ippLength(request) + (size_t)compatsize;
+      }
+      else
+        fputs("DEBUG: Sending file using HTTP/1.1 chunking...\n", stderr);
+
+      http_status = cupsSendRequest(http, request, resource, length);
       if (http_status == HTTP_CONTINUE && request->state == IPP_DATA)
       {
+       if (compression && strcmp(compression, "none"))
+         httpSetField(http, HTTP_FIELD_CONTENT_ENCODING, compression);
+
         if (num_files == 1)
-         fd = open(files[0], O_RDONLY);
+        {
+         if ((fd = open(files[0], O_RDONLY)) < 0)
+         {
+           _cupsLangPrintError("ERROR", _("Unable to open print file"));
+           return (CUPS_BACKEND_FAILED);
+         }
+       }
        else
-         fd = 0;
+       {
+         fd          = 0;
+         http_status = cupsWriteRequestData(http, buffer, (size_t)bytes);
+        }
 
-        while ((bytes = read(fd, buffer, sizeof(buffer))) > 0)
+        while (http_status == HTTP_CONTINUE &&
+               (!job_canceled || compatsize > 0))
        {
-         fprintf(stderr, "DEBUG: Read %d bytes...\n", (int)bytes);
+        /*
+         * Check for side-channel requests and more print data...
+         */
 
-         if (cupsWriteRequestData(http, buffer, bytes) != HTTP_CONTINUE)
-            break;
-          else
-         {
-          /*
-           * Check for side-channel requests...
-           */
+          FD_ZERO(&input);
+         FD_SET(fd, &input);
+         FD_SET(snmp_fd, &input);
+         FD_SET(CUPS_SC_FD, &input);
 
+          while (select(fd > snmp_fd ? fd + 1 : snmp_fd + 1, &input, NULL, NULL,
+                       NULL) <= 0 && !job_canceled);
+
+         if (FD_ISSET(snmp_fd, &input))
            backendCheckSideChannel(snmp_fd, http->hostaddr);
+
+          if (FD_ISSET(fd, &input))
+          {
+            if ((bytes = read(fd, buffer, sizeof(buffer))) > 0)
+            {
+             fprintf(stderr, "DEBUG: Read %d bytes...\n", (int)bytes);
+
+             if ((http_status = cupsWriteRequestData(http, buffer, (size_t)bytes))
+                     != HTTP_CONTINUE)
+               break;
+           }
+           else if (bytes == 0 || (errno != EINTR && errno != EAGAIN))
+             break;
          }
        }
 
+       if (http_status == HTTP_ERROR)
+         fprintf(stderr, "DEBUG: Error writing document data for "
+                         "Print-Job: %s\n", strerror(httpError(http)));
+
         if (num_files == 1)
          close(fd);
       }
@@ -1104,6 +1650,11 @@ main(int  argc,                          /* I - Number of command-line args */
 
     ipp_status = cupsLastError();
 
+    fprintf(stderr, "DEBUG: %s: %s (%s)\n",
+            (num_files > 1 || create_job) ? "Create-Job" : "Print-Job",
+            ippErrorString(ipp_status), cupsLastErrorString());
+    debug_attributes(response);
+
     if (ipp_status > IPP_OK_CONFLICT)
     {
       job_id = 0;
@@ -1111,13 +1662,31 @@ main(int  argc,                         /* I - Number of command-line args */
       if (job_canceled)
         break;
 
-      if (ipp_status == IPP_SERVICE_UNAVAILABLE ||
-         ipp_status == IPP_PRINTER_BUSY)
+      if (ipp_status == IPP_STATUS_ERROR_SERVICE_UNAVAILABLE ||
+          ipp_status == IPP_STATUS_ERROR_NOT_POSSIBLE ||
+         ipp_status == IPP_STATUS_ERROR_BUSY)
       {
-        _cupsLangPrintFilter(stderr, "INFO",
-                            _("Printer busy; will retry in 10 seconds."));
+       _cupsLangPrintFilter(stderr, "INFO", _("The printer is in use."));
        sleep(10);
+
+       if (num_files == 0)
+       {
+        /*
+         * We can't re-submit when we have no files to print, so exit
+         * immediately with the right status code...
+         */
+
+         goto cleanup;
+       }
       }
+      else if (ipp_status == IPP_STATUS_ERROR_JOB_CANCELED ||
+               ipp_status == IPP_STATUS_ERROR_NOT_AUTHORIZED ||
+               ipp_status == IPP_STATUS_ERROR_ATTRIBUTES_OR_VALUES ||
+              ipp_status == IPP_STATUS_ERROR_CUPS_ACCOUNT_INFO_NEEDED ||
+              ipp_status == IPP_STATUS_ERROR_CUPS_ACCOUNT_CLOSED ||
+              ipp_status == IPP_STATUS_ERROR_CUPS_ACCOUNT_LIMIT_REACHED ||
+              ipp_status == IPP_STATUS_ERROR_CUPS_ACCOUNT_AUTHORIZATION_FAILED)
+        goto cleanup;
       else
       {
        /*
@@ -1125,39 +1694,54 @@ main(int  argc,                         /* I - Number of command-line args */
        */
 
         _cupsLangPrintFilter(stderr, "ERROR",
-                            _("Print file was not accepted: %s"),
-                            cupsLastErrorString());
+                            _("Print job was not accepted."));
 
-       if (ipp_status == IPP_NOT_AUTHORIZED || ipp_status == IPP_FORBIDDEN)
+        if (ipp_status == IPP_STATUS_ERROR_FORBIDDEN ||
+            ipp_status == IPP_STATUS_ERROR_CUPS_AUTHENTICATION_CANCELED)
        {
-         fprintf(stderr, "DEBUG: WWW-Authenticate=\"%s\"\n",
-                 httpGetField(http, HTTP_FIELD_WWW_AUTHENTICATE));
+         const char *www_auth = httpGetField(http, HTTP_FIELD_WWW_AUTHENTICATE);
+                                       /* WWW-Authenticate field value */
 
-         /*
-         * 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(www_auth, "Negotiate", 9))
+           auth_info_required = "negotiate";
+         else if (www_auth[0])
+           auth_info_required = "username,password";
+       }
+       else if (ipp_status == IPP_REQUEST_VALUE)
+       {
+        /*
+         * Print file is too large, abort this job...
          */
 
-         if (!strncmp(httpGetField(http, HTTP_FIELD_WWW_AUTHENTICATE),
-                      "Negotiate", 9))
-           auth_info_required = "negotiate";
+         goto cleanup;
+       }
+       else
+         sleep(10);
+
+       if (num_files == 0)
+       {
+        /*
+         * We can't re-submit when we have no files to print, so exit
+         * immediately with the right status code...
+         */
+
+         goto cleanup;
        }
       }
     }
     else if ((job_id_attr = ippFindAttribute(response, "job-id",
                                              IPP_TAG_INTEGER)) == NULL)
     {
-      _cupsLangPrintFilter(stderr, "INFO",
-                          _("Print file accepted - job ID unknown."));
+      fputs("DEBUG: Print job accepted - job ID unknown.\n", stderr);
+      update_reasons(NULL, "+cups-ipp-conformance-failure-report,"
+                          "cups-ipp-missing-job-id");
       job_id = 0;
     }
     else
     {
+      password_tries = 0;
       monitor.job_id = job_id = job_id_attr->values[0].integer;
-      _cupsLangPrintFilter(stderr, "INFO",
-                           _("Print file accepted - job ID %d."), job_id);
+      fprintf(stderr, "DEBUG: Print job accepted - job ID %d.\n", job_id);
     }
 
     ippDelete(response);
@@ -1165,9 +1749,9 @@ main(int  argc,                           /* I - Number of command-line args */
     if (job_canceled)
       break;
 
-    if (job_id && num_files > 1)
+    if (job_id && (num_files > 1 || create_job))
     {
-      for (i = 0; i < num_files; i ++)
+      for (i = 0; num_files == 0 || i < num_files; i ++)
       {
        /*
        * Check for side-channel requests...
@@ -1180,8 +1764,7 @@ main(int  argc,                           /* I - Number of command-line args */
        */
 
        request = ippNewRequest(IPP_SEND_DOCUMENT);
-       request->request.op.version[0] = version / 10;
-       request->request.op.version[1] = version % 10;
+       ippSetVersion(request, version / 10, version % 10);
 
        ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, "printer-uri",
                     NULL, uri);
@@ -1193,20 +1776,51 @@ main(int  argc,                         /* I - Number of command-line args */
          ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_NAME,
                        "requesting-user-name", NULL, argv[2]);
 
-        if ((i + 1) == num_files)
-         ippAddBoolean(request, IPP_TAG_OPERATION, "last-document", 1);
+       ippAddBoolean(request, IPP_TAG_OPERATION, "last-document",
+                     (i + 1) >= num_files);
+
+       if (document_format)
+         ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_MIMETYPE,
+                      "document-format", NULL, document_format);
 
-        ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_MIMETYPE,
-                    "document-format", NULL, content_type);
+        if (compression)
+         ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_KEYWORD,
+                      "compression", NULL, compression);
 
        fprintf(stderr, "DEBUG: Sending file %d using chunking...\n", i + 1);
+       fprintf(stderr, "DEBUG: IPP/%d.%d %s #%d\n", version / 10, version % 10, ippOpString(ippGetOperation(request)), ippGetRequestId(request));
+       debug_attributes(request);
+
        http_status = cupsSendRequest(http, request, resource, 0);
-       if (http_status == HTTP_CONTINUE && request->state == IPP_DATA &&
-           (fd = open(files[i], O_RDONLY)) >= 0)
+       if (http_status == HTTP_CONTINUE && request->state == IPP_DATA)
+       {
+         if (compression && strcmp(compression, "none"))
+           httpSetField(http, HTTP_FIELD_CONTENT_ENCODING, compression);
+
+         if (num_files == 0)
+         {
+           fd          = 0;
+           http_status = cupsWriteRequestData(http, buffer, (size_t)bytes);
+         }
+         else
+         {
+           if ((fd = open(files[i], O_RDONLY)) < 0)
+           {
+             _cupsLangPrintError("ERROR", _("Unable to open print file"));
+             return (CUPS_BACKEND_FAILED);
+           }
+         }
+       }
+       else
+         fd = -1;
+
+       if (fd >= 0)
        {
-         while ((bytes = read(fd, buffer, sizeof(buffer))) > 0)
+         while (!job_canceled && http_status == HTTP_CONTINUE &&
+                (bytes = read(fd, buffer, sizeof(buffer))) > 0)
          {
-           if (cupsWriteRequestData(http, buffer, bytes) != HTTP_CONTINUE)
+           if ((http_status = cupsWriteRequestData(http, buffer, (size_t)bytes))
+                   != HTTP_CONTINUE)
              break;
            else
            {
@@ -1218,32 +1832,135 @@ main(int  argc,                                /* I - Number of command-line args */
            }
          }
 
-         close(fd);
+          if (fd > 0)
+           close(fd);
        }
 
-       ippDelete(cupsGetResponse(http, resource));
+        if (http_status == HTTP_ERROR)
+          fprintf(stderr, "DEBUG: Error writing document data for "
+                          "Send-Document: %s\n", strerror(httpError(http)));
+
+       response = cupsGetResponse(http, resource);
        ippDelete(request);
 
-       if (cupsLastError() > IPP_OK_CONFLICT)
+       fprintf(stderr, "DEBUG: Send-Document: %s (%s)\n",
+               ippErrorString(cupsLastError()), cupsLastErrorString());
+        debug_attributes(response);
+        ippDelete(response);
+
+       if (cupsLastError() > IPP_OK_CONFLICT && !job_canceled)
        {
          ipp_status = cupsLastError();
 
          _cupsLangPrintFilter(stderr, "ERROR",
-                              _("Unable to add file to job: %s"),
-                              cupsLastErrorString());
+                              _("Unable to add document to print job."));
          break;
        }
+       else
+       {
+         password_tries = 0;
+
+         if (num_files == 0 || fd < 0)
+           break;
+       }
       }
     }
 
+    if (job_canceled)
+      break;
+
     if (ipp_status <= IPP_OK_CONFLICT && argc > 6)
     {
       fprintf(stderr, "PAGE: 1 %d\n", copies_sup ? atoi(argv[4]) : 1);
       copies_remaining --;
     }
+    else if ((ipp_status == IPP_STATUS_ERROR_DOCUMENT_FORMAT_ERROR || ipp_status == IPP_STATUS_ERROR_DOCUMENT_UNPRINTABLE) &&
+             argc == 6 &&
+             document_format && strcmp(document_format, "image/pwg-raster") && strcmp(document_format, "image/urf"))
+    {
+     /*
+      * Need to reprocess the job as raster...
+      */
+
+      fputs("JOBSTATE: cups-retry-as-raster\n", stderr);
+      if (job_id > 0)
+       cancel_job(http, uri, job_id, resource, argv[2], version);
+
+      goto cleanup;
+    }
     else if (ipp_status == IPP_SERVICE_UNAVAILABLE ||
+             ipp_status == IPP_NOT_POSSIBLE ||
             ipp_status == IPP_PRINTER_BUSY)
+    {
+      if (argc == 6)
+      {
+       /*
+        * Need to reprocess the entire job; if we have a job ID, cancel the
+        * job first...
+        */
+
+       if (job_id > 0)
+         cancel_job(http, uri, job_id, resource, argv[2], version);
+
+        goto cleanup;
+      }
       continue;
+    }
+    else if (ipp_status == IPP_REQUEST_VALUE ||
+             ipp_status == IPP_ERROR_JOB_CANCELED ||
+             ipp_status == IPP_NOT_AUTHORIZED ||
+             ipp_status == IPP_STATUS_ERROR_CUPS_ACCOUNT_INFO_NEEDED ||
+             ipp_status == IPP_STATUS_ERROR_CUPS_ACCOUNT_CLOSED ||
+             ipp_status == IPP_STATUS_ERROR_CUPS_ACCOUNT_LIMIT_REACHED ||
+             ipp_status == IPP_STATUS_ERROR_CUPS_ACCOUNT_AUTHORIZATION_FAILED ||
+             ipp_status == IPP_INTERNAL_ERROR)
+    {
+     /*
+      * Print file is too large, job was canceled, we need new
+      * authentication data, or we had some sort of error...
+      */
+
+      goto cleanup;
+    }
+    else if (ipp_status == IPP_STATUS_ERROR_CUPS_UPGRADE_REQUIRED)
+    {
+     /*
+      * Server is configured incorrectly; the policy for Create-Job and
+      * Send-Document has to be the same (auth or no auth, encryption or
+      * no encryption).  Force the queue to stop since printing will never
+      * work.
+      */
+
+      fputs("DEBUG: The server or printer is configured incorrectly.\n",
+            stderr);
+      fputs("DEBUG: The policy for Create-Job and Send-Document must have the "
+            "same authentication and encryption requirements.\n", stderr);
+
+      ipp_status = IPP_STATUS_ERROR_INTERNAL;
+
+      if (job_id > 0)
+       cancel_job(http, uri, job_id, resource, argv[2], version);
+
+      goto cleanup;
+    }
+    else if (ipp_status == IPP_NOT_FOUND)
+    {
+     /*
+      * Printer does not actually implement support for Create-Job/
+      * Send-Document, so log the conformance issue and stop the printer.
+      */
+
+      fputs("DEBUG: This printer claims to support Create-Job and "
+            "Send-Document, but those operations failed.\n", stderr);
+      fputs("DEBUG: Add '?version=1.0' to the device URI to use legacy "
+            "compatibility mode.\n", stderr);
+      update_reasons(NULL, "+cups-ipp-conformance-failure-report,"
+                          "cups-ipp-missing-send-document");
+
+      ipp_status = IPP_INTERNAL_ERROR; /* Force queue to stop */
+
+      goto cleanup;
+    }
     else
       copies_remaining --;
 
@@ -1251,12 +1968,14 @@ main(int  argc,                         /* I - Number of command-line args */
     * Wait for the job to complete...
     */
 
-    if (!job_id || !waitjob)
+    if (!job_id || !waitjob || !get_job_attrs)
       continue;
 
+    fputs("STATE: +cups-waiting-for-job-completed\n", stderr);
+
     _cupsLangPrintFilter(stderr, "INFO", _("Waiting for job to complete."));
 
-    for (delay = 1; !job_canceled;)
+    for (delay = _cupsNextDelay(0, &prev_delay), waittime = time(NULL) + 30; !job_canceled;)
     {
      /*
       * Check for side-channel requests...
@@ -1264,13 +1983,21 @@ main(int  argc,                         /* I - Number of command-line args */
 
       backendCheckSideChannel(snmp_fd, http->hostaddr);
 
+     /*
+      * Check printer state...
+      */
+
+      check_printer_state(http, uri, resource, argv[2], version);
+
+      if (cupsLastError() <= IPP_OK_CONFLICT)
+        password_tries = 0;
+
      /*
       * Build an IPP_GET_JOB_ATTRIBUTES request...
       */
 
       request = ippNewRequest(IPP_GET_JOB_ATTRIBUTES);
-      request->request.op.version[0] = version / 10;
-      request->request.op.version[1] = version % 10;
+      ippSetVersion(request, version / 10, version % 10);
 
       ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, "printer-uri",
                   NULL, uri);
@@ -1286,37 +2013,57 @@ main(int  argc,                         /* I - Number of command-line args */
                     "requested-attributes", sizeof(jattrs) / sizeof(jattrs[0]),
                    NULL, jattrs);
 
+      fprintf(stderr, "DEBUG: IPP/%d.%d %s #%d\n", version / 10, version % 10, ippOpString(ippGetOperation(request)), ippGetRequestId(request));
+      debug_attributes(request);
+
      /*
       * Do the request...
       */
 
+      httpReconnect(http);
       response   = cupsDoRequest(http, request, resource);
       ipp_status = cupsLastError();
 
-      if (ipp_status == IPP_NOT_FOUND)
+      if (ipp_status == IPP_NOT_FOUND || ipp_status == IPP_NOT_POSSIBLE)
       {
        /*
         * Job has gone away and/or the server has no job history...
        */
 
+       update_reasons(NULL, "+cups-ipp-conformance-failure-report,"
+                            "cups-ipp-missing-job-history");
         ippDelete(response);
 
        ipp_status = IPP_OK;
         break;
       }
 
-      if (ipp_status > IPP_OK_CONFLICT)
+      fprintf(stderr, "DEBUG: Get-Job-Attributes: %s (%s)\n",
+             ippErrorString(ipp_status), cupsLastErrorString());
+      debug_attributes(response);
+
+      if (ipp_status <= IPP_OK_CONFLICT)
+       password_tries = 0;
+      else
       {
        if (ipp_status != IPP_SERVICE_UNAVAILABLE &&
            ipp_status != IPP_PRINTER_BUSY)
        {
          ippDelete(response);
-
-          _cupsLangPrintFilter(stderr, "ERROR",
-                              _("Unable to get job attributes: %s"),
-                              cupsLastErrorString());
+          ipp_status = IPP_OK;
           break;
        }
+       else if (ipp_status == IPP_INTERNAL_ERROR)
+       {
+         waitjob_tries ++;
+
+         if (waitjob_tries > 4)
+         {
+           ippDelete(response);
+           ipp_status = IPP_OK;
+           break;
+         }
+       }
       }
 
       if (response)
@@ -1324,23 +2071,38 @@ main(int  argc,                         /* I - Number of command-line args */
        if ((job_state = ippFindAttribute(response, "job-state",
                                          IPP_TAG_ENUM)) != NULL)
        {
+         /*
+         * Reflect the remote job state in the local queue...
+         */
+
+         if (cups_version &&
+             job_state->values[0].integer >= IPP_JOB_PENDING &&
+             job_state->values[0].integer <= IPP_JOB_COMPLETED)
+           update_reasons(NULL,
+                          remote_job_states[job_state->values[0].integer -
+                                            IPP_JOB_PENDING]);
+
+         if ((job_sheets = ippFindAttribute(response, "job-impressions-completed", IPP_TAG_INTEGER)) == NULL)
+           job_sheets = ippFindAttribute(response, "job-media-sheets-completed", IPP_TAG_INTEGER);
+
+         if (job_sheets)
+           fprintf(stderr, "PAGE: total %d\n",
+                   job_sheets->values[0].integer);
+
         /*
-          * Stop polling if the job is finished or pending-held...
+          * Stop polling if the job is finished or pending-held for 30 seconds...
          */
 
-          if (job_state->values[0].integer > IPP_JOB_STOPPED)
+          if (job_state->values[0].integer > IPP_JSTATE_STOPPED ||
+             (job_state->values[0].integer == IPP_JSTATE_HELD && time(NULL) > waittime))
          {
-           if ((job_sheets = ippFindAttribute(response, 
-                                              "job-media-sheets-completed",
-                                              IPP_TAG_INTEGER)) != NULL)
-             fprintf(stderr, "PAGE: total %d\n",
-                     job_sheets->values[0].integer);
-
            ippDelete(response);
            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
@@ -1348,8 +2110,8 @@ main(int  argc,                           /* I - Number of command-line args */
          * the job...
          */
 
-          fputs("DEBUG: No job-state available from printer - stopping queue.\n",
-               stderr);
+         update_reasons(NULL, "+cups-ipp-conformance-failure-report,"
+                              "cups-ipp-missing-job-state");
          ipp_status = IPP_INTERNAL_ERROR;
          break;
        }
@@ -1357,23 +2119,13 @@ main(int  argc,                         /* I - Number of command-line args */
 
       ippDelete(response);
 
-#if 0
-     /*
-      * Check the printer state and report it if necessary...
-      */
-
-      check_printer_state(http, uri, resource, argv[2], version, job_id);
-#endif /* 0 */
-
      /*
-      * Wait 1-10 seconds before polling again...
+      * Wait before polling again...
       */
 
-      sleep(delay);
+      sleep((unsigned)delay);
 
-      delay ++;
-      if (delay > 10)
-        delay = 1;
+      delay = _cupsNextDelay(delay, &prev_delay);
     }
   }
 
@@ -1381,21 +2133,30 @@ main(int  argc,                         /* I - Number of command-line args */
   * Cancel the job as needed...
   */
 
-  if (job_canceled && job_id)
+  if (job_canceled > 0 && job_id > 0)
+  {
     cancel_job(http, uri, job_id, resource, argv[2], version);
 
+    if (cupsLastError() > IPP_OK_CONFLICT)
+      _cupsLangPrintFilter(stderr, "ERROR", _("Unable to cancel print job."));
+  }
+
  /*
   * Check the printer state and report it if necessary...
   */
 
-  check_printer_state(http, uri, resource, argv[2], version, job_id);
+  check_printer_state(http, uri, resource, argv[2], version);
+
+  if (cupsLastError() <= IPP_OK_CONFLICT)
+    password_tries = 0;
 
  /*
   * Collect the final page count as needed...
   */
 
-  if (have_supplies && 
-      !backendSNMPSupplies(snmp_fd, http->hostaddr, &page_count, NULL) &&
+  if (have_supplies &&
+      !backendSNMPSupplies(snmp_fd, &(http->addrlist->addr), &page_count,
+                           NULL) &&
       page_count > start_count)
     fprintf(stderr, "PAGE: total %d\n", page_count - start_count);
 
@@ -1415,7 +2176,8 @@ main(int  argc,                           /* I - Number of command-line args */
   cleanup:
 
   cupsFreeOptions(num_options, options);
-  _pwgDestroy(pwg);
+  _ppdCacheDestroy(pc);
+  ppdClose(ppd);
 
   httpClose(http);
 
@@ -1425,31 +2187,60 @@ main(int  argc,                         /* I - Number of command-line args */
   * Remove the temporary file(s) if necessary...
   */
 
-#ifdef HAVE_LIBZ
-  if (compression)
-  {
-    for (i = 0; i < num_files; i ++)
-      unlink(files[i]);
-  }
-#endif /* HAVE_LIBZ */
+  if (tmpfilename[0])
+    unlink(tmpfilename);
 
  /*
   * Return the queue status...
   */
 
-  fprintf(stderr, "ATTR: auth-info-required=%s\n", auth_info_required);
-
-  if (ipp_status == IPP_NOT_AUTHORIZED || ipp_status == IPP_FORBIDDEN)
+  if (ipp_status == IPP_NOT_AUTHORIZED || ipp_status == IPP_FORBIDDEN ||
+      ipp_status == IPP_AUTHENTICATION_CANCELED ||
+      ipp_status <= IPP_OK_CONFLICT)
+    fprintf(stderr, "ATTR: auth-info-required=%s\n", auth_info_required);
+
+  if (ipp_status == IPP_STATUS_ERROR_CUPS_ACCOUNT_INFO_NEEDED)
+    fputs("JOBSTATE: account-info-needed\n", stderr);
+  else if (ipp_status == IPP_STATUS_ERROR_CUPS_ACCOUNT_CLOSED)
+    fputs("JOBSTATE: account-closed\n", stderr);
+  else if (ipp_status == IPP_STATUS_ERROR_CUPS_ACCOUNT_LIMIT_REACHED)
+    fputs("JOBSTATE: account-limit-reached\n", stderr);
+  else if (ipp_status == IPP_STATUS_ERROR_CUPS_ACCOUNT_AUTHORIZATION_FAILED)
+    fputs("JOBSTATE: account-authorization-failed\n", stderr);
+
+  if (ipp_status == IPP_NOT_AUTHORIZED || ipp_status == IPP_FORBIDDEN ||
+      ipp_status == IPP_AUTHENTICATION_CANCELED)
     return (CUPS_BACKEND_AUTH_REQUIRED);
+  else if (ipp_status == IPP_STATUS_ERROR_CUPS_ACCOUNT_LIMIT_REACHED ||
+          ipp_status == IPP_STATUS_ERROR_CUPS_ACCOUNT_INFO_NEEDED ||
+          ipp_status == IPP_STATUS_ERROR_CUPS_ACCOUNT_CLOSED ||
+          ipp_status == IPP_STATUS_ERROR_CUPS_ACCOUNT_AUTHORIZATION_FAILED)
+    return (CUPS_BACKEND_HOLD);
   else if (ipp_status == IPP_INTERNAL_ERROR)
     return (CUPS_BACKEND_STOP);
-  else if (ipp_status > IPP_OK_CONFLICT)
+  else if (ipp_status == IPP_CONFLICT || ipp_status == IPP_STATUS_ERROR_REQUEST_ENTITY || ipp_status == IPP_STATUS_ERROR_REQUEST_VALUE)
     return (CUPS_BACKEND_FAILED);
-  else
+  else if (ipp_status == IPP_REQUEST_VALUE ||
+          ipp_status == IPP_STATUS_ERROR_ATTRIBUTES_OR_VALUES ||
+           ipp_status == IPP_DOCUMENT_FORMAT || job_canceled < 0)
   {
-    _cupsLangPrintFilter(stderr, "INFO", _("Ready to print."));
-    return (CUPS_BACKEND_OK);
+    if (ipp_status == IPP_REQUEST_VALUE)
+      _cupsLangPrintFilter(stderr, "ERROR", _("Print job too large."));
+    else if (ipp_status == IPP_DOCUMENT_FORMAT)
+      _cupsLangPrintFilter(stderr, "ERROR",
+                           _("Printer cannot print supplied content."));
+    else if (ipp_status == IPP_STATUS_ERROR_ATTRIBUTES_OR_VALUES)
+      _cupsLangPrintFilter(stderr, "ERROR",
+                           _("Printer cannot print with supplied options."));
+    else
+      _cupsLangPrintFilter(stderr, "ERROR", _("Print job canceled at printer."));
+
+    return (CUPS_BACKEND_CANCEL);
   }
+  else if (ipp_status > IPP_OK_CONFLICT && ipp_status != IPP_ERROR_JOB_CANCELED)
+    return (CUPS_BACKEND_RETRY_CURRENT);
+  else
+    return (CUPS_BACKEND_OK);
 }
 
 
@@ -1471,8 +2262,7 @@ cancel_job(http_t     *http,              /* I - HTTP connection */
   _cupsLangPrintFilter(stderr, "INFO", _("Canceling print job."));
 
   request = ippNewRequest(IPP_CANCEL_JOB);
-  request->request.op.version[0] = version / 10;
-  request->request.op.version[1] = version % 10;
+  ippSetVersion(request, version / 10, version % 10);
 
   ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, "printer-uri",
                NULL, uri);
@@ -1487,10 +2277,6 @@ cancel_job(http_t     *http,             /* I - HTTP connection */
   */
 
   ippDelete(cupsDoRequest(http, request, resource));
-
-  if (cupsLastError() > IPP_OK_CONFLICT)
-    _cupsLangPrintFilter(stderr, "ERROR", _("Unable to cancel job: %s"),
-                        cupsLastErrorString());
 }
 
 
@@ -1504,9 +2290,8 @@ 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         job_id)
-{
+    int         version)               /* I - IPP version */
+ {
   ipp_t                *request,               /* IPP request */
                *response;              /* IPP response */
   ipp_attribute_t *attr;               /* Attribute in response */
@@ -1519,8 +2304,7 @@ check_printer_state(
   */
 
   request = ippNewRequest(IPP_GET_PRINTER_ATTRIBUTES);
-  request->request.op.version[0] = version / 10;
-  request->request.op.version[1] = version % 10;
+  ippSetVersion(request, version / 10, version % 10);
 
   ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, "printer-uri",
               NULL, uri);
@@ -1533,17 +2317,23 @@ check_printer_state(
                "requested-attributes",
                (int)(sizeof(pattrs) / sizeof(pattrs[0])), NULL, pattrs);
 
+  fprintf(stderr, "DEBUG: IPP/%d.%d %s #%d\n", version / 10, version % 10, ippOpString(ippGetOperation(request)), ippGetRequestId(request));
+  debug_attributes(request);
+
   if ((response = cupsDoRequest(http, request, resource)) != NULL)
   {
-    report_printer_state(response, job_id);
+    report_printer_state(response);
 
     if ((attr = ippFindAttribute(response, "printer-state",
                                 IPP_TAG_ENUM)) != NULL)
       printer_state = (ipp_pstate_t)attr->values[0].integer;
-
-    ippDelete(response);
   }
 
+  fprintf(stderr, "DEBUG: Get-Printer-Attributes: %s (%s)\n",
+         ippErrorString(cupsLastError()), cupsLastErrorString());
+  debug_attributes(response);
+  ippDelete(response);
+
  /*
   * Return the printer-state value...
   */
@@ -1552,79 +2342,53 @@ check_printer_state(
 }
 
 
-#ifdef HAVE_LIBZ
 /*
- * 'compress_files()' - Compress print files...
+ * 'debug_attributes()' - Print out the request or response attributes as DEBUG
+ * messages...
  */
 
 static void
-compress_files(int  num_files,         /* I - Number of files */
-               char **files)           /* I - Files */
+debug_attributes(ipp_t *ipp)           /* I - Request or response message */
 {
-  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 ++)
+  ipp_tag_t    group;                  /* Current group */
+  ipp_attribute_t *attr;               /* Current attribute */
+  char         buffer[1024];           /* Value buffer */
+
+
+  for (group = IPP_TAG_ZERO, attr = ippFirstAttribute(ipp);
+       attr;
+       attr = ippNextAttribute(ipp))
   {
-    if ((fd = cupsTempFd(filename, sizeof(filename))) < 0)
-    {
-      _cupsLangPrintError("ERROR", _("Unable to create compressed print file"));
-      exit(CUPS_BACKEND_FAILED);
-    }
+    const char *name = ippGetName(attr);
 
-    if ((out = cupsFileOpenFd(fd, "w9")) == NULL)
+    if (!name)
     {
-      _cupsLangPrintError("ERROR", _("Unable to open compressed print file"));
-      exit(CUPS_BACKEND_FAILED);
+      group = IPP_TAG_ZERO;
+      continue;
     }
 
-    if ((in = cupsFileOpen(files[i], "r")) == NULL)
+    if (group != ippGetGroupTag(attr))
     {
-      _cupsLangPrintError("ERROR", _("Unable to open print file"));
-      cupsFileClose(out);
-      exit(CUPS_BACKEND_FAILED);
+      group = ippGetGroupTag(attr);
+      fprintf(stderr, "DEBUG: ---- %s ----\n", ippTagString(group));
     }
 
-    total = 0;
-    while ((bytes = cupsFileRead(in, buffer, sizeof(buffer))) > 0)
-      if (cupsFileWrite(out, buffer, bytes) < bytes)
-      {
-       _cupsLangPrintError("ERROR",
-                           _("Unable to generate compressed print file"));
-        cupsFileClose(in);
-        cupsFileClose(out);
-       exit(CUPS_BACKEND_FAILED);
-      }
-      else
-        total += bytes;
-
-    cupsFileClose(out);
-    cupsFileClose(in);
-
-    files[i] = strdup(filename);
+    if (!strcmp(name, "job-password"))
+      strlcpy(buffer, "---", sizeof(buffer));
+    else
+      ippAttributeString(attr, buffer, sizeof(buffer));
 
-    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);
+    fprintf(stderr, "DEBUG: %s %s%s %s\n", name,
+            ippGetCount(attr) > 1 ? "1setOf " : "",
+            ippTagString(ippGetValueTag(attr)), buffer);
   }
+
+  fprintf(stderr, "DEBUG: ---- %s ----\n", ippTagString(IPP_TAG_END));
 }
-#endif /* HAVE_LIBZ */
 
 
 /*
- * 'monitor_printer()' - Monitor the printer state...
+ * 'monitor_printer()' - Monitor the printer state.
  */
 
 static void *                          /* O - Thread exit code */
@@ -1636,32 +2400,45 @@ monitor_printer(
                *response;              /* IPP response */
   ipp_attribute_t *attr;               /* Attribute in response */
   int          delay,                  /* Current delay */
-               prev_delay,             /* Previous delay */
-               temp_delay;             /* Temporary delay value */
+               prev_delay;             /* Previous delay */
+  ipp_op_t     job_op;                 /* Operation to use */
+  int          job_id;                 /* Job ID */
+  const char   *job_name;              /* Job name */
+  ipp_jstate_t job_state;              /* Job state */
+  const char   *job_user;              /* Job originating user name */
+  int          password_tries = 0;     /* Password tries */
 
 
  /*
   * Make a copy of the printer connection...
   */
 
-  http = _httpCreate(monitor->hostname, monitor->port, monitor->encryption,
-                     AF_UNSPEC);
-  cupsSetPasswordCB(password_cb);
+  http = httpConnect2(monitor->hostname, monitor->port, NULL, AF_UNSPEC,
+                      monitor->encryption, 1, 0, NULL);
+  httpSetTimeout(http, 30.0, timeout_cb, NULL);
+  if (username[0])
+    cupsSetUser(username);
+
+  cupsSetPasswordCB2((cups_password_cb2_t)password_cb, &password_tries);
 
  /*
   * Loop until the job is canceled, aborted, or completed.
   */
 
-  delay      = 1;
-  prev_delay = 0;
+  delay = _cupsNextDelay(0, &prev_delay);
+
+  monitor->job_reasons = 0;
 
   while (monitor->job_state < IPP_JOB_CANCELED && !job_canceled)
   {
    /*
-    * Reconnect to the printer...
+    * Reconnect to the printer as needed...
     */
 
-    if (!httpReconnect(http))
+    if (httpGetFd(http) < 0)
+      httpReconnect(http);
+
+    if (httpGetFd(http) >= 0)
     {
      /*
       * Connected, so check on the printer state...
@@ -1670,64 +2447,210 @@ monitor_printer(
       monitor->printer_state = check_printer_state(http, monitor->uri,
                                                    monitor->resource,
                                                   monitor->user,
-                                                  monitor->version,
-                                                  monitor->job_id);
+                                                  monitor->version);
+      if (cupsLastError() <= IPP_OK_CONFLICT)
+        password_tries = 0;
 
-      if (monitor->job_id > 0)
+      if (monitor->job_id == 0 && monitor->create_job)
       {
        /*
-        * Check the status of the job itself...
+        * No job-id yet, so continue...
        */
 
-       request = ippNewRequest(IPP_GET_JOB_ATTRIBUTES);
-       request->request.op.version[0] = monitor->version / 10;
-       request->request.op.version[1] = monitor->version % 10;
+        goto monitor_sleep;
+      }
 
-       ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, "printer-uri",
-                    NULL, monitor->uri);
-       ippAddInteger(request, IPP_TAG_OPERATION, IPP_TAG_INTEGER, "job-id",
-                     monitor->job_id);
+     /*
+      * Check the status of the job itself...
+      */
 
-       if (monitor->user && monitor->user[0])
-         ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_NAME,
-                      "requesting-user-name", NULL, monitor->user);
+      job_op  = (monitor->job_id > 0 && monitor->get_job_attrs) ?
+                    IPP_GET_JOB_ATTRIBUTES : IPP_GET_JOBS;
+      request = ippNewRequest(job_op);
+      ippSetVersion(request, monitor->version / 10, monitor->version % 10);
 
-       ippAddStrings(request, IPP_TAG_OPERATION, IPP_TAG_KEYWORD,
-                     "requested-attributes",
-                     (int)(sizeof(jattrs) / sizeof(jattrs[0])), NULL, jattrs);
+      ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, "printer-uri",
+                  NULL, monitor->uri);
+      if (job_op == IPP_GET_JOB_ATTRIBUTES)
+       ippAddInteger(request, IPP_TAG_OPERATION, IPP_TAG_INTEGER, "job-id",
+                     monitor->job_id);
 
-       /*
-       * Do the request...
-       */
+      if (monitor->user && monitor->user[0])
+       ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_NAME,
+                    "requesting-user-name", NULL, monitor->user);
 
-       response = cupsDoRequest(http, request, monitor->resource);
+      ippAddStrings(request, IPP_TAG_OPERATION, IPP_TAG_KEYWORD,
+                   "requested-attributes",
+                   (int)(sizeof(jattrs) / sizeof(jattrs[0])), NULL, jattrs);
 
+     /*
+      * Do the request...
+      */
+
+      response = cupsDoRequest(http, request, monitor->resource);
+
+      fprintf(stderr, "DEBUG: (monitor) %s: %s (%s)\n", ippOpString(job_op),
+             ippErrorString(cupsLastError()), cupsLastErrorString());
+
+      if (cupsLastError() <= IPP_OK_CONFLICT)
+        password_tries = 0;
+
+      if (job_op == IPP_GET_JOB_ATTRIBUTES)
+      {
        if ((attr = ippFindAttribute(response, "job-state",
                                     IPP_TAG_ENUM)) != NULL)
          monitor->job_state = (ipp_jstate_t)attr->values[0].integer;
        else
          monitor->job_state = IPP_JOB_COMPLETED;
+      }
+      else if (response)
+      {
+        for (attr = response->attrs; attr; attr = attr->next)
+        {
+          job_id    = 0;
+          job_name  = NULL;
+          job_state = IPP_JOB_PENDING;
+          job_user  = NULL;
 
-       ippDelete(response);
+          while (attr && attr->group_tag != IPP_TAG_JOB)
+            attr = attr->next;
+
+          if (!attr)
+            break;
+
+          while (attr && attr->group_tag == IPP_TAG_JOB)
+          {
+            if (!strcmp(attr->name, "job-id") &&
+                attr->value_tag == IPP_TAG_INTEGER)
+              job_id = attr->values[0].integer;
+            else if (!strcmp(attr->name, "job-name") &&
+                    (attr->value_tag == IPP_TAG_NAME ||
+                     attr->value_tag == IPP_TAG_NAMELANG))
+              job_name = attr->values[0].string.text;
+            else if (!strcmp(attr->name, "job-state") &&
+                    attr->value_tag == IPP_TAG_ENUM)
+              job_state = (ipp_jstate_t)attr->values[0].integer;
+            else if (!strcmp(attr->name, "job-originating-user-name") &&
+                    (attr->value_tag == IPP_TAG_NAME ||
+                     attr->value_tag == IPP_TAG_NAMELANG))
+              job_user = attr->values[0].string.text;
+
+            attr = attr->next;
+          }
+
+          if (job_id > 0 && job_name && !strcmp(job_name, monitor->job_name) &&
+              job_user && monitor->user && !strcmp(job_user, monitor->user))
+          {
+            monitor->job_id    = job_id;
+            monitor->job_state = job_state;
+            break;
+          }
+
+          if (!attr)
+            break;
+        }
       }
 
-     /*
-      * Disconnect from the printer - we'll reconnect on the next poll...
-      */
+      fprintf(stderr, "DEBUG: (monitor) job-state = %s\n",
+              ippEnumString("job-state", monitor->job_state));
 
-      _httpDisconnect(http);
+      if (!job_canceled &&
+          (monitor->job_state == IPP_JOB_CANCELED ||
+          monitor->job_state == IPP_JOB_ABORTED))
+      {
+       job_canceled = -1;
+       fprintf(stderr, "DEBUG: (monitor) job_canceled = -1\n");
+      }
+
+      if ((attr = ippFindAttribute(response, "job-state-reasons",
+                                   IPP_TAG_KEYWORD)) != NULL)
+      {
+        int    i, new_reasons = 0;     /* Looping var, new reasons */
+
+        for (i = 0; i < attr->num_values; i ++)
+        {
+          if (!strcmp(attr->values[i].string.text,
+                      "account-authorization-failed"))
+            new_reasons |= _CUPS_JSR_ACCOUNT_AUTHORIZATION_FAILED;
+          else if (!strcmp(attr->values[i].string.text, "account-closed"))
+            new_reasons |= _CUPS_JSR_ACCOUNT_CLOSED;
+          else if (!strcmp(attr->values[i].string.text, "account-info-needed"))
+            new_reasons |= _CUPS_JSR_ACCOUNT_INFO_NEEDED;
+          else if (!strcmp(attr->values[i].string.text,
+                           "account-limit-reached"))
+            new_reasons |= _CUPS_JSR_ACCOUNT_LIMIT_REACHED;
+          else if (!strcmp(attr->values[i].string.text, "job-password-wait"))
+            new_reasons |= _CUPS_JSR_JOB_PASSWORD_WAIT;
+          else if (!strcmp(attr->values[i].string.text, "job-release-wait"))
+            new_reasons |= _CUPS_JSR_JOB_RELEASE_WAIT;
+         if (!job_canceled &&
+             (!strncmp(attr->values[i].string.text, "job-canceled-", 13) || !strcmp(attr->values[i].string.text, "aborted-by-system")))
+            job_canceled = 1;
+        }
+
+        if (new_reasons != monitor->job_reasons)
+        {
+         if (new_reasons & _CUPS_JSR_ACCOUNT_AUTHORIZATION_FAILED)
+           fputs("JOBSTATE: account-authorization-failed\n", stderr);
+         else if (new_reasons & _CUPS_JSR_ACCOUNT_CLOSED)
+           fputs("JOBSTATE: account-closed\n", stderr);
+         else if (new_reasons & _CUPS_JSR_ACCOUNT_INFO_NEEDED)
+           fputs("JOBSTATE: account-info-needed\n", stderr);
+         else if (new_reasons & _CUPS_JSR_ACCOUNT_LIMIT_REACHED)
+           fputs("JOBSTATE: account-limit-reached\n", stderr);
+         else if (new_reasons & _CUPS_JSR_JOB_PASSWORD_WAIT)
+           fputs("JOBSTATE: job-password-wait\n", stderr);
+         else if (new_reasons & _CUPS_JSR_JOB_RELEASE_WAIT)
+           fputs("JOBSTATE: job-release-wait\n", stderr);
+         else
+           fputs("JOBSTATE: job-printing\n", stderr);
+
+         monitor->job_reasons = new_reasons;
+        }
+      }
+
+      ippDelete(response);
+
+      fprintf(stderr, "DEBUG: (monitor) job-state = %s\n",
+              ippEnumString("job-state", monitor->job_state));
+
+      if (!job_canceled &&
+          (monitor->job_state == IPP_JOB_CANCELED ||
+          monitor->job_state == IPP_JOB_ABORTED))
+       job_canceled = -1;
     }
 
    /*
-    * Sleep for N seconds, and then update the next sleep time using a
-    * Fibonacci series (1 1 2 3 5 8)...
+    * Sleep for N seconds...
     */
 
-    sleep(delay);
+    monitor_sleep:
+
+    sleep((unsigned)delay);
 
-    temp_delay = delay;
-    delay      = (delay + prev_delay) % 12;
-    prev_delay = delay < temp_delay ? 0 : temp_delay;
+    delay = _cupsNextDelay(delay, &prev_delay);
+  }
+
+ /*
+  * Cancel the job if necessary...
+  */
+
+  if (job_canceled > 0 && monitor->job_id > 0)
+  {
+    if (httpGetFd(http) < 0)
+      httpReconnect(http);
+
+    if (httpGetFd(http) >= 0)
+    {
+      cancel_job(http, monitor->uri, monitor->job_id, monitor->resource,
+                 monitor->user, monitor->version);
+
+      if (cupsLastError() > IPP_OK_CONFLICT)
+      {
+       fprintf(stderr, "DEBUG: (monitor) cancel_job() = %s\n", cupsLastErrorString());
+       _cupsLangPrintFilter(stderr, "ERROR", _("Unable to cancel print job."));
+      }
+    }
   }
 
  /*
@@ -1754,28 +2677,25 @@ new_request(
     int             num_options,       /* I - Number of options to send */
     cups_option_t   *options,          /* I - Options to send */
     const char      *compression,      /* I - compression value or NULL */
-    int             copies,            /* I - copies value or 0 */ 
-    const char      *format,           /* I - documet-format value or NULL */
-    _pwg_t          *pwg,              /* I - PWG<->PPD mapping data */
-    ipp_attribute_t *media_col_sup)    /* I - media-col-supported values */
+    int             copies,            /* I - copies value or 0 */
+    const char      *format,           /* I - document-format value or NULL */
+    _ppd_cache_t    *pc,               /* I - PPD cache and mapping data */
+    ppd_file_t      *ppd,              /* I - PPD file data */
+    ipp_attribute_t *media_col_sup,    /* I - media-col-supported values */
+    ipp_attribute_t *doc_handling_sup,  /* I - multiple-document-handling-supported values */
+    ipp_attribute_t *print_color_mode_sup)
+                                       /* I - Printer supports print-color-mode */
 {
-  int          i;                      /* Looping var */
   ipp_t                *request;               /* Request data */
   const char   *keyword;               /* PWG keyword */
-  _pwg_size_t  *size;                  /* PWG media 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 */
 
 
  /*
   * Create the IPP request...
   */
 
-  request                        = ippNewRequest(op);
-  request->request.op.version[0] = version / 10;
-  request->request.op.version[1] = version % 10;
+  request = ippNewRequest(op);
+  ippSetVersion(request, version / 10, version % 10);
 
   fprintf(stderr, "DEBUG: %s IPP/%d.%d\n",
          ippOpString(request->request.op.operation_id),
@@ -1786,36 +2706,31 @@ new_request(
   * Add standard attributes...
   */
 
-  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, "printer-uri",
-              NULL, uri);
+  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, "printer-uri", NULL, uri);
   fprintf(stderr, "DEBUG: printer-uri=\"%s\"\n", uri);
 
   if (user && *user)
   {
-    ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_NAME,
-                "requesting-user-name", NULL, user);
+    ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_NAME, "requesting-user-name", NULL, user);
     fprintf(stderr, "DEBUG: requesting-user-name=\"%s\"\n", user);
   }
 
   if (title && *title)
   {
-    ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_NAME, "job-name", NULL,
-                title);
+    ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_NAME, "job-name", NULL, title);
     fprintf(stderr, "DEBUG: job-name=\"%s\"\n", title);
   }
 
-  if (format)
+  if (format && op != IPP_CREATE_JOB)
   {
-    ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_MIMETYPE,
-                "document-format", NULL, format);
+    ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_MIMETYPE, "document-format", NULL, format);
     fprintf(stderr, "DEBUG: document-format=\"%s\"\n", format);
   }
 
 #ifdef HAVE_LIBZ
-  if (compression)
+  if (compression && op != IPP_OP_CREATE_JOB && op != IPP_OP_VALIDATE_JOB)
   {
-    ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_KEYWORD,
-                "compression", NULL, compression);
+    ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_KEYWORD, "compression", NULL, compression);
     fprintf(stderr, "DEBUG: compression=\"%s\"\n", compression);
   }
 #endif /* HAVE_LIBZ */
@@ -1826,125 +2741,59 @@ new_request(
 
   if (num_options > 0)
   {
-    if (pwg)
+    if (pc)
     {
      /*
       * Send standard IPP attributes...
       */
 
-      if ((keyword = cupsGetOption("PageSize", num_options, options)) == NULL)
-       keyword = cupsGetOption("media", num_options, options);
+      fputs("DEBUG: Adding standard IPP operation/job attributes.\n", stderr);
 
-      if ((size = _pwgGetSize(pwg, keyword)) != NULL)
-      {
-       /*
-        * Add a media-col value...
-       */
+      copies = _cupsConvertOptions(request, ppd, pc, media_col_sup, doc_handling_sup, print_color_mode_sup, user, format, copies, num_options, options);
 
-       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);
+     /*
+      * Map FaxOut options...
+      */
+
+      if ((keyword = cupsGetOption("phone", num_options, options)) != NULL)
+      {
+       ipp_t   *destination;           /* destination collection */
+       char    phone[1024],            /* Phone number string */
+               *ptr,                   /* Pointer into string */
+               tel_uri[1024];          /* tel: URI */
+        static const char * const allowed = "0123456789#*-+.()";
+                                       /* Allowed characters */
 
-       media_col = ippNew();
-       ippAddCollection(media_col, IPP_TAG_ZERO, "media-size", media_size);
+        destination = ippNew();
 
-       media_source = _pwgGetSource(pwg, cupsGetOption("InputSlot",
-                                                       num_options,
-                                                       options));
-       media_type   = _pwgGetType(pwg, cupsGetOption("MediaType",
-                                                     num_options, options));
+       /*
+        * Unescape and filter out spaces and other characters that are not
+        * allowed in a tel: URI.
+        */
 
-       for (i = 0; i < media_col_sup->num_values; i ++)
+        _httpDecodeURI(phone, keyword, sizeof(phone));
+        for (ptr = phone; *ptr;)
        {
-         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);
-       }
+         if (!strchr(allowed, *ptr))
+           _cups_strcpy(ptr, ptr + 1);
+         else
+           ptr ++;
+        }
 
-       ippAddCollection(request, IPP_TAG_JOB, "media-col", media_col);
-      }
+        httpAssembleURI(HTTP_URI_CODING_ALL, tel_uri, sizeof(tel_uri), "tel", NULL, NULL, 0, phone);
+        ippAddString(destination, IPP_TAG_JOB, IPP_TAG_URI, "destination-uri", NULL, tel_uri);
 
-      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);
-      else if ((keyword = cupsGetOption("ColorModel", num_options,
-                                       options)) != NULL)
-      {
-       if (!strcasecmp(keyword, "Gray"))
-         ippAddString(request, IPP_TAG_JOB, IPP_TAG_KEYWORD, "output-mode",
-                              NULL, "monochrome");
-       else
-         ippAddString(request, IPP_TAG_JOB, IPP_TAG_KEYWORD, "output-mode",
-                          NULL, "color");
-      }
+       if ((keyword = cupsGetOption("faxPrefix", num_options,
+                                    options)) != NULL && *keyword)
+        {
+         char  predial[1024];          /* Pre-dial string */
 
-      if ((keyword = cupsGetOption("print-quality", num_options,
-                                  options)) != NULL)
-       ippAddInteger(request, IPP_TAG_JOB, IPP_TAG_ENUM, "print-quality",
-                     atoi(keyword));
-      else if ((keyword = cupsGetOption("cupsPrintQuality", num_options,
-                                       options)) != NULL)
-      {
-       if (!strcasecmp(keyword, "draft"))
-         ippAddInteger(request, IPP_TAG_JOB, IPP_TAG_ENUM, "print-quality",
-                       IPP_QUALITY_DRAFT);
-       else if (!strcasecmp(keyword, "normal"))
-         ippAddInteger(request, IPP_TAG_JOB, IPP_TAG_ENUM, "print-quality",
-                       IPP_QUALITY_NORMAL);
-       else if (!strcasecmp(keyword, "high"))
-         ippAddInteger(request, IPP_TAG_JOB, IPP_TAG_ENUM, "print-quality",
-                       IPP_QUALITY_HIGH);
-      }
+         _httpDecodeURI(predial, keyword, sizeof(predial));
+         ippAddString(destination, IPP_TAG_JOB, IPP_TAG_TEXT, "pre-dial-string", NULL, predial);
+       }
 
-      if ((keyword = cupsGetOption("sides", num_options, options)) != NULL)
-       ippAddString(request, IPP_TAG_JOB, IPP_TAG_KEYWORD, "sides",
-                    NULL, keyword);
-      else if (pwg->sides_option &&
-               (keyword = cupsGetOption(pwg->sides_option, num_options,
-                                       options)) != NULL)
-      {
-       if (!strcasecmp(keyword, pwg->sides_1sided))
-         ippAddString(request, IPP_TAG_JOB, IPP_TAG_KEYWORD, "sides",
-                      NULL, "one-sided");
-       else if (!strcasecmp(keyword, pwg->sides_2sided_long))
-         ippAddString(request, IPP_TAG_JOB, IPP_TAG_KEYWORD, "sides",
-                      NULL, "two-sided-long-edge");
-       if (!strcasecmp(keyword, pwg->sides_2sided_short))
-         ippAddString(request, IPP_TAG_JOB, IPP_TAG_KEYWORD, "sides",
-                      NULL, "two-sided-short-edge");
+        ippAddCollection(request, IPP_TAG_JOB, "destination-uris", destination);
+        ippDelete(destination);
       }
     }
     else
@@ -1953,13 +2802,18 @@ new_request(
       * When talking to another CUPS server, send all options...
       */
 
-      cupsEncodeOptions(request, num_options, options);
+      fputs("DEBUG: Adding all operation/job attributes.\n", stderr);
+      cupsEncodeOptions2(request, num_options, options, IPP_TAG_OPERATION);
+      cupsEncodeOptions2(request, num_options, options, IPP_TAG_JOB);
     }
 
-    if (copies > 1)
+    if (copies > 1 && (!pc || copies <= pc->max_copies))
       ippAddInteger(request, IPP_TAG_JOB, IPP_TAG_INTEGER, "copies", copies);
   }
 
+  fprintf(stderr, "DEBUG: IPP/%d.%d %s #%d\n", version / 10, version % 10, ippOpString(ippGetOperation(request)), ippGetRequestId(request));
+  debug_attributes(request);
+
   return (request);
 }
 
@@ -1969,19 +2823,48 @@ new_request(
  */
 
 static const char *                    /* O - Password  */
-password_cb(const char *prompt)                /* I - Prompt (not used) */
+password_cb(const char *prompt,                /* I - Prompt (not used) */
+            http_t     *http,          /* I - Connection */
+            const char *method,                /* I - Request method (not used) */
+            const char *resource,      /* I - Resource path (not used) */
+            int        *password_tries)        /* I - Password tries */
 {
+  char def_username[HTTP_MAX_VALUE];   /* Default username */
+
+
+  fprintf(stderr, "DEBUG: password_cb(prompt=\"%s\", http=%p, method=\"%s\", "
+                  "resource=\"%s\", password_tries=%p(%d)), password=%p\n",
+          prompt, http, method, resource, password_tries, *password_tries,
+          password);
+
   (void)prompt;
+  (void)method;
+  (void)resource;
 
- /*
-  * Remember that we need to authenticate...
-  */
+  if (!uri_credentials)
+  {
+   /*
+    * Remember that we need to authenticate...
+    */
+
+    auth_info_required = "username,password";
 
-  auth_info_required = "username,password";
+    if (httpGetSubField(http, HTTP_FIELD_WWW_AUTHENTICATE, "username",
+                       def_username))
+    {
+      char     quoted[HTTP_MAX_VALUE * 2 + 4];
+                                         /* Quoted string */
+
+      fprintf(stderr, "ATTR: auth-info-default=%s,\n",
+             quote_string(def_username, quoted, sizeof(quoted)));
+    }
+  }
 
-  if (password && *password && password_tries < 3)
+  if (password && *password && *password_tries < 3)
   {
-    password_tries ++;
+    (*password_tries) ++;
+
+    cupsSetUser(username);
 
     return (password);
   }
@@ -1996,6 +2879,56 @@ password_cb(const char *prompt)          /* I - Prompt (not used) */
 }
 
 
+/*
+ * 'quote_string()' - Quote a string value.
+ */
+
+static const char *                    /* O - Quoted string */
+quote_string(const char *s,            /* I - String */
+             char       *q,            /* I - Quoted string buffer */
+             size_t     qsize)         /* I - Size of quoted string buffer */
+{
+  char *qptr,                          /* Pointer into string buffer */
+       *qend;                          /* End of string buffer */
+
+
+  qptr = q;
+  qend = q + qsize - 5;
+
+  if (qend < q)
+  {
+    *q = '\0';
+    return (q);
+  }
+
+  *qptr++ = '\'';
+  *qptr++ = '\"';
+
+  while (*s && qptr < qend)
+  {
+    if (*s == '\\' || *s == '\"' || *s == '\'')
+    {
+      if (qptr < (qend - 4))
+      {
+       *qptr++ = '\\';
+       *qptr++ = '\\';
+       *qptr++ = '\\';
+      }
+      else
+        break;
+    }
+
+    *qptr++ = *s++;
+  }
+
+  *qptr++ = '\"';
+  *qptr++ = '\'';
+  *qptr   = '\0';
+
+  return (q);
+}
+
+
 /*
  * 'report_attr()' - Report an IPP attribute value.
  */
@@ -2003,10 +2936,10 @@ password_cb(const char *prompt)         /* I - Prompt (not used) */
 static void
 report_attr(ipp_attribute_t *attr)     /* I - Attribute */
 {
-  int  i;                              /* Looping var */
-  char value[1024],                    /* Value string */
-       *valptr,                        /* Pointer into value string */
-       *attrptr;                       /* Pointer into attribute value */
+  int          i;                      /* Looping var */
+  char         value[1024],            /* Value string */
+               *valptr;                /* Pointer into value string */
+  const char   *cached;                /* Cached attribute */
 
 
  /*
@@ -2024,25 +2957,15 @@ report_attr(ipp_attribute_t *attr)      /* I - Attribute */
     {
       case IPP_TAG_INTEGER :
       case IPP_TAG_ENUM :
-          snprintf(valptr, sizeof(value) - (valptr - value), "%d",
-                  attr->values[i].integer);
+          snprintf(valptr, sizeof(value) - (size_t)(valptr - value), "%d", attr->values[i].integer);
          valptr += strlen(valptr);
          break;
 
       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++ = '\\';
-
-           *valptr++ = *attrptr;
-         }
-          *valptr++ = '\"';
+          quote_string(attr->values[i].string.text, valptr, (size_t)(value + sizeof(value) - valptr));
+          valptr += strlen(valptr);
           break;
 
       default :
@@ -2056,11 +2979,21 @@ report_attr(ipp_attribute_t *attr)      /* I - Attribute */
 
   *valptr = '\0';
 
- /*
-  * Tell the scheduler about the new values...
-  */
+  _cupsMutexLock(&report_mutex);
+
+  if ((cached = cupsGetOption(attr->name, num_attr_cache,
+                              attr_cache)) == NULL || strcmp(cached, value))
+  {
+   /*
+    * Tell the scheduler about the new values...
+    */
+
+    num_attr_cache = cupsAddOption(attr->name, value, num_attr_cache,
+                                   &attr_cache);
+    fprintf(stderr, "ATTR: %s=%s\n", attr->name, value);
+  }
 
-  fprintf(stderr, "ATTR: %s=%s\n", attr->name, value);
+  _cupsMutexUnlock(&report_mutex);
 }
 
 
@@ -2068,21 +3001,19 @@ report_attr(ipp_attribute_t *attr)      /* I - Attribute */
  * 'report_printer_state()' - Report the printer state.
  */
 
-static int                             /* O - Number of reasons shown */
-report_printer_state(ipp_t *ipp,       /* I - IPP response */
-                     int   job_id)     /* I - Current job ID */
+static void
+report_printer_state(ipp_t *ipp)       /* I - IPP response */
 {
-  int                  i;              /* Looping var */
-  int                  count;          /* Count of reasons shown... */
   ipp_attribute_t      *pa,            /* printer-alert */
                        *pam,           /* printer-alert-message */
+                       *pmja,          /* printer-mandatory-job-attributes */
                        *psm,           /* printer-state-message */
                        *reasons,       /* printer-state-reasons */
                        *marker;        /* marker-* attributes */
-  const char           *reason;        /* Current reason */
-  const char           *prefix;        /* Prefix for STATE: line */
   char                 value[1024],    /* State/message string */
                        *valptr;        /* Pointer into string */
+  static int           ipp_supplies = -1;
+                                       /* Report supply levels? */
 
 
  /*
@@ -2096,6 +3027,26 @@ report_printer_state(ipp_t *ipp, /* I - IPP response */
                               IPP_TAG_TEXT)) != NULL)
     report_attr(pam);
 
+  if ((pmja = ippFindAttribute(ipp, "printer-mandatory-job-attributes", IPP_TAG_KEYWORD)) != NULL)
+  {
+    int        i,                              /* Looping var */
+       count = ippGetCount(pmja);      /* Number of values */
+
+    for (i = 0, valptr = value; i < count; i ++, valptr += strlen(valptr))
+    {
+      if (i)
+        snprintf(valptr, sizeof(value) - (size_t)(valptr - value), " %s", ippGetString(pmja, i, NULL));
+      else
+        strlcpy(value, ippGetString(pmja, i, NULL), sizeof(value));
+    }
+
+    if (strcmp(value, mandatory_attrs))
+    {
+      strlcpy(mandatory_attrs, value, sizeof(mandatory_attrs));
+      fprintf(stderr, "PPD: cupsMandatory=\"%s\"\n", value);
+    }
+  }
+
   if ((psm = ippFindAttribute(ipp, "printer-state-message",
                               IPP_TAG_TEXT)) != NULL)
   {
@@ -2134,58 +3085,243 @@ report_printer_state(ipp_t *ipp,       /* I - IPP response */
 
   if ((reasons = ippFindAttribute(ipp, "printer-state-reasons",
                                   IPP_TAG_KEYWORD)) == NULL)
-    return (0);
+    return;
+
+  update_reasons(reasons, NULL);
 
-  value[0] = '\0';
-  prefix   = "STATE: ";
+ /*
+  * Relay the current marker-* attribute values...
+  */
 
-  for (i = 0, count = 0, valptr = value; i < reasons->num_values; i ++)
+  if (ipp_supplies < 0)
   {
-    reason = reasons->values[i].string.text;
+    ppd_file_t *ppd;                   /* PPD file */
+    ppd_attr_t *ppdattr;               /* Attribute in PPD file */
 
-    if (strcmp(reason, "paused") &&
-       strcmp(reason, "com.apple.print.recoverable-warning"))
-    {
-      strlcpy(valptr, prefix, sizeof(value) - (valptr - value) - 1);
-      valptr += strlen(valptr);
-      strlcpy(valptr, reason, sizeof(value) - (valptr - value) - 1);
-      valptr += strlen(valptr);
+    if ((ppd = ppdOpenFile(getenv("PPD"))) != NULL &&
+        (ppdattr = ppdFindAttr(ppd, "cupsIPPSupplies", NULL)) != NULL &&
+        ppdattr->value && _cups_strcasecmp(ppdattr->value, "true"))
+      ipp_supplies = 0;
+    else
+      ipp_supplies = 1;
 
-      prefix  = ",";
-    }
+    ppdClose(ppd);
   }
 
-  if (value[0])
+  if (ipp_supplies > 0)
   {
-    *valptr++ = '\n';
-    *valptr   = '\0';
-    fputs(value, stderr);
+    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);
+  }
+}
+
+
+#if defined(HAVE_GSSAPI) && defined(HAVE_XPC)
+/*
+ * 'run_as_user()' - Run the IPP backend as the printing user.
+ *
+ * This function uses an XPC-based user agent to run the backend as the printing
+ * user. We need to do this in order to have access to the user's Kerberos
+ * credentials.
+ */
+
+static int                             /* O - Exit status */
+run_as_user(char       *argv[],                /* I - Command-line arguments */
+           uid_t      uid,             /* I - User ID */
+           const char *device_uri,     /* I - Device URI */
+           int        fd)              /* I - File to print */
+{
+  const char           *auth_negotiate;/* AUTH_NEGOTIATE env var */
+  xpc_connection_t     conn;           /* Connection to XPC service */
+  xpc_object_t         request;        /* Request message dictionary */
+  __block xpc_object_t response;       /* Response message dictionary */
+  dispatch_semaphore_t sem;            /* Semaphore for waiting for response */
+  int                  status = CUPS_BACKEND_FAILED;
+                                       /* Status of request */
+
+
+  fprintf(stderr, "DEBUG: Running IPP backend as UID %d.\n", (int)uid);
+
+ /*
+  * Connect to the user agent for the specified UID...
+  */
+
+  conn = xpc_connection_create_mach_service(kPMPrintUIToolAgent,
+                                            dispatch_get_global_queue(0, 0), 0);
+  if (!conn)
+  {
+    _cupsLangPrintFilter(stderr, "ERROR",
+                         _("Unable to start backend process."));
+    fputs("DEBUG: Unable to create connection to agent.\n", stderr);
+    goto cleanup;
   }
 
+  xpc_connection_set_event_handler(conn,
+                                   ^(xpc_object_t event)
+                                  {
+                                    xpc_type_t messageType = xpc_get_type(event);
+
+                                    if (messageType == XPC_TYPE_ERROR)
+                                    {
+                                      if (event == XPC_ERROR_CONNECTION_INTERRUPTED)
+                                        fprintf(stderr, "DEBUG: Interrupted connection to service %s.\n",
+                                                xpc_connection_get_name(conn));
+                                      else if (event == XPC_ERROR_CONNECTION_INVALID)
+                                        fprintf(stderr, "DEBUG: Connection invalid for service %s.\n",
+                                                xpc_connection_get_name(conn));
+                                      else
+                                        fprintf(stderr, "DEBUG: Unxpected error for service %s: %s\n",
+                                                xpc_connection_get_name(conn),
+                                                xpc_dictionary_get_string(event, XPC_ERROR_KEY_DESCRIPTION));
+                                    }
+                                  });
+  xpc_connection_set_target_uid(conn, uid);
+  xpc_connection_resume(conn);
+
  /*
-  * Relay the current marker-* attribute values...
+  * Try starting the backend...
+  */
+
+  request = xpc_dictionary_create(NULL, NULL, 0);
+  xpc_dictionary_set_int64(request, "command", kPMStartJob);
+  xpc_dictionary_set_string(request, "device-uri", device_uri);
+  xpc_dictionary_set_string(request, "job-id", argv[1]);
+  xpc_dictionary_set_string(request, "user", argv[2]);
+  xpc_dictionary_set_string(request, "title", argv[3]);
+  xpc_dictionary_set_string(request, "copies", argv[4]);
+  xpc_dictionary_set_string(request, "options", argv[5]);
+  xpc_dictionary_set_string(request, "auth-info-required",
+                            getenv("AUTH_INFO_REQUIRED"));
+  if ((auth_negotiate = getenv("AUTH_NEGOTIATE")) != NULL)
+    xpc_dictionary_set_string(request, "auth-negotiate", auth_negotiate);
+  xpc_dictionary_set_fd(request, "stdin", fd);
+  xpc_dictionary_set_fd(request, "stderr", 2);
+  xpc_dictionary_set_fd(request, "side-channel", CUPS_SC_FD);
+
+  sem      = dispatch_semaphore_create(0);
+  response = NULL;
+
+  xpc_connection_send_message_with_reply(conn, request,
+                                         dispatch_get_global_queue(0,0),
+                                        ^(xpc_object_t reply)
+                                        {
+                                          /* Save the response and wake up */
+                                          if (xpc_get_type(reply)
+                                                  == XPC_TYPE_DICTIONARY)
+                                            response = xpc_retain(reply);
+
+                                          dispatch_semaphore_signal(sem);
+                                        });
+
+  dispatch_semaphore_wait(sem, DISPATCH_TIME_FOREVER);
+  xpc_release(request);
+  dispatch_release(sem);
+
+  if (response)
+  {
+    child_pid = (pid_t)xpc_dictionary_get_int64(response, "child-pid");
+
+    xpc_release(response);
+
+    if (child_pid)
+      fprintf(stderr, "DEBUG: Child PID=%d.\n", (int)child_pid);
+    else
+    {
+      _cupsLangPrintFilter(stderr, "ERROR",
+                           _("Unable to start backend process."));
+      fputs("DEBUG: No child PID.\n", stderr);
+      goto cleanup;
+    }
+  }
+  else
+  {
+    _cupsLangPrintFilter(stderr, "ERROR",
+                         _("Unable to start backend process."));
+    fputs("DEBUG: No reply from agent.\n", stderr);
+    goto cleanup;
+  }
+
+ /*
+  * Then wait for the backend to finish...
   */
 
-  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);
+  request = xpc_dictionary_create(NULL, NULL, 0);
+  xpc_dictionary_set_int64(request, "command", kPMWaitForJob);
+  xpc_dictionary_set_fd(request, "stderr", 2);
+
+  sem      = dispatch_semaphore_create(0);
+  response = NULL;
+
+  xpc_connection_send_message_with_reply(conn, request,
+                                         dispatch_get_global_queue(0,0),
+                                        ^(xpc_object_t reply)
+                                        {
+                                          /* Save the response and wake up */
+                                          if (xpc_get_type(reply)
+                                                  == XPC_TYPE_DICTIONARY)
+                                            response = xpc_retain(reply);
+
+                                          dispatch_semaphore_signal(sem);
+                                        });
+
+  dispatch_semaphore_wait(sem, DISPATCH_TIME_FOREVER);
+  xpc_release(request);
+  dispatch_release(sem);
+
+  if (response)
+  {
+    status = (int)xpc_dictionary_get_int64(response, "status");
+
+    if (status == SIGTERM || status == SIGKILL || status == SIGPIPE)
+    {
+      fprintf(stderr, "DEBUG: Child terminated on signal %d.\n", status);
+      status = CUPS_BACKEND_FAILED;
+    }
+    else if (WIFSIGNALED(status))
+    {
+      fprintf(stderr, "DEBUG: Child crashed on signal %d.\n", status);
+      status = CUPS_BACKEND_STOP;
+    }
+    else if (WIFEXITED(status))
+    {
+      status = WEXITSTATUS(status);
+      fprintf(stderr, "DEBUG: Child exited with status %d.\n", status);
+    }
+
+    xpc_release(response);
+  }
+  else
+    _cupsLangPrintFilter(stderr, "ERROR",
+                         _("Unable to get backend exit status."));
+
+  cleanup:
+
+  if (conn)
+  {
+    xpc_connection_cancel(conn);
+    xpc_release(conn);
+  }
+
+  return (status);
 }
+#endif /* HAVE_GSSAPI && HAVE_XPC */
 
 
 /*
@@ -2197,20 +3333,243 @@ sigterm_handler(int sig)               /* I - Signal */
 {
   (void)sig;   /* remove compiler warnings... */
 
+  write(2, "DEBUG: Got SIGTERM.\n", 20);
+
+#if defined(HAVE_GSSAPI) && defined(HAVE_XPC)
+  if (child_pid)
+  {
+    kill(child_pid, sig);
+    child_pid = 0;
+  }
+#endif /* HAVE_GSSAPI && HAVE_XPC */
+
   if (!job_canceled)
   {
    /*
-    * Flag that the job should be cancelled...
+    * Flag that the job should be canceled...
     */
 
+    write(2, "DEBUG: sigterm_handler: job_canceled = 1.\n", 25);
+
     job_canceled = 1;
     return;
   }
 
-  exit(1);
+ /*
+  * The scheduler already tried to cancel us once, now just terminate
+  * after removing our temp file!
+  */
+
+  if (tmpfilename[0])
+    unlink(tmpfilename);
+
+  _exit(1);
 }
 
 
 /*
- * End of "$Id: ipp.c 7948 2008-09-17 00:04:12Z mike $".
+ * 'timeout_cb()' - Handle HTTP timeouts.
  */
+
+static int                             /* O - 1 to continue, 0 to cancel */
+timeout_cb(http_t *http,               /* I - Connection to server (unused) */
+           void   *user_data)          /* I - User data (unused) */
+{
+  (void)http;
+  (void)user_data;
+
+  return (!job_canceled);
+}
+
+
+/*
+ * 'update_reasons()' - Update the printer-state-reasons values.
+ */
+
+static void
+update_reasons(ipp_attribute_t *attr,  /* I - printer-state-reasons or NULL */
+               const char      *s)     /* I - STATE: string or NULL */
+{
+  char         op;                     /* Add (+), remove (-), replace (\0) */
+  cups_array_t *new_reasons;           /* New reasons array */
+  char         *reason,                /* Current reason */
+               add[2048],              /* Reasons added string */
+               *addptr,                /* Pointer into add string */
+               rem[2048],              /* Reasons removed string */
+               *remptr;                /* Pointer into remove string */
+  const char   *addprefix,             /* Current add string prefix */
+               *remprefix;             /* Current remove string prefix */
+
+
+  fprintf(stderr, "DEBUG: update_reasons(attr=%d(%s%s), s=\"%s\")\n",
+         attr ? attr->num_values : 0, attr ? attr->values[0].string.text : "",
+         attr && attr->num_values > 1 ? ",..." : "", s ? s : "(null)");
+
+ /*
+  * Create an array of new reason keyword strings...
+  */
+
+  if (attr)
+  {
+    int        i;                              /* Looping var */
+
+    new_reasons = cupsArrayNew((cups_array_func_t)strcmp, NULL);
+    op          = '\0';
+
+    for (i = 0; i < attr->num_values; i ++)
+    {
+      reason = attr->values[i].string.text;
+
+      if (strcmp(reason, "none") &&
+         strcmp(reason, "none-report") &&
+         strcmp(reason, "paused") &&
+         strncmp(reason, "spool-area-full", 15) &&
+         strcmp(reason, "com.apple.print.recoverable-warning") &&
+         strncmp(reason, "cups-", 5))
+       cupsArrayAdd(new_reasons, reason);
+    }
+  }
+  else if (s)
+  {
+    if (*s == '+' || *s == '-')
+      op = *s++;
+    else
+      op = '\0';
+
+    new_reasons = _cupsArrayNewStrings(s, ',');
+  }
+  else
+    return;
+
+ /*
+  * Compute the changes...
+  */
+
+  add[0]    = '\0';
+  addprefix = "STATE: +";
+  addptr    = add;
+  rem[0]    = '\0';
+  remprefix = "STATE: -";
+  remptr    = rem;
+
+  fprintf(stderr, "DEBUG2: op='%c', new_reasons=%d, state_reasons=%d\n",
+          op ? op : ' ', cupsArrayCount(new_reasons),
+         cupsArrayCount(state_reasons));
+
+  _cupsMutexLock(&report_mutex);
+
+  if (op == '+')
+  {
+   /*
+    * Add reasons...
+    */
+
+    for (reason = (char *)cupsArrayFirst(new_reasons);
+        reason;
+        reason = (char *)cupsArrayNext(new_reasons))
+    {
+      if (!cupsArrayFind(state_reasons, reason))
+      {
+        if (!strncmp(reason, "cups-remote-", 12))
+       {
+        /*
+         * If we are setting cups-remote-xxx, remove all other cups-remote-xxx
+         * keywords...
+         */
+
+         char  *temp;          /* Current reason in state_reasons */
+
+         cupsArraySave(state_reasons);
+
+         for (temp = (char *)cupsArrayFirst(state_reasons);
+              temp;
+              temp = (char *)cupsArrayNext(state_reasons))
+           if (!strncmp(temp, "cups-remote-", 12))
+           {
+             snprintf(remptr, sizeof(rem) - (size_t)(remptr - rem), "%s%s", remprefix, temp);
+             remptr    += strlen(remptr);
+             remprefix = ",";
+
+             cupsArrayRemove(state_reasons, temp);
+             break;
+           }
+
+         cupsArrayRestore(state_reasons);
+       }
+
+        cupsArrayAdd(state_reasons, reason);
+
+        snprintf(addptr, sizeof(add) - (size_t)(addptr - add), "%s%s", addprefix, reason);
+       addptr    += strlen(addptr);
+       addprefix = ",";
+      }
+    }
+  }
+  else if (op == '-')
+  {
+   /*
+    * Remove reasons...
+    */
+
+    for (reason = (char *)cupsArrayFirst(new_reasons);
+        reason;
+        reason = (char *)cupsArrayNext(new_reasons))
+    {
+      if (cupsArrayFind(state_reasons, reason))
+      {
+       snprintf(remptr, sizeof(rem) - (size_t)(remptr - rem), "%s%s", remprefix, reason);
+       remptr    += strlen(remptr);
+       remprefix = ",";
+
+        cupsArrayRemove(state_reasons, reason);
+      }
+    }
+  }
+  else
+  {
+   /*
+    * Replace reasons...
+    */
+
+    for (reason = (char *)cupsArrayFirst(state_reasons);
+        reason;
+        reason = (char *)cupsArrayNext(state_reasons))
+    {
+      if (strncmp(reason, "cups-", 5) && !cupsArrayFind(new_reasons, reason))
+      {
+       snprintf(remptr, sizeof(rem) - (size_t)(remptr - rem), "%s%s", remprefix, reason);
+       remptr    += strlen(remptr);
+       remprefix = ",";
+
+        cupsArrayRemove(state_reasons, reason);
+      }
+    }
+
+    for (reason = (char *)cupsArrayFirst(new_reasons);
+        reason;
+        reason = (char *)cupsArrayNext(new_reasons))
+    {
+      if (!cupsArrayFind(state_reasons, reason))
+      {
+        cupsArrayAdd(state_reasons, reason);
+
+        snprintf(addptr, sizeof(add) - (size_t)(addptr - add), "%s%s", addprefix, reason);
+       addptr    += strlen(addptr);
+       addprefix = ",";
+      }
+    }
+  }
+
+  _cupsMutexUnlock(&report_mutex);
+
+ /*
+  * Report changes and return...
+  */
+
+  if (add[0] && rem[0])
+    fprintf(stderr, "%s\n%s\n", add, rem);
+  else if (add[0])
+    fprintf(stderr, "%s\n", add);
+  else if (rem[0])
+    fprintf(stderr, "%s\n", rem);
+}