+++ /dev/null
---- a/backend/Makefile
-+++ b/backend/Makefile
-@@ -21,6 +21,7 @@
- # See http://www.cups.org/documentation.php/api-filter.html for more info...
- RBACKENDS = \
- ipp \
-+ ipp14 \
- lpd \
- $(DNSSD_BACKEND)
- UBACKENDS = \
-@@ -51,6 +51,7 @@
- snmp-supplies.o
- OBJS = \
- ipp.o \
-+ ipp14.o \
- lpd.o \
- dnssd.o \
- snmp.o \
-@@ -218,6 +218,17 @@
-
-
- #
-+# ipp14
-+#
-+
-+ipp14: ipp14.o ../cups/$(LIBCUPS) libbackend.a
-+ echo Linking $@...
-+ $(CC) $(LDFLAGS) -o ipp14 ipp14.o libbackend.a $(LIBS)
-+ #$(RM) http
-+ #$(LN) ipp14 http
-+
-+
-+#
- # lpd
- #
-
---- /dev/null
-+++ b/backend/ipp14.c
-@@ -0,0 +1,1953 @@
-+/*
-+ * "$Id: ipp.c 8950 2010-01-14 22:40:19Z mike $"
-+ *
-+ * IPP backend for the Common UNIX Printing System (CUPS).
-+ *
-+ * Copyright 2007-2010 by Apple Inc.
-+ * Copyright 1997-2007 by Easy Software Products, all rights reserved.
-+ *
-+ * These coded instructions, statements, and computer programs are the
-+ * property of 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...
-+ * password_cb() - Disable the password prompt for
-+ * cupsDoFileRequest().
-+ * report_attr() - Report an IPP attribute value.
-+ * report_printer_state() - Report the printer state.
-+ * run_pictwps_filter() - Convert PICT files to PostScript when printing
-+ * remotely.
-+ * sigterm_handler() - Handle 'terminate' signals that stop the backend.
-+ */
-+
-+/*
-+ * Include necessary headers.
-+ */
-+
-+#include <cups/http-private.h>
-+#include "backend-private.h"
-+#include <sys/types.h>
-+#include <sys/stat.h>
-+#include <sys/wait.h>
-+
-+/*
-+ * Globals...
-+ */
-+
-+static char *password = NULL; /* Password for device URI */
-+static int password_tries = 0; /* Password tries */
-+static const char *auth_info_required = "none";
-+ /* New auth-info-required value */
-+#ifdef __APPLE__
-+static char pstmpname[1024] = ""; /* Temporary PostScript file name */
-+#endif /* __APPLE__ */
-+static char tmpfilename[1024] = ""; /* Temporary spool file name */
-+static int job_cancelled = 0; /* Job cancelled? */
-+
-+
-+/*
-+ * Local functions...
-+ */
-+
-+static void cancel_job(http_t *http, const char *uri, int id,
-+ const char *resource, const char *user, int version);
-+static void check_printer_state(http_t *http, const char *uri,
-+ const char *resource, const char *user,
-+ int version, int job_id);
-+#ifdef HAVE_LIBZ
-+static void compress_files(int num_files, char **files);
-+#endif /* HAVE_LIBZ */
-+static const char *password_cb(const char *);
-+static void report_attr(ipp_attribute_t *attr);
-+static int report_printer_state(ipp_t *ipp, int job_id);
-+
-+#ifdef __APPLE__
-+static int run_pictwps_filter(char **argv, const char *filename);
-+#endif /* __APPLE__ */
-+static void sigterm_handler(int sig);
-+
-+
-+/*
-+ * 'main()' - Send a file to the printer or server.
-+ *
-+ * Usage:
-+ *
-+ * printer-uri job-id user title copies options [file]
-+ */
-+
-+int /* O - Exit status */
-+main(int argc, /* I - Number of command-line args */
-+ char *argv[]) /* I - Command-line arguments */
-+{
-+ int i; /* Looping var */
-+ int send_options; /* Send job options? */
-+ int num_options; /* Number of printer options */
-+ cups_option_t *options; /* Printer options */
-+ 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 snmp_fd, /* SNMP socket */
-+ start_count, /* Page count via SNMP at start */
-+ page_count, /* Page count via SNMP */
-+ have_supplies; /* Printer supports supply levels? */
-+ int num_files; /* Number of files to print */
-+ char **files, /* Files to print */
-+ *filename; /* Pointer to single filename */
-+ int port; /* Port number (not used) */
-+ char uri[HTTP_MAX_URI]; /* Updated URI without user/pass */
-+ ipp_status_t ipp_status; /* Status of IPP request */
-+ http_t *http; /* HTTP connection */
-+ ipp_t *request, /* IPP request */
-+ *response, /* IPP response */
-+ *supported; /* get-printer-attributes response */
-+ time_t start_time; /* Time of first connect */
-+ int recoverable; /* Recoverable error shown? */
-+ int contimeout; /* Connection timeout */
-+ int delay; /* Delay for retries... */
-+ int compression, /* Do compression of the job data? */
-+ waitjob, /* Wait for job complete? */
-+ waitprinter; /* Wait for printer ready? */
-+ ipp_attribute_t *job_id_attr; /* job-id attribute */
-+ int job_id; /* job-id value */
-+ ipp_attribute_t *job_sheets; /* job-media-sheets-completed */
-+ ipp_attribute_t *job_state; /* job-state */
-+ ipp_attribute_t *copies_sup; /* copies-supported */
-+ ipp_attribute_t *format_sup; /* document-format-supported */
-+ ipp_attribute_t *printer_state; /* printer-state attribute */
-+ ipp_attribute_t *printer_accepting; /* printer-is-accepting-jobs */
-+ int copies, /* Number of copies for job */
-+ copies_remaining; /* Number of copies remaining */
-+ const char *content_type, /* CONTENT_TYPE environment variable */
-+ *final_content_type; /* FINAL_CONTENT_TYPE environment var */
-+#if defined(HAVE_SIGACTION) && !defined(HAVE_SIGSET)
-+ struct sigaction action; /* Actions for POSIX signals */
-+#endif /* HAVE_SIGACTION && !HAVE_SIGSET */
-+ int version; /* IPP version */
-+ static const char * const pattrs[] =
-+ { /* Printer attributes we want */
-+ "com.apple.print.recoverable-message",
-+ "copies-supported",
-+ "document-format-supported",
-+ "marker-colors",
-+ "marker-high-levels",
-+ "marker-levels",
-+ "marker-low-levels",
-+ "marker-message",
-+ "marker-names",
-+ "marker-types",
-+ "printer-is-accepting-jobs",
-+ "printer-state",
-+ "printer-state-message",
-+ "printer-state-reasons",
-+ };
-+ static const char * const jattrs[] =
-+ { /* Job attributes we want */
-+ "job-media-sheets-completed",
-+ "job-state"
-+ };
-+
-+
-+ /*
-+ * Make sure status messages are not buffered...
-+ */
-+
-+ setbuf(stderr, NULL);
-+
-+ /*
-+ * Ignore SIGPIPE and catch SIGTERM signals...
-+ */
-+
-+#ifdef HAVE_SIGSET
-+ sigset(SIGPIPE, SIG_IGN);
-+ sigset(SIGTERM, sigterm_handler);
-+#elif defined(HAVE_SIGACTION)
-+ memset(&action, 0, sizeof(action));
-+ action.sa_handler = SIG_IGN;
-+ sigaction(SIGPIPE, &action, NULL);
-+
-+ sigemptyset(&action.sa_mask);
-+ sigaddset(&action.sa_mask, SIGTERM);
-+ action.sa_handler = sigterm_handler;
-+ sigaction(SIGTERM, &action, NULL);
-+#else
-+ signal(SIGPIPE, SIG_IGN);
-+ signal(SIGTERM, sigterm_handler);
-+#endif /* HAVE_SIGSET */
-+
-+ /*
-+ * Check command-line...
-+ */
-+
-+ if (argc == 1)
-+ {
-+ char *s;
-+
-+ if ((s = strrchr(argv[0], '/')) != NULL)
-+ s ++;
-+ else
-+ s = argv[0];
-+
-+ printf("network %s \"Unknown\" \"%s (%s)\"\n",
-+ s, _cupsLangString(cupsLangDefault(),
-+ _("Internet Printing Protocol")), s);
-+ return (CUPS_BACKEND_OK);
-+ }
-+ else if (argc < 6)
-+ {
-+ _cupsLangPrintf(stderr,
-+ _("Usage: %s job-id user title copies options [file]\n"),
-+ argv[0]);
-+ return (CUPS_BACKEND_STOP);
-+ }
-+
-+ /*
-+ * Get the (final) content type...
-+ */
-+
-+ if ((content_type = getenv("CONTENT_TYPE")) == NULL)
-+ content_type = "application/octet-stream";
-+
-+ if ((final_content_type = getenv("FINAL_CONTENT_TYPE")) == NULL)
-+ {
-+ final_content_type = content_type;
-+
-+ if (!strncmp(final_content_type, "printer/", 8))
-+ final_content_type = "application/vnd.cups-raw";
-+ }
-+
-+ /*
-+ * Extract the hostname and printer name from the URI...
-+ */
-+
-+ if ((device_uri = cupsBackendDeviceURI(argv)) == 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));
-+
-+ if (!port)
-+ port = IPP_PORT; /* Default to port 631 */
-+
-+ if (!strcmp(scheme, "https"))
-+ cupsSetEncryption(HTTP_ENCRYPT_ALWAYS);
-+ else
-+ cupsSetEncryption(HTTP_ENCRYPT_IF_REQUESTED);
-+
-+ /*
-+ * See if there are any options...
-+ */
-+
-+ compression = 0;
-+ version = 11;
-+ waitjob = 1;
-+ waitprinter = 1;
-+ contimeout = 7 * 24 * 60 * 60;
-+
-+ if ((optptr = strchr(resource, '?')) != NULL)
-+ {
-+ /*
-+ * Yup, terminate the device name string and move to the first
-+ * character of the optptr...
-+ */
-+
-+ *optptr++ = '\0';
-+
-+ /*
-+ * Then parse the optptr...
-+ */
-+
-+ while (*optptr)
-+ {
-+ /*
-+ * Get the name...
-+ */
-+
-+ name = optptr;
-+
-+ while (*optptr && *optptr != '=' && *optptr != '+' && *optptr != '&')
-+ optptr ++;
-+
-+ if ((sep = *optptr) != '\0')
-+ *optptr++ = '\0';
-+
-+ if (sep == '=')
-+ {
-+ /*
-+ * Get the value...
-+ */
-+
-+ value = optptr;
-+
-+ while (*optptr && *optptr != '+' && *optptr != '&')
-+ optptr ++;
-+
-+ if (*optptr)
-+ *optptr++ = '\0';
-+ }
-+ else
-+ value = (char *)"";
-+
-+ /*
-+ * Process the option...
-+ */
-+
-+ if (!strcasecmp(name, "waitjob"))
-+ {
-+ /*
-+ * Wait for job completion?
-+ */
-+
-+ waitjob = !strcasecmp(value, "on") ||
-+ !strcasecmp(value, "yes") ||
-+ !strcasecmp(value, "true");
-+ }
-+ else if (!strcasecmp(name, "waitprinter"))
-+ {
-+ /*
-+ * Wait for printer idle?
-+ */
-+
-+ waitprinter = !strcasecmp(value, "on") ||
-+ !strcasecmp(value, "yes") ||
-+ !strcasecmp(value, "true");
-+ }
-+ else if (!strcasecmp(name, "encryption"))
-+ {
-+ /*
-+ * Enable/disable encryption?
-+ */
-+
-+ if (!strcasecmp(value, "always"))
-+ cupsSetEncryption(HTTP_ENCRYPT_ALWAYS);
-+ else if (!strcasecmp(value, "required"))
-+ cupsSetEncryption(HTTP_ENCRYPT_REQUIRED);
-+ else if (!strcasecmp(value, "never"))
-+ cupsSetEncryption(HTTP_ENCRYPT_NEVER);
-+ else if (!strcasecmp(value, "ifrequested"))
-+ cupsSetEncryption(HTTP_ENCRYPT_IF_REQUESTED);
-+ else
-+ {
-+ _cupsLangPrintf(stderr,
-+ _("ERROR: Unknown encryption option value \"%s\"!\n"),
-+ value);
-+ }
-+ }
-+ else if (!strcasecmp(name, "version"))
-+ {
-+ if (!strcmp(value, "1.0"))
-+ version = 10;
-+ else if (!strcmp(value, "1.1"))
-+ version = 11;
-+ else if (!strcmp(value, "2.0"))
-+ version = 20;
-+ else if (!strcmp(value, "2.1"))
-+ version = 21;
-+ else
-+ {
-+ _cupsLangPrintf(stderr,
-+ _("ERROR: Unknown version option value \"%s\"!\n"),
-+ value);
-+ }
-+ }
-+#ifdef HAVE_LIBZ
-+ else if (!strcasecmp(name, "compression"))
-+ {
-+ compression = !strcasecmp(value, "true") ||
-+ !strcasecmp(value, "yes") ||
-+ !strcasecmp(value, "on") ||
-+ !strcasecmp(value, "gzip");
-+ }
-+#endif /* HAVE_LIBZ */
-+ else if (!strcasecmp(name, "contimeout"))
-+ {
-+ /*
-+ * Set the connection timeout...
-+ */
-+
-+ if (atoi(value) > 0)
-+ contimeout = atoi(value);
-+ }
-+ else
-+ {
-+ /*
-+ * Unknown option...
-+ */
-+
-+ _cupsLangPrintf(stderr,
-+ _("ERROR: Unknown option \"%s\" with value \"%s\"!\n"),
-+ name, value);
-+ }
-+ }
-+ }
-+
-+ /*
-+ * If we have 7 arguments, print the file named on the command-line.
-+ * Otherwise, copy stdin to a temporary file and print the temporary
-+ * file.
-+ */
-+
-+ if (argc == 6)
-+ {
-+ /*
-+ * Copy stdin to a temporary file...
-+ */
-+
-+ int fd; /* File descriptor */
-+ http_addrlist_t *addrlist; /* Address list */
-+ off_t tbytes; /* Total bytes copied */
-+
-+
-+ fputs("STATE: +connecting-to-device\n", stderr);
-+ fprintf(stderr, "DEBUG: Looking up \"%s\"...\n", hostname);
-+
-+ if ((addrlist = httpAddrGetList(hostname, AF_UNSPEC, "1")) == NULL)
-+ {
-+ _cupsLangPrintf(stderr, _("ERROR: Unable to locate printer \'%s\'!\n"),
-+ hostname);
-+ return (CUPS_BACKEND_STOP);
-+ }
-+
-+ snmp_fd = _cupsSNMPOpen(addrlist->addr.addr.sa_family);
-+
-+ if ((fd = cupsTempFd(tmpfilename, sizeof(tmpfilename))) < 0)
-+ {
-+ _cupsLangPrintError("ERROR", _("Unable to create temporary file"));
-+ return (CUPS_BACKEND_FAILED);
-+ }
-+
-+ _cupsLangPuts(stderr, _("INFO: Copying print data...\n"));
-+
-+ tbytes = backendRunLoop(-1, fd, snmp_fd, &(addrlist->addr), 0, 0,
-+ backendNetworkSideCB);
-+
-+ if (snmp_fd >= 0)
-+ _cupsSNMPClose(snmp_fd);
-+
-+ httpAddrFreeList(addrlist);
-+
-+ close(fd);
-+
-+ /*
-+ * Don't try printing files less than 2 bytes...
-+ */
-+
-+ if (tbytes <= 1)
-+ {
-+ _cupsLangPuts(stderr, _("ERROR: Empty print file!\n"));
-+ unlink(tmpfilename);
-+ return (CUPS_BACKEND_FAILED);
-+ }
-+
-+ /*
-+ * Point to the single file from stdin...
-+ */
-+
-+ filename = tmpfilename;
-+ num_files = 1;
-+ files = &filename;
-+ send_options = 0;
-+ }
-+ else
-+ {
-+ /*
-+ * Point to the files on the command-line...
-+ */
-+
-+ num_files = argc - 6;
-+ files = argv + 6;
-+ send_options = 1;
-+
-+#ifdef HAVE_LIBZ
-+ if (compression)
-+ compress_files(num_files, files);
-+#endif /* HAVE_LIBZ */
-+ }
-+
-+ fprintf(stderr, "DEBUG: %d files to send in job...\n", num_files);
-+
-+ /*
-+ * Set the authentication info, if any...
-+ */
-+
-+ cupsSetPasswordCB(password_cb);
-+
-+ if (username[0])
-+ {
-+ /*
-+ * Use authenticaion information in the device URI...
-+ */
-+
-+ if ((password = strchr(username, ':')) != NULL)
-+ *password++ = '\0';
-+
-+ cupsSetUser(username);
-+ }
-+ else if (!getuid())
-+ {
-+ /*
-+ * Try loading authentication information from the environment.
-+ */
-+
-+ const char *ptr = getenv("AUTH_USERNAME");
-+
-+ if (ptr)
-+ cupsSetUser(ptr);
-+
-+ password = getenv("AUTH_PASSWORD");
-+ }
-+
-+ /*
-+ * Try connecting to the remote server...
-+ */
-+
-+ delay = 5;
-+ recoverable = 0;
-+ start_time = time(NULL);
-+
-+ fputs("STATE: +connecting-to-device\n", stderr);
-+
-+ do
-+ {
-+ fprintf(stderr, "DEBUG: Connecting to %s:%d\n", hostname, port);
-+ _cupsLangPuts(stderr, _("INFO: Connecting to printer...\n"));
-+
-+ if ((http = httpConnectEncrypt(hostname, port, cupsEncryption())) == NULL)
-+ {
-+ if (job_cancelled)
-+ break;
-+
-+ if (getenv("CLASS") != NULL)
-+ {
-+ /*
-+ * If the CLASS environment variable is set, the job was submitted
-+ * to a class and not to a specific queue. In this case, we want
-+ * to abort immediately so that the job can be requeued on the next
-+ * available printer in the class.
-+ */
-+
-+ _cupsLangPuts(stderr,
-+ _("INFO: Unable to contact printer, queuing on next "
-+ "printer in class...\n"));
-+
-+ if (tmpfilename[0])
-+ unlink(tmpfilename);
-+
-+ /*
-+ * Sleep 5 seconds to keep the job from requeuing too rapidly...
-+ */
-+
-+ sleep(5);
-+
-+ return (CUPS_BACKEND_FAILED);
-+ }
-+
-+ if (errno == ECONNREFUSED || errno == EHOSTDOWN ||
-+ errno == EHOSTUNREACH)
-+ {
-+ if (contimeout && (time(NULL) - start_time) > contimeout)
-+ {
-+ _cupsLangPuts(stderr, _("ERROR: Printer not responding!\n"));
-+ return (CUPS_BACKEND_FAILED);
-+ }
-+
-+ recoverable = 1;
-+
-+ _cupsLangPrintf(stderr,
-+ _("WARNING: recoverable: Network host \'%s\' is busy; "
-+ "will retry in %d seconds...\n"),
-+ hostname, delay);
-+
-+ sleep(delay);
-+
-+ if (delay < 30)
-+ delay += 5;
-+ }
-+ else if (h_errno)
-+ {
-+ _cupsLangPrintf(stderr, _("ERROR: Unable to locate printer \'%s\'!\n"),
-+ hostname);
-+ return (CUPS_BACKEND_STOP);
-+ }
-+ else
-+ {
-+ recoverable = 1;
-+
-+ fprintf(stderr, "DEBUG: Connection error: %s\n", strerror(errno));
-+ _cupsLangPuts(stderr,
-+ _("ERROR: recoverable: Unable to connect to printer; will "
-+ "retry in 30 seconds...\n"));
-+ sleep(30);
-+ }
-+
-+ if (job_cancelled)
-+ break;
-+ }
-+ }
-+ while (http == NULL);
-+
-+ if (job_cancelled || !http)
-+ {
-+ if (tmpfilename[0])
-+ unlink(tmpfilename);
-+
-+ return (CUPS_BACKEND_FAILED);
-+ }
-+
-+ fputs("STATE: -connecting-to-device\n", stderr);
-+ _cupsLangPuts(stderr, _("INFO: Connected to printer...\n"));
-+
-+#ifdef AF_INET6
-+ if (http->hostaddr->addr.sa_family == AF_INET6)
-+ fprintf(stderr, "DEBUG: Connected to [%s]:%d (IPv6)...\n",
-+ httpAddrString(http->hostaddr, addrname, sizeof(addrname)),
-+ ntohs(http->hostaddr->ipv6.sin6_port));
-+ else
-+#endif /* AF_INET6 */
-+ if (http->hostaddr->addr.sa_family == AF_INET)
-+ fprintf(stderr, "DEBUG: Connected to %s:%d (IPv4)...\n",
-+ httpAddrString(http->hostaddr, addrname, sizeof(addrname)),
-+ ntohs(http->hostaddr->ipv4.sin_port));
-+
-+ /*
-+ * See if the printer supports SNMP...
-+ */
-+
-+ if ((snmp_fd = _cupsSNMPOpen(http->hostaddr->addr.sa_family)) >= 0)
-+ have_supplies = !backendSNMPSupplies(snmp_fd, http->hostaddr, &start_count,
-+ NULL);
-+ else
-+ have_supplies = start_count = 0;
-+
-+ /*
-+ * Build a URI for the printer and fill the standard IPP attributes for
-+ * an IPP_PRINT_FILE request. We can't use the URI in argv[0] because it
-+ * might contain username:password information...
-+ */
-+
-+ httpAssembleURI(HTTP_URI_CODING_ALL, uri, sizeof(uri), scheme, NULL, hostname,
-+ port, resource);
-+
-+ /*
-+ * First validate the destination and see if the device supports multiple
-+ * copies. We have to do this because some IPP servers (e.g. HP JetDirect)
-+ * don't support the copies attribute...
-+ */
-+
-+ copies_sup = NULL;
-+ format_sup = NULL;
-+ supported = NULL;
-+
-+ do
-+ {
-+ /*
-+ * Check for side-channel requests...
-+ */
-+
-+ backendCheckSideChannel(snmp_fd, http->hostaddr);
-+
-+ /*
-+ * Build the IPP request...
-+ */
-+
-+ request = ippNewRequest(IPP_GET_PRINTER_ATTRIBUTES);
-+ request->request.op.version[0] = version / 10;
-+ request->request.op.version[1] = version % 10;
-+
-+ ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, "printer-uri",
-+ NULL, uri);
-+
-+ ippAddStrings(request, IPP_TAG_OPERATION, IPP_TAG_KEYWORD,
-+ "requested-attributes", sizeof(pattrs) / sizeof(pattrs[0]),
-+ NULL, pattrs);
-+
-+ /*
-+ * Do the request...
-+ */
-+
-+ fputs("DEBUG: Getting supported attributes...\n", stderr);
-+
-+ if (http->version < HTTP_1_1)
-+ httpReconnect(http);
-+
-+ if ((supported = cupsDoRequest(http, request, resource)) == NULL)
-+ ipp_status = cupsLastError();
-+ else
-+ ipp_status = supported->request.status.status_code;
-+
-+ if (ipp_status > IPP_OK_CONFLICT)
-+ {
-+ if (ipp_status == IPP_PRINTER_BUSY ||
-+ ipp_status == IPP_SERVICE_UNAVAILABLE)
-+ {
-+ if (contimeout && (time(NULL) - start_time) > contimeout)
-+ {
-+ _cupsLangPuts(stderr, _("ERROR: Printer not responding!\n"));
-+ return (CUPS_BACKEND_FAILED);
-+ }
-+
-+ recoverable = 1;
-+
-+ _cupsLangPrintf(stderr,
-+ _("WARNING: recoverable: Network host \'%s\' is busy; "
-+ "will retry in %d seconds...\n"),
-+ hostname, delay);
-+
-+ report_printer_state(supported, 0);
-+
-+ sleep(delay);
-+
-+ if (delay < 30)
-+ delay += 5;
-+ }
-+ else if ((ipp_status == IPP_BAD_REQUEST ||
-+ ipp_status == IPP_VERSION_NOT_SUPPORTED) && version > 10)
-+ {
-+ /*
-+ * Switch to IPP/1.0...
-+ */
-+
-+ _cupsLangPrintf(stderr,
-+ _("INFO: Printer does not support IPP/%d.%d, trying "
-+ "IPP/1.0...\n"), version / 10, version % 10);
-+ version = 10;
-+ httpReconnect(http);
-+ }
-+ else if (ipp_status == IPP_NOT_FOUND)
-+ {
-+ _cupsLangPuts(stderr, _("ERROR: Destination printer does not exist!\n"));
-+
-+ if (supported)
-+ ippDelete(supported);
-+
-+ return (CUPS_BACKEND_STOP);
-+ }
-+ else if (ipp_status == IPP_NOT_AUTHORIZED || ipp_status == IPP_FORBIDDEN)
-+ {
-+ if (!strncmp(httpGetField(http, HTTP_FIELD_WWW_AUTHENTICATE),
-+ "Negotiate", 9))
-+ auth_info_required = "negotiate";
-+
-+ fprintf(stderr, "ATTR: auth-info-required=%s\n", auth_info_required);
-+ return (CUPS_BACKEND_AUTH_REQUIRED);
-+ }
-+ else
-+ {
-+ _cupsLangPrintf(stderr,
-+ _("ERROR: Unable to get printer status (%s)!\n"),
-+ cupsLastErrorString());
-+ sleep(10);
-+ }
-+
-+ if (supported)
-+ ippDelete(supported);
-+
-+ continue;
-+ }
-+ else if ((copies_sup = ippFindAttribute(supported, "copies-supported",
-+ IPP_TAG_RANGE)) != NULL)
-+ {
-+ /*
-+ * Has the "copies-supported" attribute - does it have an upper
-+ * bound > 1?
-+ */
-+
-+ if (copies_sup->values[0].range.upper <= 1)
-+ copies_sup = NULL; /* No */
-+ }
-+
-+ format_sup = ippFindAttribute(supported, "document-format-supported",
-+ IPP_TAG_MIMETYPE);
-+
-+ if (format_sup)
-+ {
-+ fprintf(stderr, "DEBUG: document-format-supported (%d values)\n",
-+ format_sup->num_values);
-+ for (i = 0; i < format_sup->num_values; i ++)
-+ fprintf(stderr, "DEBUG: [%d] = \"%s\"\n", i,
-+ format_sup->values[i].string.text);
-+ }
-+
-+ report_printer_state(supported, 0);
-+ }
-+ while (ipp_status > IPP_OK_CONFLICT);
-+
-+ /*
-+ * See if the printer is accepting jobs and is not stopped; if either
-+ * condition is true and we are printing to a class, requeue the job...
-+ */
-+
-+ if (getenv("CLASS") != NULL)
-+ {
-+ printer_state = ippFindAttribute(supported, "printer-state",
-+ IPP_TAG_ENUM);
-+ printer_accepting = ippFindAttribute(supported, "printer-is-accepting-jobs",
-+ IPP_TAG_BOOLEAN);
-+
-+ if (printer_state == NULL ||
-+ (printer_state->values[0].integer > IPP_PRINTER_PROCESSING &&
-+ waitprinter) ||
-+ printer_accepting == NULL ||
-+ !printer_accepting->values[0].boolean)
-+ {
-+ /*
-+ * If the CLASS environment variable is set, the job was submitted
-+ * to a class and not to a specific queue. In this case, we want
-+ * to abort immediately so that the job can be requeued on the next
-+ * available printer in the class.
-+ */
-+
-+ _cupsLangPuts(stderr,
-+ _("INFO: Unable to contact printer, queuing on next "
-+ "printer in class...\n"));
-+
-+ ippDelete(supported);
-+ httpClose(http);
-+
-+ if (tmpfilename[0])
-+ unlink(tmpfilename);
-+
-+ /*
-+ * Sleep 5 seconds to keep the job from requeuing too rapidly...
-+ */
-+
-+ sleep(5);
-+
-+ return (CUPS_BACKEND_FAILED);
-+ }
-+ }
-+
-+ if (recoverable)
-+ {
-+ /*
-+ * If we've shown a recoverable error make sure the printer proxies
-+ * have a chance to see the recovered message. Not pretty but
-+ * necessary for now...
-+ */
-+
-+ fputs("INFO: recovered: \n", stderr);
-+ sleep(5);
-+ }
-+
-+ /*
-+ * See if the printer supports multiple copies...
-+ */
-+
-+ copies = atoi(argv[4]);
-+
-+ if (copies_sup || argc < 7)
-+ {
-+ copies_remaining = 1;
-+
-+ if (argc < 7)
-+ copies = 1;
-+ }
-+ else
-+ copies_remaining = copies;
-+
-+ /*
-+ * Then issue the print-job request...
-+ */
-+
-+ job_id = 0;
-+
-+ while (copies_remaining > 0)
-+ {
-+ /*
-+ * Check for side-channel requests...
-+ */
-+
-+ backendCheckSideChannel(snmp_fd, http->hostaddr);
-+
-+ /*
-+ * Build the IPP request...
-+ */
-+
-+ if (job_cancelled)
-+ break;
-+
-+ if (num_files > 1)
-+ request = ippNewRequest(IPP_CREATE_JOB);
-+ else
-+ request = ippNewRequest(IPP_PRINT_JOB);
-+
-+ request->request.op.version[0] = version / 10;
-+ request->request.op.version[1] = version % 10;
-+
-+ ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, "printer-uri",
-+ NULL, uri);
-+
-+ fprintf(stderr, "DEBUG: printer-uri = \"%s\"\n", uri);
-+
-+ if (argv[2][0])
-+ ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_NAME,
-+ "requesting-user-name", NULL, argv[2]);
-+
-+ fprintf(stderr, "DEBUG: requesting-user-name = \"%s\"\n", argv[2]);
-+
-+ /*
-+ * Only add a "job-name" attribute if the remote server supports
-+ * copy generation - some IPP implementations like HP's don't seem
-+ * to like UTF-8 job names (STR #1837)...
-+ */
-+
-+ if (argv[3][0] && copies_sup)
-+ ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_NAME, "job-name", NULL,
-+ argv[3]);
-+
-+ fprintf(stderr, "DEBUG: job-name = \"%s\"\n", argv[3]);
-+
-+#ifdef HAVE_LIBZ
-+ if (compression)
-+ ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_KEYWORD,
-+ "compression", NULL, "gzip");
-+#endif /* HAVE_LIBZ */
-+
-+ /*
-+ * Handle options on the command-line...
-+ */
-+
-+ options = NULL;
-+ num_options = cupsParseOptions(argv[5], 0, &options);
-+
-+#ifdef __APPLE__
-+ if (!strcasecmp(final_content_type, "application/pictwps") &&
-+ num_files == 1)
-+ {
-+ if (format_sup != NULL)
-+ {
-+ for (i = 0; i < format_sup->num_values; i ++)
-+ if (!strcasecmp(final_content_type, format_sup->values[i].string.text))
-+ break;
-+ }
-+
-+ if (format_sup == NULL || i >= format_sup->num_values)
-+ {
-+ /*
-+ * Remote doesn't support "application/pictwps" (i.e. it's not MacOS X)
-+ * so convert the document to PostScript...
-+ */
-+
-+ if (run_pictwps_filter(argv, files[0]))
-+ {
-+ if (pstmpname[0])
-+ unlink(pstmpname);
-+
-+ if (tmpfilename[0])
-+ unlink(tmpfilename);
-+
-+ return (CUPS_BACKEND_FAILED);
-+ }
-+
-+ files[0] = pstmpname;
-+
-+ /*
-+ * Change the MIME type to application/postscript and change the
-+ * number of copies to 1...
-+ */
-+
-+ final_content_type = "application/postscript";
-+ copies = 1;
-+ copies_remaining = 1;
-+ send_options = 0;
-+ }
-+ }
-+#endif /* __APPLE__ */
-+
-+ if (format_sup != NULL)
-+ {
-+ for (i = 0; i < format_sup->num_values; i ++)
-+ if (!strcasecmp(final_content_type, format_sup->values[i].string.text))
-+ break;
-+
-+ if (i < format_sup->num_values)
-+ ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_MIMETYPE,
-+ "document-format", NULL, final_content_type);
-+ }
-+
-+ if (copies_sup && version > 10 && send_options)
-+ {
-+ /*
-+ * Only send options if the destination printer supports the copies
-+ * attribute and IPP/1.1. This is a hack for the HP and Lexmark
-+ * implementations of IPP, which do not accept extension attributes
-+ * and incorrectly report a client-error-bad-request error instead of
-+ * the successful-ok-unsupported-attributes status. In short, at least
-+ * some HP and Lexmark implementations of IPP are non-compliant.
-+ */
-+
-+ cupsEncodeOptions(request, num_options, options);
-+
-+ ippAddInteger(request, IPP_TAG_JOB, IPP_TAG_INTEGER, "copies",
-+ copies);
-+ }
-+
-+ cupsFreeOptions(num_options, options);
-+
-+ /*
-+ * If copies aren't supported, then we are likely dealing with an HP
-+ * JetDirect. The HP IPP implementation seems to close the connection
-+ * after every request - that is, it does *not* implement HTTP Keep-
-+ * Alive, which is REQUIRED by HTTP/1.1...
-+ */
-+
-+ if (!copies_sup)
-+ httpReconnect(http);
-+
-+ /*
-+ * Do the request...
-+ */
-+
-+ if (http->version < HTTP_1_1)
-+ httpReconnect(http);
-+
-+ if (num_files > 1)
-+ response = cupsDoRequest(http, request, resource);
-+ else
-+ response = cupsDoFileRequest(http, request, resource, files[0]);
-+
-+ ipp_status = cupsLastError();
-+
-+ if (ipp_status > IPP_OK_CONFLICT)
-+ {
-+ job_id = 0;
-+
-+ if (job_cancelled)
-+ break;
-+
-+ if (ipp_status == IPP_SERVICE_UNAVAILABLE ||
-+ ipp_status == IPP_PRINTER_BUSY)
-+ {
-+ _cupsLangPuts(stderr,
-+ _("INFO: Printer busy; will retry in 10 seconds...\n"));
-+ sleep(10);
-+ }
-+ else if ((ipp_status == IPP_BAD_REQUEST ||
-+ ipp_status == IPP_VERSION_NOT_SUPPORTED) && version > 10)
-+ {
-+ /*
-+ * Switch to IPP/1.0...
-+ */
-+
-+ _cupsLangPrintf(stderr,
-+ _("INFO: Printer does not support IPP/%d.%d, trying "
-+ "IPP/1.0...\n"), version / 10, version % 10);
-+ version = 10;
-+ httpReconnect(http);
-+ }
-+ else
-+ {
-+ /*
-+ * Update auth-info-required as needed...
-+ */
-+
-+ _cupsLangPrintf(stderr, _("ERROR: Print file was not accepted (%s)!\n"),
-+ cupsLastErrorString());
-+
-+ if (ipp_status == IPP_NOT_AUTHORIZED || ipp_status == IPP_FORBIDDEN)
-+ {
-+ fprintf(stderr, "DEBUG: WWW-Authenticate=\"%s\"\n",
-+ httpGetField(http, HTTP_FIELD_WWW_AUTHENTICATE));
-+
-+ /*
-+ * Normal authentication goes through the password callback, which sets
-+ * auth_info_required to "username,password". Kerberos goes directly
-+ * through GSSAPI, so look for Negotiate in the WWW-Authenticate header
-+ * here and set auth_info_required as needed...
-+ */
-+
-+ if (!strncmp(httpGetField(http, HTTP_FIELD_WWW_AUTHENTICATE),
-+ "Negotiate", 9))
-+ auth_info_required = "negotiate";
-+ }
-+ }
-+ }
-+ else if ((job_id_attr = ippFindAttribute(response, "job-id",
-+ IPP_TAG_INTEGER)) == NULL)
-+ {
-+ _cupsLangPuts(stderr,
-+ _("NOTICE: Print file accepted - job ID unknown.\n"));
-+ job_id = 0;
-+ }
-+ else
-+ {
-+ job_id = job_id_attr->values[0].integer;
-+ _cupsLangPrintf(stderr, _("NOTICE: Print file accepted - job ID %d.\n"),
-+ job_id);
-+ }
-+
-+ ippDelete(response);
-+
-+ if (job_cancelled)
-+ break;
-+
-+ if (job_id && num_files > 1)
-+ {
-+ for (i = 0; i < num_files; i ++)
-+ {
-+ /*
-+ * Check for side-channel requests...
-+ */
-+
-+ backendCheckSideChannel(snmp_fd, http->hostaddr);
-+
-+ /*
-+ * Send the next file in the job...
-+ */
-+
-+ request = ippNewRequest(IPP_SEND_DOCUMENT);
-+ request->request.op.version[0] = version / 10;
-+ request->request.op.version[1] = version % 10;
-+
-+ ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, "printer-uri",
-+ NULL, uri);
-+
-+ ippAddInteger(request, IPP_TAG_OPERATION, IPP_TAG_INTEGER, "job-id",
-+ job_id);
-+
-+ if (argv[2][0])
-+ 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);
-+
-+ ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_MIMETYPE,
-+ "document-format", NULL, content_type);
-+
-+ if (http->version < HTTP_1_1)
-+ httpReconnect(http);
-+
-+ ippDelete(cupsDoFileRequest(http, request, resource, files[i]));
-+
-+ if (cupsLastError() > IPP_OK_CONFLICT)
-+ {
-+ ipp_status = cupsLastError();
-+
-+ _cupsLangPrintf(stderr,
-+ _("ERROR: Unable to add file %d to job: %s\n"),
-+ job_id, cupsLastErrorString());
-+ 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_SERVICE_UNAVAILABLE ||
-+ ipp_status == IPP_PRINTER_BUSY)
-+ continue;
-+ else
-+ copies_remaining --;
-+
-+ /*
-+ * Wait for the job to complete...
-+ */
-+
-+ if (!job_id || !waitjob)
-+ continue;
-+
-+ _cupsLangPuts(stderr, _("INFO: Waiting for job to complete...\n"));
-+
-+ for (delay = 1; !job_cancelled;)
-+ {
-+ /*
-+ * Check for side-channel requests...
-+ */
-+
-+ backendCheckSideChannel(snmp_fd, http->hostaddr);
-+
-+ /*
-+ * Build an IPP_GET_JOB_ATTRIBUTES request...
-+ */
-+
-+ request = ippNewRequest(IPP_GET_JOB_ATTRIBUTES);
-+ request->request.op.version[0] = version / 10;
-+ request->request.op.version[1] = version % 10;
-+
-+ ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, "printer-uri",
-+ NULL, uri);
-+
-+ ippAddInteger(request, IPP_TAG_OPERATION, IPP_TAG_INTEGER, "job-id",
-+ job_id);
-+
-+ if (argv[2][0])
-+ ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_NAME,
-+ "requesting-user-name", NULL, argv[2]);
-+
-+ ippAddStrings(request, IPP_TAG_OPERATION, IPP_TAG_KEYWORD,
-+ "requested-attributes", sizeof(jattrs) / sizeof(jattrs[0]),
-+ NULL, jattrs);
-+
-+ /*
-+ * Do the request...
-+ */
-+
-+ if (!copies_sup || http->version < HTTP_1_1)
-+ httpReconnect(http);
-+
-+ response = cupsDoRequest(http, request, resource);
-+ ipp_status = cupsLastError();
-+
-+ if (ipp_status == IPP_NOT_FOUND)
-+ {
-+ /*
-+ * Job has gone away and/or the server has no job history...
-+ */
-+
-+ ippDelete(response);
-+
-+ ipp_status = IPP_OK;
-+ break;
-+ }
-+
-+ if (ipp_status > IPP_OK_CONFLICT)
-+ {
-+ if (ipp_status != IPP_SERVICE_UNAVAILABLE &&
-+ ipp_status != IPP_PRINTER_BUSY)
-+ {
-+ ippDelete(response);
-+
-+ _cupsLangPrintf(stderr,
-+ _("ERROR: Unable to get job %d attributes (%s)!\n"),
-+ job_id, cupsLastErrorString());
-+ break;
-+ }
-+ }
-+
-+ if (response)
-+ {
-+ if ((job_state = ippFindAttribute(response, "job-state",
-+ IPP_TAG_ENUM)) != NULL)
-+ {
-+ /*
-+ * Stop polling if the job is finished or pending-held...
-+ */
-+
-+ if (job_state->values[0].integer > IPP_JOB_STOPPED)
-+ {
-+ 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
-+ {
-+ /*
-+ * If the printer does not return a job-state attribute, it does not
-+ * conform to the IPP specification - break out immediately and fail
-+ * the job...
-+ */
-+
-+ fputs("DEBUG: No job-state available from printer - stopping queue.\n",
-+ stderr);
-+ ipp_status = IPP_INTERNAL_ERROR;
-+ break;
-+ }
-+ }
-+
-+ ippDelete(response);
-+
-+ /*
-+ * Check the printer state and report it if necessary...
-+ */
-+
-+ check_printer_state(http, uri, resource, argv[2], version, job_id);
-+
-+ /*
-+ * Wait 1-10 seconds before polling again...
-+ */
-+
-+ sleep(delay);
-+
-+ delay ++;
-+ if (delay > 10)
-+ delay = 1;
-+ }
-+ }
-+
-+ /*
-+ * Cancel the job as needed...
-+ */
-+
-+ if (job_cancelled && job_id)
-+ cancel_job(http, uri, job_id, resource, argv[2], version);
-+
-+ /*
-+ * Check the printer state and report it if necessary...
-+ */
-+
-+ check_printer_state(http, uri, resource, argv[2], version, job_id);
-+
-+ /*
-+ * Collect the final page count as needed...
-+ */
-+
-+ if (have_supplies &&
-+ !backendSNMPSupplies(snmp_fd, http->hostaddr, &page_count, NULL) &&
-+ page_count > start_count)
-+ fprintf(stderr, "PAGE: total %d\n", page_count - start_count);
-+
-+#ifdef HAVE_GSSAPI
-+ /*
-+ * See if we used Kerberos at all...
-+ */
-+
-+ if (http->gssctx)
-+ auth_info_required = "negotiate";
-+#endif /* HAVE_GSSAPI */
-+
-+ /*
-+ * Free memory...
-+ */
-+
-+ httpClose(http);
-+
-+ ippDelete(supported);
-+
-+ /*
-+ * Remove the temporary file(s) if necessary...
-+ */
-+
-+ if (tmpfilename[0])
-+ unlink(tmpfilename);
-+
-+#ifdef HAVE_LIBZ
-+ if (compression)
-+ {
-+ for (i = 0; i < num_files; i ++)
-+ unlink(files[i]);
-+ }
-+#endif /* HAVE_LIBZ */
-+
-+#ifdef __APPLE__
-+ if (pstmpname[0])
-+ unlink(pstmpname);
-+#endif /* __APPLE__ */
-+
-+ /*
-+ * 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)
-+ return (CUPS_BACKEND_AUTH_REQUIRED);
-+ else if (ipp_status == IPP_INTERNAL_ERROR)
-+ return (CUPS_BACKEND_STOP);
-+ else if (ipp_status > IPP_OK_CONFLICT)
-+ return (CUPS_BACKEND_FAILED);
-+ else
-+ {
-+ _cupsLangPuts(stderr, _("INFO: Ready to print.\n"));
-+ return (CUPS_BACKEND_OK);
-+ }
-+}
-+
-+
-+/*
-+ * 'cancel_job()' - Cancel a print job.
-+ */
-+
-+static void
-+cancel_job(http_t *http, /* I - HTTP connection */
-+ const char *uri, /* I - printer-uri */
-+ int id, /* I - job-id */
-+ const char *resource, /* I - Resource path */
-+ const char *user, /* I - requesting-user-name */
-+ int version) /* I - IPP version */
-+{
-+ ipp_t *request; /* Cancel-Job request */
-+
-+
-+ _cupsLangPuts(stderr, _("INFO: Canceling print job...\n"));
-+
-+ request = ippNewRequest(IPP_CANCEL_JOB);
-+ request->request.op.version[0] = version / 10;
-+ request->request.op.version[1] = version % 10;
-+
-+ ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, "printer-uri",
-+ NULL, uri);
-+ ippAddInteger(request, IPP_TAG_OPERATION, IPP_TAG_INTEGER, "job-id", id);
-+
-+ if (user && user[0])
-+ ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_NAME,
-+ "requesting-user-name", NULL, user);
-+
-+ /*
-+ * Do the request...
-+ */
-+
-+ if (http->version < HTTP_1_1)
-+ httpReconnect(http);
-+
-+ ippDelete(cupsDoRequest(http, request, resource));
-+
-+ if (cupsLastError() > IPP_OK_CONFLICT)
-+ _cupsLangPrintf(stderr, _("ERROR: Unable to cancel job %d: %s\n"), id,
-+ cupsLastErrorString());
-+}
-+
-+
-+/*
-+ * 'check_printer_state()' - Check the printer state...
-+ */
-+
-+static void
-+check_printer_state(
-+ http_t *http, /* I - HTTP connection */
-+ 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) /* I - Current job ID */
-+{
-+ ipp_t *request, /* IPP request */
-+ *response; /* IPP response */
-+ static const char * const attrs[] = /* Attributes we want */
-+ {
-+ "com.apple.print.recoverable-message",
-+ "marker-colors",
-+ "marker-levels",
-+ "marker-message",
-+ "marker-names",
-+ "marker-types",
-+ "printer-state-message",
-+ "printer-state-reasons"
-+ };
-+
-+
-+ /*
-+ * Check on the printer state...
-+ */
-+
-+ request = ippNewRequest(IPP_GET_PRINTER_ATTRIBUTES);
-+ request->request.op.version[0] = version / 10;
-+ request->request.op.version[1] = version % 10;
-+
-+ ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, "printer-uri",
-+ NULL, uri);
-+
-+ if (user && user[0])
-+ ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_NAME,
-+ "requesting-user-name", NULL, user);
-+
-+ ippAddStrings(request, IPP_TAG_OPERATION, IPP_TAG_KEYWORD,
-+ "requested-attributes",
-+ (int)(sizeof(attrs) / sizeof(attrs[0])), NULL, attrs);
-+
-+ /*
-+ * Do the request...
-+ */
-+
-+ if (http->version < HTTP_1_1)
-+ httpReconnect(http);
-+
-+ if ((response = cupsDoRequest(http, request, resource)) != NULL)
-+ {
-+ report_printer_state(response, job_id);
-+ ippDelete(response);
-+ }
-+}
-+
-+
-+#ifdef HAVE_LIBZ
-+/*
-+ * 'compress_files()' - Compress print files...
-+ */
-+
-+static void
-+compress_files(int num_files, /* I - Number of files */
-+ char **files) /* I - Files */
-+{
-+ int i, /* Looping var */
-+ fd; /* Temporary file descriptor */
-+ ssize_t bytes; /* Bytes read/written */
-+ size_t total; /* Total bytes read */
-+ cups_file_t *in, /* Input file */
-+ *out; /* Output file */
-+ struct stat outinfo; /* Output file information */
-+ char filename[1024], /* Temporary filename */
-+ buffer[32768]; /* Copy buffer */
-+
-+
-+ fprintf(stderr, "DEBUG: Compressing %d job files...\n", num_files);
-+ for (i = 0; i < num_files; i ++)
-+ {
-+ if ((fd = cupsTempFd(filename, sizeof(filename))) < 0)
-+ {
-+ _cupsLangPrintf(stderr,
-+ _("ERROR: Unable to create temporary compressed print "
-+ "file: %s\n"), strerror(errno));
-+ exit(CUPS_BACKEND_FAILED);
-+ }
-+
-+ if ((out = cupsFileOpenFd(fd, "w9")) == NULL)
-+ {
-+ _cupsLangPrintf(stderr,
-+ _("ERROR: Unable to open temporary compressed print "
-+ "file: %s\n"), strerror(errno));
-+ exit(CUPS_BACKEND_FAILED);
-+ }
-+
-+ if ((in = cupsFileOpen(files[i], "r")) == NULL)
-+ {
-+ _cupsLangPrintf(stderr,
-+ _("ERROR: Unable to open print file \"%s\": %s\n"),
-+ files[i], strerror(errno));
-+ cupsFileClose(out);
-+ exit(CUPS_BACKEND_FAILED);
-+ }
-+
-+ total = 0;
-+ while ((bytes = cupsFileRead(in, buffer, sizeof(buffer))) > 0)
-+ if (cupsFileWrite(out, buffer, bytes) < bytes)
-+ {
-+ _cupsLangPrintf(stderr,
-+ _("ERROR: Unable to write %d bytes to \"%s\": %s\n"),
-+ (int)bytes, filename, strerror(errno));
-+ cupsFileClose(in);
-+ cupsFileClose(out);
-+ exit(CUPS_BACKEND_FAILED);
-+ }
-+ else
-+ total += bytes;
-+
-+ cupsFileClose(out);
-+ cupsFileClose(in);
-+
-+ files[i] = strdup(filename);
-+
-+ if (!stat(filename, &outinfo))
-+ fprintf(stderr,
-+ "DEBUG: File %d compressed to %.1f%% of original size, "
-+ CUPS_LLFMT " bytes...\n",
-+ i + 1, 100.0 * outinfo.st_size / total,
-+ CUPS_LLCAST outinfo.st_size);
-+ }
-+}
-+#endif /* HAVE_LIBZ */
-+
-+
-+/*
-+ * 'password_cb()' - Disable the password prompt for cupsDoFileRequest().
-+ */
-+
-+static const char * /* O - Password */
-+password_cb(const char *prompt) /* I - Prompt (not used) */
-+{
-+ (void)prompt;
-+
-+ /*
-+ * Remember that we need to authenticate...
-+ */
-+
-+ auth_info_required = "username,password";
-+
-+ if (password && *password && password_tries < 3)
-+ {
-+ password_tries ++;
-+
-+ return (password);
-+ }
-+ else
-+ {
-+ /*
-+ * Give up after 3 tries or if we don't have a password to begin with...
-+ */
-+
-+ return (NULL);
-+ }
-+}
-+
-+
-+/*
-+ * 'report_attr()' - Report an IPP attribute value.
-+ */
-+
-+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 */
-+
-+
-+ /*
-+ * Convert the attribute values into quoted strings...
-+ */
-+
-+ for (i = 0, valptr = value;
-+ i < attr->num_values && valptr < (value + sizeof(value) - 10);
-+ i ++)
-+ {
-+ if (i > 0)
-+ *valptr++ = ',';
-+
-+ switch (attr->value_tag)
-+ {
-+ case IPP_TAG_INTEGER :
-+ case IPP_TAG_ENUM :
-+ snprintf(valptr, sizeof(value) - (valptr - value), "%d",
-+ attr->values[i].integer);
-+ valptr += strlen(valptr);
-+ break;
-+
-+ 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++ = '\"';
-+ break;
-+
-+ default :
-+ /*
-+ * Unsupported value type...
-+ */
-+
-+ return;
-+ }
-+ }
-+
-+ *valptr = '\0';
-+
-+ /*
-+ * Tell the scheduler about the new values...
-+ */
-+
-+ fprintf(stderr, "ATTR: %s=%s\n", attr->name, value);
-+}
-+
-+
-+/*
-+ * '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 */
-+{
-+ int i; /* Looping var */
-+ int count; /* Count of reasons shown... */
-+ ipp_attribute_t *caprm, /* com.apple.print.recoverable-message */
-+ *psm, /* printer-state-message */
-+ *reasons, /* printer-state-reasons */
-+ *marker; /* marker-* attributes */
-+ const char *reason; /* Current reason */
-+ const char *prefix; /* Prefix for STATE: line */
-+ char state[1024]; /* State string */
-+ int saw_caprw; /* Saw com.apple.print.recoverable-warning state */
-+
-+
-+ if ((psm = ippFindAttribute(ipp, "printer-state-message",
-+ IPP_TAG_TEXT)) != NULL)
-+ fprintf(stderr, "INFO: %s\n", psm->values[0].string.text);
-+
-+ if ((reasons = ippFindAttribute(ipp, "printer-state-reasons",
-+ IPP_TAG_KEYWORD)) == NULL)
-+ return (0);
-+
-+ saw_caprw = 0;
-+ state[0] = '\0';
-+ prefix = "STATE: ";
-+
-+ for (i = 0, count = 0; i < reasons->num_values; i ++)
-+ {
-+ reason = reasons->values[i].string.text;
-+
-+ if (!strcmp(reason, "com.apple.print.recoverable-warning"))
-+ saw_caprw = 1;
-+ else if (strcmp(reason, "paused"))
-+ {
-+ strlcat(state, prefix, sizeof(state));
-+ strlcat(state, reason, sizeof(state));
-+
-+ prefix = ",";
-+ }
-+ }
-+
-+ if (state[0])
-+ fprintf(stderr, "%s\n", state);
-+
-+ /*
-+ * Relay com.apple.print.recoverable-message...
-+ */
-+
-+ if ((caprm = ippFindAttribute(ipp, "com.apple.print.recoverable-message",
-+ IPP_TAG_TEXT)) != NULL)
-+ fprintf(stderr, "WARNING: %s: %s\n",
-+ saw_caprw ? "recoverable" : "recovered",
-+ caprm->values[0].string.text);
-+
-+ /*
-+ * Relay the current marker-* attribute values...
-+ */
-+
-+ 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);
-+}
-+
-+
-+#ifdef __APPLE__
-+/*
-+ * 'run_pictwps_filter()' - Convert PICT files to PostScript when printing
-+ * remotely.
-+ *
-+ * This step is required because the PICT format is not documented and
-+ * subject to change, so developing a filter for other OS's is infeasible.
-+ * Also, fonts required by the PICT file need to be embedded on the
-+ * client side (which has the fonts), so we run the filter to get a
-+ * PostScript file for printing...
-+ */
-+
-+static int /* O - Exit status of filter */
-+run_pictwps_filter(char **argv, /* I - Command-line arguments */
-+ const char *filename)/* I - Filename */
-+{
-+ struct stat fileinfo; /* Print file information */
-+ const char *ppdfile; /* PPD file for destination printer */
-+ int pid; /* Child process ID */
-+ int fd; /* Temporary file descriptor */
-+ int status; /* Exit status of filter */
-+ const char *printer; /* PRINTER env var */
-+ static char ppdenv[1024]; /* PPD environment variable */
-+
-+
-+ /*
-+ * First get the PPD file for the printer...
-+ */
-+
-+ printer = getenv("PRINTER");
-+ if (!printer)
-+ {
-+ _cupsLangPuts(stderr,
-+ _("ERROR: PRINTER environment variable not defined!\n"));
-+ return (-1);
-+ }
-+
-+ if ((ppdfile = cupsGetPPD(printer)) == NULL)
-+ {
-+ _cupsLangPrintf(stderr,
-+ _("ERROR: Unable to get PPD file for printer \"%s\" - "
-+ "%s.\n"), printer, cupsLastErrorString());
-+ }
-+ else
-+ {
-+ snprintf(ppdenv, sizeof(ppdenv), "PPD=%s", ppdfile);
-+ putenv(ppdenv);
-+ }
-+
-+ /*
-+ * Then create a temporary file for printing...
-+ */
-+
-+ if ((fd = cupsTempFd(pstmpname, sizeof(pstmpname))) < 0)
-+ {
-+ _cupsLangPrintError("ERROR", _("Unable to create temporary file"));
-+ if (ppdfile)
-+ unlink(ppdfile);
-+ return (-1);
-+ }
-+
-+ /*
-+ * Get the owner of the spool file - it is owned by the user we want to run
-+ * as...
-+ */
-+
-+ if (argv[6])
-+ stat(argv[6], &fileinfo);
-+ else
-+ {
-+ /*
-+ * Use the OSX defaults, as an up-stream filter created the PICT
-+ * file...
-+ */
-+
-+ fileinfo.st_uid = 1;
-+ fileinfo.st_gid = 80;
-+ }
-+
-+ if (ppdfile)
-+ chown(ppdfile, fileinfo.st_uid, fileinfo.st_gid);
-+
-+ fchown(fd, fileinfo.st_uid, fileinfo.st_gid);
-+
-+ /*
-+ * Finally, run the filter to convert the file...
-+ */
-+
-+ if ((pid = fork()) == 0)
-+ {
-+ /*
-+ * Child process for pictwpstops... Redirect output of pictwpstops to a
-+ * file...
-+ */
-+
-+ dup2(fd, 1);
-+ close(fd);
-+
-+ if (!getuid())
-+ {
-+ /*
-+ * Change to an unpriviledged user...
-+ */
-+
-+ if (setgid(fileinfo.st_gid))
-+ return (errno);
-+
-+ if (setuid(fileinfo.st_uid))
-+ return (errno);
-+ }
-+
-+ execlp("pictwpstops", printer, argv[1], argv[2], argv[3], argv[4], argv[5],
-+ filename, NULL);
-+ _cupsLangPrintf(stderr, _("ERROR: Unable to exec pictwpstops: %s\n"),
-+ strerror(errno));
-+ return (errno);
-+ }
-+
-+ close(fd);
-+
-+ if (pid < 0)
-+ {
-+ /*
-+ * Error!
-+ */
-+
-+ _cupsLangPrintf(stderr, _("ERROR: Unable to fork pictwpstops: %s\n"),
-+ strerror(errno));
-+ if (ppdfile)
-+ unlink(ppdfile);
-+ return (-1);
-+ }
-+
-+ /*
-+ * Now wait for the filter to complete...
-+ */
-+
-+ if (wait(&status) < 0)
-+ {
-+ _cupsLangPrintf(stderr, _("ERROR: Unable to wait for pictwpstops: %s\n"),
-+ strerror(errno));
-+ close(fd);
-+ if (ppdfile)
-+ unlink(ppdfile);
-+ return (-1);
-+ }
-+
-+ if (ppdfile)
-+ unlink(ppdfile);
-+
-+ close(fd);
-+
-+ if (status)
-+ {
-+ if (status >= 256)
-+ _cupsLangPrintf(stderr, _("ERROR: pictwpstops exited with status %d!\n"),
-+ status / 256);
-+ else
-+ _cupsLangPrintf(stderr, _("ERROR: pictwpstops exited on signal %d!\n"),
-+ status);
-+
-+ return (status);
-+ }
-+
-+ /*
-+ * Return with no errors..
-+ */
-+
-+ return (0);
-+}
-+#endif /* __APPLE__ */
-+
-+
-+/*
-+ * 'sigterm_handler()' - Handle 'terminate' signals that stop the backend.
-+ */
-+
-+static void
-+sigterm_handler(int sig) /* I - Signal */
-+{
-+ (void)sig; /* remove compiler warnings... */
-+
-+ if (!job_cancelled)
-+ {
-+ /*
-+ * Flag that the job should be cancelled...
-+ */
-+
-+ job_cancelled = 1;
-+ return;
-+ }
-+
-+ /*
-+ * The scheduler already tried to cancel us once, now just terminate
-+ * after removing our temp files!
-+ */
-+
-+ if (tmpfilename[0])
-+ unlink(tmpfilename);
-+
-+#ifdef __APPLE__
-+ if (pstmpname[0])
-+ unlink(pstmpname);
-+#endif /* __APPLE__ */
-+
-+ exit(1);
-+}
-+
-+
-+/*
-+ * End of "$Id: ipp.c 8950 2010-01-14 22:40:19Z mike $".
-+ */
-diff -up cups-2.2.8/config.h.in.lspp cups-2.2.8/config.h.in
---- cups-2.2.8/config.h.in.lspp 2018-06-05 18:06:54.000000000 +0200
-+++ cups-2.2.8/config.h.in 2018-06-08 17:34:38.682653959 +0200
-@@ -730,4 +730,11 @@ static __inline int _cups_abs(int i) { r
+diff -up cups-2.3.0/config.h.in.lspp cups-2.3.0/config.h.in
+--- cups-2.3.0/config.h.in.lspp 2019-08-23 17:19:38.000000000 +0200
++++ cups-2.3.0/config.h.in 2019-10-07 12:24:43.058597468 +0200
+@@ -684,4 +684,11 @@ static __inline int _cups_abs(int i) { r
# endif /* __GNUC__ || __STDC_VERSION__ */
#endif /* !HAVE_ABS && !abs */
+
+
#endif /* !_CUPS_CONFIG_H_ */
-diff -up cups-2.2.8/config-scripts/cups-lspp.m4.lspp cups-2.2.8/config-scripts/cups-lspp.m4
---- cups-2.2.8/config-scripts/cups-lspp.m4.lspp 2018-06-08 17:34:38.682653959 +0200
-+++ cups-2.2.8/config-scripts/cups-lspp.m4 2018-06-08 17:34:38.682653959 +0200
+diff -up cups-2.3.0/config-scripts/cups-lspp.m4.lspp cups-2.3.0/config-scripts/cups-lspp.m4
+--- cups-2.3.0/config-scripts/cups-lspp.m4.lspp 2019-10-07 12:24:43.058597468 +0200
++++ cups-2.3.0/config-scripts/cups-lspp.m4 2019-10-07 12:24:43.058597468 +0200
@@ -0,0 +1,36 @@
+dnl
+dnl LSPP code for the Common UNIX Printing System (CUPS).
+ ;;
+ esac
+fi
-diff -up cups-2.2.8/configure.ac.lspp cups-2.2.8/configure.ac
---- cups-2.2.8/configure.ac.lspp 2018-06-05 18:06:54.000000000 +0200
-+++ cups-2.2.8/configure.ac 2018-06-08 17:34:38.682653959 +0200
-@@ -38,6 +38,8 @@ sinclude(config-scripts/cups-startup.m4)
+diff -up cups-2.3.0/configure.ac.lspp cups-2.3.0/configure.ac
+--- cups-2.3.0/configure.ac.lspp 2019-10-07 12:24:43.058597468 +0200
++++ cups-2.3.0/configure.ac 2019-10-07 12:39:20.122546282 +0200
+@@ -34,6 +34,8 @@ sinclude(config-scripts/cups-dnssd.m4)
+ sinclude(config-scripts/cups-startup.m4)
sinclude(config-scripts/cups-defaults.m4)
- sinclude(config-scripts/cups-scripting.m4)
+sinclude(config-scripts/cups-lspp.m4)
+
INSTALL_LANGUAGES=""
UNINSTALL_LANGUAGES=""
LANGFILES=""
-diff -up cups-2.2.8/filter/common.c.lspp cups-2.2.8/filter/common.c
---- cups-2.2.8/filter/common.c.lspp 2018-06-05 18:06:54.000000000 +0200
-+++ cups-2.2.8/filter/common.c 2018-06-08 17:34:38.682653959 +0200
-@@ -17,6 +17,12 @@
+diff -up cups-2.3.0/filter/common.c.lspp cups-2.3.0/filter/common.c
+--- cups-2.3.0/filter/common.c.lspp 2019-08-23 17:19:38.000000000 +0200
++++ cups-2.3.0/filter/common.c 2019-10-07 12:24:43.059597461 +0200
+@@ -11,6 +11,12 @@
* Include necessary headers...
*/
#include "common.h"
#include <locale.h>
-@@ -299,6 +305,18 @@ WriteLabelProlog(const char *label, /* I
+@@ -293,6 +299,18 @@ WriteLabelProlog(const char *label, /* I
{
const char *classification; /* CLASSIFICATION environment variable */
const char *ptr; /* Temporary string pointer */
/*
-@@ -321,6 +339,124 @@ WriteLabelProlog(const char *label, /* I
+@@ -315,6 +333,124 @@ WriteLabelProlog(const char *label, /* I
return;
}
/*
* Set the classification + page label string...
*/
-@@ -401,7 +537,10 @@ WriteLabelProlog(const char *label, /* I
+@@ -395,7 +531,10 @@ WriteLabelProlog(const char *label, /* I
printf(" %.0f moveto ESPpl show\n", top - 14.0);
puts("pop");
puts("}bind put");
/*
-diff -up cups-2.2.8/filter/pstops.c.lspp cups-2.2.8/filter/pstops.c
---- cups-2.2.8/filter/pstops.c.lspp 2018-06-05 18:06:54.000000000 +0200
-+++ cups-2.2.8/filter/pstops.c 2018-06-08 17:34:38.683653951 +0200
-@@ -3176,6 +3176,18 @@ write_label_prolog(pstops_doc_t *doc, /*
+diff -up cups-2.3.0/filter/pstops.c.lspp cups-2.3.0/filter/pstops.c
+--- cups-2.3.0/filter/pstops.c.lspp 2019-08-23 17:19:38.000000000 +0200
++++ cups-2.3.0/filter/pstops.c 2019-10-07 12:24:43.059597461 +0200
+@@ -3170,6 +3170,18 @@ write_label_prolog(pstops_doc_t *doc, /*
{
const char *classification; /* CLASSIFICATION environment variable */
const char *ptr; /* Temporary string pointer */
/*
-@@ -3198,6 +3210,124 @@ write_label_prolog(pstops_doc_t *doc, /*
+@@ -3192,6 +3204,124 @@ write_label_prolog(pstops_doc_t *doc, /*
return;
}
/*
* Set the classification + page label string...
*/
-@@ -3276,7 +3406,10 @@ write_label_prolog(pstops_doc_t *doc, /*
+@@ -3270,7 +3400,10 @@ write_label_prolog(pstops_doc_t *doc, /*
doc_printf(doc, " %.0f moveto ESPpl show\n", top - 14.0);
doc_puts(doc, "pop\n");
doc_puts(doc, "}bind put\n");
/*
-diff -up cups-2.2.8/Makedefs.in.lspp cups-2.2.8/Makedefs.in
---- cups-2.2.8/Makedefs.in.lspp 2018-06-05 18:06:54.000000000 +0200
-+++ cups-2.2.8/Makedefs.in 2018-06-08 17:34:38.683653951 +0200
-@@ -161,7 +161,7 @@ LDFLAGS = -L../cgi-bin -L../cups -L../f
- @LDFLAGS@ @RELROFLAGS@ @PIEFLAGS@ $(OPTIM)
- LINKCUPS = @LINKCUPS@ $(LIBGSSAPI) $(DNSSDLIBS) $(SSLLIBS) $(LIBZ)
- LINKCUPSIMAGE = @LINKCUPSIMAGE@
--LIBS = $(LINKCUPS) $(COMMONLIBS)
-+LIBS = $(LINKCUPS) $(COMMONLIBS) @LIBAUDIT@ @LIBSELINUX@
+diff -up cups-2.3.0/Makedefs.in.lspp cups-2.3.0/Makedefs.in
+--- cups-2.3.0/Makedefs.in.lspp 2019-10-07 12:24:43.059597461 +0200
++++ cups-2.3.0/Makedefs.in 2019-10-07 12:37:19.200565805 +0200
+@@ -174,7 +174,7 @@ IPPFIND_MAN = @IPPFIND_MAN@
+ LDFLAGS = @LDFLAGS@
+ LINKCUPS = @LINKCUPS@
+ LINKCUPSSTATIC = ../cups/$(LIBCUPSSTATIC) $(LIBS)
+-LIBS = $(LIBGSSAPI) $(DNSSDLIBS) $(SSLLIBS) $(LIBZ) $(COMMONLIBS)
++LIBS = $(LIBGSSAPI) $(DNSSDLIBS) $(SSLLIBS) $(LIBZ) $(COMMONLIBS) @LIBAUDIT@ @LIBSELINUX@
ONDEMANDFLAGS = @ONDEMANDFLAGS@
ONDEMANDLIBS = @ONDEMANDLIBS@
OPTIM = @OPTIM@
-diff -up cups-2.2.8/scheduler/client.c.lspp cups-2.2.8/scheduler/client.c
---- cups-2.2.8/scheduler/client.c.lspp 2018-06-05 18:06:54.000000000 +0200
-+++ cups-2.2.8/scheduler/client.c 2018-06-08 17:34:38.729653586 +0200
-@@ -22,12 +22,20 @@
+diff -up cups-2.3.0/scheduler/client.c.lspp cups-2.3.0/scheduler/client.c
+--- cups-2.3.0/scheduler/client.c.lspp 2019-08-23 17:19:38.000000000 +0200
++++ cups-2.3.0/scheduler/client.c 2019-10-07 12:33:10.459693580 +0200
+@@ -19,12 +19,20 @@
#define _HTTP_NO_PRIVATE
#include "cupsd.h"
/*
-@@ -268,6 +276,59 @@ cupsdAcceptClient(cupsd_listener_t *lis)
+@@ -265,6 +273,59 @@ cupsdAcceptClient(cupsd_listener_t *lis)
}
#endif /* HAVE_TCPD_H */
#ifdef AF_LOCAL
if (httpAddrFamily(httpGetAddress(con->http)) == AF_LOCAL)
{
-@@ -562,6 +623,13 @@ cupsdReadClient(cupsd_client_t *con) /*
+@@ -558,6 +619,13 @@ cupsdReadClient(cupsd_client_t *con) /*
+ struct stat filestats; /* File information */
mime_type_t *type; /* MIME type of file */
- cupsd_printer_t *p; /* Printer */
static unsigned request_id = 0; /* Request ID for temp files */
+#ifdef WITH_LSPP
+ security_context_t spoolcon; /* context of the job file */
status = HTTP_STATUS_CONTINUE;
-@@ -1938,6 +2006,73 @@ cupsdReadClient(cupsd_client_t *con) /*
+@@ -1679,6 +1747,73 @@ cupsdReadClient(cupsd_client_t *con) /*
fcntl(con->file, F_SETFD, fcntl(con->file, F_GETFD) | FD_CLOEXEC);
}
if (httpGetState(con->http) != HTTP_STATE_POST_SEND)
{
if (!httpWait(con->http, 0))
-@@ -3485,6 +3620,49 @@ is_path_absolute(const char *path) /* I
+@@ -3174,6 +3309,49 @@ is_path_absolute(const char *path) /* I
return (1);
}
/*
* 'pipe_command()' - Pipe the output of a command to the remote client.
-diff -up cups-2.2.8/scheduler/client.h.lspp cups-2.2.8/scheduler/client.h
---- cups-2.2.8/scheduler/client.h.lspp 2018-06-05 18:06:54.000000000 +0200
-+++ cups-2.2.8/scheduler/client.h 2018-06-08 17:34:38.729653586 +0200
-@@ -16,6 +16,13 @@
+diff -up cups-2.3.0/scheduler/client.h.lspp cups-2.3.0/scheduler/client.h
+--- cups-2.3.0/scheduler/client.h.lspp 2019-08-23 17:19:38.000000000 +0200
++++ cups-2.3.0/scheduler/client.h 2019-10-07 12:24:43.113597079 +0200
+@@ -13,6 +13,13 @@
#endif /* HAVE_AUTHORIZATION_H */
/*
* HTTP client structure...
*/
-@@ -66,6 +73,10 @@ struct cupsd_client_s
+@@ -63,6 +70,10 @@ struct cupsd_client_s
#ifdef HAVE_AUTHORIZATION_H
AuthorizationRef authref; /* Authorization ref */
#endif /* HAVE_AUTHORIZATION_H */
};
#define HTTP(con) ((con)->http)
-@@ -139,6 +150,9 @@ extern void cupsdStartListening(void);
+@@ -136,6 +147,9 @@ extern void cupsdStartListening(void);
extern void cupsdStopListening(void);
extern void cupsdUpdateCGI(void);
extern void cupsdWriteClient(cupsd_client_t *con);
#ifdef HAVE_SSL
extern int cupsdEndTLS(cupsd_client_t *con);
-diff -up cups-2.2.8/scheduler/conf.c.lspp cups-2.2.8/scheduler/conf.c
---- cups-2.2.8/scheduler/conf.c.lspp 2018-06-08 17:34:38.676654007 +0200
-+++ cups-2.2.8/scheduler/conf.c 2018-06-08 17:34:38.730653578 +0200
-@@ -40,6 +40,9 @@
+diff -up cups-2.3.0/scheduler/conf.c.lspp cups-2.3.0/scheduler/conf.c
+--- cups-2.3.0/scheduler/conf.c.lspp 2019-10-07 12:24:43.049597531 +0200
++++ cups-2.3.0/scheduler/conf.c 2019-10-07 12:24:43.113597079 +0200
+@@ -37,6 +37,9 @@
# define INADDR_NONE 0xffffffff
#endif /* !INADDR_NONE */
/*
-@@ -863,6 +873,25 @@ cupsdReadConfiguration(void)
+@@ -864,6 +874,25 @@ cupsdReadConfiguration(void)
RunUser = getuid();
cupsdLogMessage(CUPSD_LOG_INFO, "Remote access is %s.",
RemotePort ? "enabled" : "disabled");
-@@ -1274,7 +1303,19 @@ cupsdReadConfiguration(void)
+@@ -1275,7 +1304,19 @@ cupsdReadConfiguration(void)
cupsdClearString(&Classification);
if (Classification)
/*
* Check the MaxClients setting, and then allocate memory for it...
-@@ -3832,6 +3873,18 @@ read_location(cups_file_t *fp, /* I - C
+@@ -3830,6 +3871,18 @@ read_location(cups_file_t *fp, /* I - C
return ((FatalErrors & CUPSD_FATAL_CONFIG) ? 0 : linenum);
}
/*
* 'read_policy()' - Read a <Policy name> definition.
-diff -up cups-2.2.8/scheduler/conf.h.lspp cups-2.2.8/scheduler/conf.h
---- cups-2.2.8/scheduler/conf.h.lspp 2018-06-05 18:06:54.000000000 +0200
-+++ cups-2.2.8/scheduler/conf.h 2018-06-08 17:34:38.730653578 +0200
-@@ -246,6 +246,13 @@ VAR char *ServerKeychain VALUE(NULL);
+diff -up cups-2.3.0/scheduler/conf.h.lspp cups-2.3.0/scheduler/conf.h
+--- cups-2.3.0/scheduler/conf.h.lspp 2019-08-23 17:19:38.000000000 +0200
++++ cups-2.3.0/scheduler/conf.h 2019-10-07 12:24:43.113597079 +0200
+@@ -243,6 +243,13 @@ VAR char *ServerKeychain VALUE(NULL);
/* Keychain holding cert + key */
#endif /* HAVE_SSL */
#ifdef HAVE_ONDEMAND
VAR int IdleExitTimeout VALUE(60);
/* Time after which an idle cupsd will exit */
-@@ -264,6 +271,9 @@ VAR int HaveServerCreds VALUE(0);
+@@ -261,6 +268,9 @@ VAR int HaveServerCreds VALUE(0);
VAR gss_cred_id_t ServerCreds; /* Server's GSS credentials */
#endif /* HAVE_GSSAPI */
/*
* Prototypes...
-diff -up cups-2.2.8/scheduler/cupsd.h.lspp cups-2.2.8/scheduler/cupsd.h
---- cups-2.2.8/scheduler/cupsd.h.lspp 2018-06-05 18:06:54.000000000 +0200
-+++ cups-2.2.8/scheduler/cupsd.h 2018-06-08 17:34:38.730653578 +0200
-@@ -11,6 +11,8 @@
- * file is missing or damaged, see the license at "http://www.cups.org/".
+diff -up cups-2.3.0/scheduler/cupsd.h.lspp cups-2.3.0/scheduler/cupsd.h
+--- cups-2.3.0/scheduler/cupsd.h.lspp 2019-08-23 17:19:38.000000000 +0200
++++ cups-2.3.0/scheduler/cupsd.h 2019-10-07 12:31:38.458480578 +0200
+@@ -8,6 +8,8 @@
+ * information.
*/
+/* Copyright (C) 2005 Trusted Computer Solutions, Inc. */
/*
* Include necessary headers.
-@@ -36,13 +38,20 @@
+@@ -33,6 +35,14 @@
# include <unistd.h>
- #endif /* WIN32 */
+ #endif /* _WIN32 */
+#include "config.h"
+#ifdef WITH_LSPP
#include "mime.h"
#if defined(HAVE_CDSASSL)
- # include <CoreFoundation/CoreFoundation.h>
- #endif /* HAVE_CDSASSL */
-
--
- /*
- * Some OS's don't have hstrerror(), most notably Solaris...
- */
-diff -up cups-2.2.8/scheduler/ipp.c.lspp cups-2.2.8/scheduler/ipp.c
---- cups-2.2.8/scheduler/ipp.c.lspp 2018-06-08 17:34:38.652654197 +0200
-+++ cups-2.2.8/scheduler/ipp.c 2018-06-08 17:37:19.166378937 +0200
-@@ -14,6 +14,9 @@
- * missing or damaged, see the license at "http://www.cups.org/".
+diff -up cups-2.3.0/scheduler/ipp.c.lspp cups-2.3.0/scheduler/ipp.c
+--- cups-2.3.0/scheduler/ipp.c.lspp 2019-10-07 12:24:43.016597764 +0200
++++ cups-2.3.0/scheduler/ipp.c 2019-10-07 12:31:01.243798920 +0200
+@@ -11,6 +11,9 @@
+ * information.
*/
+/* Copyright (C) 2005 Trusted Computer Solutions, Inc. */
/*
* Include necessary headers...
*/
-@@ -37,6 +40,14 @@ extern int mbr_check_membership_by_id(uu
- # endif /* HAVE_MEMBERSHIPPRIV_H */
+@@ -27,6 +30,14 @@ extern int mbr_group_name_to_uuid(const
+ extern int mbr_check_membership_by_id(uuid_t user, gid_t group, int* ismember);
#endif /* __APPLE__ */
+#ifdef WITH_LSPP
/*
* Local functions...
-@@ -61,6 +72,9 @@ static void cancel_all_jobs(cupsd_client
+@@ -51,6 +62,9 @@ static void cancel_all_jobs(cupsd_client
static void cancel_job(cupsd_client_t *con, ipp_attribute_t *uri);
static void cancel_subscription(cupsd_client_t *con, int id);
static int check_rss_recipient(const char *recipient);
static int check_quotas(cupsd_client_t *con, cupsd_printer_t *p);
static void close_job(cupsd_client_t *con, ipp_attribute_t *uri);
static void copy_attrs(ipp_t *to, ipp_t *from, cups_array_t *ra,
-@@ -1250,6 +1264,21 @@ add_job(cupsd_client_t *con, /* I - Cl
+@@ -1240,6 +1254,21 @@ add_job(cupsd_client_t *con, /* I - Cl
"time-at-creation",
"time-at-processing"
};
cupsdLogMessage(CUPSD_LOG_DEBUG2, "add_job(%p[%d], %p(%s), %p(%s/%s))",
-@@ -1578,6 +1607,106 @@ add_job(cupsd_client_t *con, /* I - Cl
+@@ -1568,6 +1597,106 @@ add_job(cupsd_client_t *con, /* I - Cl
attr = ippFindAttribute(con->request, "requesting-user-name", IPP_TAG_NAME);
if ((job = cupsdAddJob(priority, printer->name)) == NULL)
{
send_ipp_status(con, IPP_INTERNAL_ERROR,
-@@ -1586,6 +1715,32 @@ add_job(cupsd_client_t *con, /* I - Cl
+@@ -1576,6 +1705,32 @@ add_job(cupsd_client_t *con, /* I - Cl
return (NULL);
}
job->dtype = printer->type & (CUPS_PRINTER_CLASS | CUPS_PRINTER_REMOTE);
job->attrs = con->request;
job->dirty = 1;
-@@ -1773,6 +1928,29 @@ add_job(cupsd_client_t *con, /* I - Cl
+@@ -1763,6 +1918,29 @@ add_job(cupsd_client_t *con, /* I - Cl
ippSetString(job->attrs, &attr, 0, printer->job_sheets[0]);
ippSetString(job->attrs, &attr, 1, printer->job_sheets[1]);
}
job->job_sheets = attr;
-@@ -1803,6 +1981,9 @@ add_job(cupsd_client_t *con, /* I - Cl
+@@ -1793,6 +1971,9 @@ add_job(cupsd_client_t *con, /* I - Cl
"job-sheets=\"%s,none\", "
"job-originating-user-name=\"%s\"",
Classification, job->username);
}
else if (attr->num_values == 2 &&
strcmp(attr->values[0].string.text,
-@@ -1821,6 +2002,9 @@ add_job(cupsd_client_t *con, /* I - Cl
+@@ -1811,6 +1992,9 @@ add_job(cupsd_client_t *con, /* I - Cl
"job-originating-user-name=\"%s\"",
attr->values[0].string.text,
attr->values[1].string.text, job->username);
}
else if (strcmp(attr->values[0].string.text, Classification) &&
strcmp(attr->values[0].string.text, "none") &&
-@@ -1841,6 +2025,9 @@ add_job(cupsd_client_t *con, /* I - Cl
+@@ -1831,6 +2015,9 @@ add_job(cupsd_client_t *con, /* I - Cl
"job-originating-user-name=\"%s\"",
attr->values[0].string.text,
attr->values[1].string.text, job->username);
}
}
else if (strcmp(attr->values[0].string.text, Classification) &&
-@@ -1881,8 +2068,52 @@ add_job(cupsd_client_t *con, /* I - Cl
+@@ -1871,8 +2058,52 @@ add_job(cupsd_client_t *con, /* I - Cl
"job-sheets=\"%s\", "
"job-originating-user-name=\"%s\"",
Classification, job->username);
/*
* See if we need to add the starting sheet...
-@@ -3656,6 +3887,128 @@ check_rss_recipient(
+@@ -3648,6 +3879,128 @@ check_rss_recipient(
}
/*
* 'check_quotas()' - Check quotas for a printer and user.
*/
-@@ -4112,6 +4465,15 @@ copy_banner(cupsd_client_t *con, /* I -
+@@ -4103,6 +4456,15 @@ copy_banner(cupsd_client_t *con, /* I -
char attrname[255], /* Name of attribute */
*s; /* Pointer into name */
ipp_attribute_t *attr; /* Attribute */
cupsdLogMessage(CUPSD_LOG_DEBUG2,
-@@ -4147,6 +4509,85 @@ copy_banner(cupsd_client_t *con, /* I -
+@@ -4138,6 +4500,85 @@ copy_banner(cupsd_client_t *con, /* I -
fchmod(cupsFileNumber(out), 0640);
fchown(cupsFileNumber(out), RunUser, Group);
/*
* Try the localized banner file under the subdirectory...
-@@ -4241,6 +4682,24 @@ copy_banner(cupsd_client_t *con, /* I -
+@@ -4232,6 +4673,24 @@ copy_banner(cupsd_client_t *con, /* I -
else
s = attrname;
if (!strcmp(s, "printer-name"))
{
cupsFilePuts(out, job->dest);
-@@ -6480,6 +6939,22 @@ get_job_attrs(cupsd_client_t *con, /* I
+@@ -6439,6 +6898,22 @@ get_job_attrs(cupsd_client_t *con, /* I
exclude = cupsdGetPrivateAttrs(policy, con, printer, job->username);
/*
* Copy attributes...
*/
-@@ -6877,6 +7352,11 @@ get_jobs(cupsd_client_t *con, /* I - C
+@@ -6836,6 +7311,11 @@ get_jobs(cupsd_client_t *con, /* I - C
if (username[0] && _cups_strcasecmp(username, job->username))
continue;
if (count > 0)
ippAddSeparator(con->response);
-@@ -11475,6 +11955,11 @@ validate_user(cupsd_job_t *job, /* I
+@@ -11445,6 +11925,11 @@ validate_user(cupsd_job_t *job, /* I
strlcpy(username, get_username(con), userlen);
/*
* Check the username against the owner...
*/
-diff -up cups-2.2.8/scheduler/job.c.lspp cups-2.2.8/scheduler/job.c
---- cups-2.2.8/scheduler/job.c.lspp 2018-06-08 17:34:38.657654158 +0200
-+++ cups-2.2.8/scheduler/job.c 2018-06-08 17:34:38.733653554 +0200
-@@ -11,6 +11,9 @@
- * missing or damaged, see the license at "http://www.cups.org/".
+diff -up cups-2.3.0/scheduler/job.c.lspp cups-2.3.0/scheduler/job.c
+--- cups-2.3.0/scheduler/job.c.lspp 2019-10-07 12:24:43.024597707 +0200
++++ cups-2.3.0/scheduler/job.c 2019-10-07 12:30:13.092210820 +0200
+@@ -8,6 +8,9 @@
+ * information.
*/
+/* Copyright (C) 2005 Trusted Computer Solutions, Inc. */
/*
* Include necessary headers...
*/
-@@ -26,6 +29,14 @@
+@@ -23,6 +26,14 @@
# endif /* HAVE_IOKIT_PWR_MGT_IOPMLIBPRIVATE_H */
#endif /* __APPLE__ */
/*
* Design Notes for Job Management
-@@ -547,6 +558,14 @@ cupsdContinueJob(cupsd_job_t *job) /* I
+@@ -544,6 +555,14 @@ cupsdContinueJob(cupsd_job_t *job) /* I
/* PRINTER_STATE_REASONS env var */
rip_max_cache[255];
/* RIP_MAX_CACHE env variable */
cupsdLogMessage(CUPSD_LOG_DEBUG2,
-@@ -1083,6 +1102,67 @@ cupsdContinueJob(cupsd_job_t *job) /* I
+@@ -1080,6 +1099,67 @@ cupsdContinueJob(cupsd_job_t *job) /* I
if (final_content_type[0])
envp[envc ++] = final_content_type;
if (Classification && !banner_page)
{
if ((attr = ippFindAttribute(job->attrs, "job-sheets",
-@@ -1862,6 +1942,22 @@ cupsdLoadJob(cupsd_job_t *job) /* I - J
+@@ -1858,6 +1938,22 @@ cupsdLoadJob(cupsd_job_t *job) /* I - J
ippSetString(job->attrs, &job->reasons, 0, "none");
}
job->impressions = ippFindAttribute(job->attrs, "job-impressions-completed", IPP_TAG_INTEGER);
job->sheets = ippFindAttribute(job->attrs, "job-media-sheets-completed", IPP_TAG_INTEGER);
job->job_sheets = ippFindAttribute(job->attrs, "job-sheets", IPP_TAG_NAME);
-@@ -2275,6 +2371,14 @@ cupsdSaveJob(cupsd_job_t *job) /* I - J
+@@ -2273,6 +2369,14 @@ cupsdSaveJob(cupsd_job_t *job) /* I - J
{
char filename[1024]; /* Job control filename */
cups_file_t *fp; /* Job file */
cupsdLogMessage(CUPSD_LOG_DEBUG2, "cupsdSaveJob(job=%p(%d)): job->attrs=%p",
-@@ -2297,6 +2401,78 @@ cupsdSaveJob(cupsd_job_t *job) /* I - J
+@@ -2295,6 +2399,78 @@ cupsdSaveJob(cupsd_job_t *job) /* I - J
fchown(cupsFileNumber(fp), RunUser, Group);
job->attrs->state = IPP_IDLE;
if (ippWriteIO(fp, (ipp_iocb_t)cupsFileWrite, 1, NULL,
-@@ -3943,6 +4119,19 @@ get_options(cupsd_job_t *job, /* I - Jo
+@@ -3995,6 +4171,19 @@ get_options(cupsd_job_t *job, /* I - Jo
banner_page)
continue;
/*
* Otherwise add them to the list...
*/
-@@ -4704,6 +4893,18 @@ start_job(cupsd_job_t *job, /* I -
+@@ -4805,6 +4994,18 @@ start_job(cupsd_job_t *job, /* I -
cupsd_printer_t *printer) /* I - Printer to print job */
{
const char *filename; /* Support filename */
ipp_attribute_t *cancel_after = ippFindAttribute(job->attrs,
"job-cancel-after",
IPP_TAG_INTEGER);
-@@ -4892,6 +5093,113 @@ start_job(cupsd_job_t *job, /* I -
+@@ -4993,6 +5194,113 @@ start_job(cupsd_job_t *job, /* I -
fcntl(job->side_pipes[1], F_SETFD,
fcntl(job->side_pipes[1], F_GETFD) | FD_CLOEXEC);
/*
* Now start the first file in the job...
*/
-diff -up cups-2.2.8/scheduler/job.h.lspp cups-2.2.8/scheduler/job.h
---- cups-2.2.8/scheduler/job.h.lspp 2018-06-05 18:06:54.000000000 +0200
-+++ cups-2.2.8/scheduler/job.h 2018-06-08 17:34:38.733653554 +0200
-@@ -11,6 +11,13 @@
- * missing or damaged, see the license at "http://www.cups.org/".
+diff -up cups-2.3.0/scheduler/job.h.lspp cups-2.3.0/scheduler/job.h
+--- cups-2.3.0/scheduler/job.h.lspp 2019-08-23 17:19:38.000000000 +0200
++++ cups-2.3.0/scheduler/job.h 2019-10-07 12:29:54.364371023 +0200
+@@ -7,6 +7,13 @@
+ * Licensed under Apache License v2.0. See the file "LICENSE" for more information.
*/
+/* Copyright (C) 2005 Trusted Computer Solutions, Inc. */
/*
* Constants...
*/
-@@ -88,6 +95,10 @@ struct cupsd_job_s /**** Job request *
+@@ -84,6 +91,10 @@ struct cupsd_job_s /**** Job request *
int progress; /* Printing progress */
int num_keywords; /* Number of PPD keywords */
cups_option_t *keywords; /* PPD keywords */
};
typedef struct cupsd_joblog_s /**** Job log message ****/
-diff -up cups-2.2.8/scheduler/main.c.lspp cups-2.2.8/scheduler/main.c
---- cups-2.2.8/scheduler/main.c.lspp 2018-06-08 17:34:38.663654110 +0200
-+++ cups-2.2.8/scheduler/main.c 2018-06-08 17:34:38.734653546 +0200
-@@ -56,6 +56,9 @@
+diff -up cups-2.3.0/scheduler/main.c.lspp cups-2.3.0/scheduler/main.c
+--- cups-2.3.0/scheduler/main.c.lspp 2019-10-07 12:24:43.037597616 +0200
++++ cups-2.3.0/scheduler/main.c 2019-10-07 12:24:43.119597037 +0200
+@@ -57,6 +57,9 @@
# include <sys/param.h>
#endif /* HAVE_SYS_PARAM_H */
/*
* Local functions...
-@@ -122,6 +125,9 @@ main(int argc, /* I - Number of comm
+@@ -123,6 +126,9 @@ main(int argc, /* I - Number of comm
#if defined(HAVE_SIGACTION) && !defined(HAVE_SIGSET)
struct sigaction action; /* Actions for POSIX signals */
#endif /* HAVE_SIGACTION && !HAVE_SIGSET */
/*
* Let the system know we are busy while we bring up cupsd...
*/
-@@ -1188,6 +1213,11 @@ main(int argc, /* I - Number of comm
+@@ -1201,6 +1226,11 @@ main(int argc, /* I - Number of comm
cupsdStopSelect();
return (!stop_scheduler);
}
-diff -up cups-2.2.8/scheduler/printers.c.lspp cups-2.2.8/scheduler/printers.c
---- cups-2.2.8/scheduler/printers.c.lspp 2018-06-05 18:06:54.000000000 +0200
-+++ cups-2.2.8/scheduler/printers.c 2018-06-08 17:34:38.734653546 +0200
-@@ -11,6 +11,8 @@
- * missing or damaged, see the license at "http://www.cups.org/".
+diff -up cups-2.3.0/scheduler/printers.c.lspp cups-2.3.0/scheduler/printers.c
+--- cups-2.3.0/scheduler/printers.c.lspp 2019-08-23 17:19:38.000000000 +0200
++++ cups-2.3.0/scheduler/printers.c 2019-10-07 12:29:17.956658129 +0200
+@@ -8,6 +8,8 @@
+ * information.
*/
+/* (c) Copyright 2005-2006 Hewlett-Packard Development Company, L.P. */
/*
* Include necessary headers...
*/
-@@ -35,6 +37,10 @@
+@@ -32,6 +34,10 @@
# include <asl.h>
#endif /* __APPLE__ */
/*
* Local functions...
-@@ -2202,6 +2208,13 @@ cupsdSetPrinterAttrs(cupsd_printer_t *p)
+@@ -2252,6 +2258,13 @@ cupsdSetPrinterAttrs(cupsd_printer_t *p)
ipp_attribute_t *attr; /* Attribute data */
char *name, /* Current user/group name */
*filter; /* Current filter */
+#endif /* WITH_LSPP */
- DEBUG_printf(("cupsdSetPrinterAttrs: entering name = %s, type = %x\n", p->name,
-@@ -2329,6 +2342,45 @@ cupsdSetPrinterAttrs(cupsd_printer_t *p)
+ /*
+@@ -2378,6 +2391,45 @@ cupsdSetPrinterAttrs(cupsd_printer_t *p)
attr->values[1].string.text = _cupsStrAlloc(Classification ?
Classification : p->job_sheets[1]);
}
projects / packages / cups.git / commitdiff