CHANGES IN CUPS V1.4.5
+ - Documentation fixes (STR #3542)
+ - Fixed the Solaris SMF configuration file for cups-lpd (STR #3611)
+ - The scheduler did not set the notify-subscribed-event attribute when
+ delivering printer-added or printer-modified events (STR #3608)
+ - The mailto notifier could get into an infinite loop (STR #3609)
+ - Date/time information was not shown in banner pages.
+ - Relational operators were broken in #if/#elif/#else/#endif expressions
+ for the PPD compiler.
+ - Moving a job via the web interface failed without asking for
+ authentication (STR #3559)
+ - The scheduler now clears the printer-state-reasons when the driver is
+ changed (STR #3570)
+ - The web interface did not allow a user to change the driver
+ (STR #3537, STR #3601)
+ - The scheduler was not setting the PATH_INFO environment variable when
+ needed (STR #3600)
+ - The scheduler incorrectly set the CUPSD_AUTH_TYPE environment
+ variable instead of AUTH_TYPE (STR #3599)
+ - Fixed a buffer overrun in the PPD compiler (STR #3594)
+ - Fixed some additional IPP job template attribute mapping issues in the
+ scheduler.
CHANGES IN CUPS V1.4.4
- Documentation updates (STR #3453, STR #3527, STR #3528, STR #3529)
+ - Security: The fix for CVE-2009-3553 was incomplete (STR #3490)
+ - Security: The texttops filter did not check the results of allocations
+ (STR #3516)
+ - Security: The web admin interface could disclose the contents of
+ memory (STR #3577)
+ - Security: CUPS could overwrite files as root in directories owned or
+ writable by non-root users (STR #3510)
+ - The cups-config utility did not return the correct linker options on
+ AIX (STR #3587)
- Fixed some IPP conformance issues with the scheduler's
ippget-event-life, operations-supported, output-bin, and sides
attributes (STR #3554)
- - The GNU TLS and OpenSSL interfaces have been made thread-safe
+ - The OpenSSL interfaces have been made thread-safe and the GNU TLS
+ interface is explicitly forbidden when threading is enabled
(STR #3461)
- Fixed an IPP conformance issue with the scheduler's Send-Document
implementation (STR #3514)
-CHANGES.txt - 2010-05-10
+CHANGES.txt - 2010-06-16
------------------------
CHANGES IN CUPS V1.5b1
+ - Added several new color spaces to the CUPS raster format (STR #3419)
+ - The Validate-Job operation now uses the same policy as Print-Job by
+ default.
- CUPS now uses iconv to implement all of its character encoding
support (STR #3097)
- The scheduler now implements the Cancel-Jobs, Cancel-My-Jobs, and
if ((http = httpConnectEncrypt(hostname, port, cupsEncryption())) == NULL)
{
+ int error = errno; /* Connection error */
+
if (job_canceled)
break;
return (CUPS_BACKEND_FAILED);
}
+ fprintf(stderr, "DEBUG: Connection error: %s\n", strerror(errno));
+
if (errno == ECONNREFUSED || errno == EHOSTDOWN ||
errno == EHOSTUNREACH)
{
if (contimeout && (time(NULL) - start_time) > contimeout)
{
- _cupsLangPuts(stderr, _("ERROR: Printer not responding\n"));
+ _cupsLangPuts(stderr, _("ERROR: The printer is not responding.\n"));
return (CUPS_BACKEND_FAILED);
}
- _cupsLangPrintf(stderr,
- _("WARNING: Network host \'%s\' is busy; "
- "will retry in %d seconds...\n"),
- hostname, delay);
+ switch (error)
+ {
+ case EHOSTDOWN :
+ _cupsLangPrintf(stderr,
+ _("WARNING: Network printer \'%s\' may not exist "
+ "or is unavailable at this time.\n"),
+ hostname);
+ break;
+
+ case EHOSTUNREACH :
+ _cupsLangPrintf(stderr,
+ _("WARNING: Network printer \'%s\' is "
+ "unreachable at this time.\n"),
+ hostname);
+ break;
+
+ case ECONNREFUSED :
+ default :
+ _cupsLangPrintf(stderr,
+ _("WARNING: Network printer \'%s\' is busy.\n"),
+ hostname);
+ break;
+ }
sleep(delay);
}
else if (h_errno)
{
- _cupsLangPrintf(stderr, _("ERROR: Unable to locate printer \'%s\'\n"),
+ _cupsLangPrintf(stderr,
+ _("ERROR: Unable to locate network printer \'%s\'.\n"),
hostname);
return (CUPS_BACKEND_STOP);
}
else
{
- fprintf(stderr, "DEBUG: Connection error: %s\n", strerror(errno));
- _cupsLangPuts(stderr,
- _("ERROR: Unable to connect to printer; will retry in 30 "
- "seconds...\n"));
+ _cupsLangPrintf(stderr, _("ERROR: Network printer \'%s\' is not "
+ "responding.\n"), hostname);
sleep(30);
}
if (http->version < HTTP_1_1)
{
+ fprintf(stderr, "DEBUG: Printer responded with HTTP version %d.%d.\n",
+ http->version / 100, http->version % 100);
+
_cupsLangPuts(stderr,
- _("ERROR: Unable to print - printer does not conform to "
+ _("ERROR: Unable to print: the printer does not conform to "
"the IPP standard.\n"));
exit(CUPS_BACKEND_STOP);
}
{
if (contimeout && (time(NULL) - start_time) > contimeout)
{
- _cupsLangPuts(stderr, _("ERROR: Printer not responding\n"));
+ _cupsLangPuts(stderr, _("ERROR: The printer is not responding.\n"));
return (CUPS_BACKEND_FAILED);
}
}
else if (ipp_status == IPP_NOT_FOUND)
{
- _cupsLangPuts(stderr, _("ERROR: Destination printer does not exist\n"));
+ _cupsLangPuts(stderr, _("ERROR: The printer URI is incorrect or no longer exists.\n"));
if (supported)
ippDelete(supported);
*
* Line Printer Daemon backend for the Common UNIX Printing System (CUPS).
*
- * Copyright 2007-2009 by Apple Inc.
+ * 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
#include <stdarg.h>
#include <sys/types.h>
#include <sys/stat.h>
+#include <stdio.h>
#ifdef WIN32
# include <winsock.h>
if ((fd = cupsTempFd(tmpfilename, sizeof(tmpfilename))) < 0)
{
- _cupsLangPrintError(_("ERROR: Unable to create temporary file"));
+ perror("DEBUG: Unable to create temporary file");
return (CUPS_BACKEND_FAILED);
}
if (lpd_write(fd, buf, bytes) < bytes)
{
- _cupsLangPrintError(_("ERROR: Unable to send LPD command"));
+ perror("DEBUG: Unable to send LPD command");
return (-1);
}
if ((fd = socket(addr->addr.addr.sa_family, SOCK_STREAM, 0)) < 0)
{
- _cupsLangPrintError(_("ERROR: Unable to create socket"));
+ perror("DEBUG: Unable to create socket");
sleep(1);
continue;
if ((fd = rresvport_af(&lport, addr->addr.addr.sa_family)) < 0)
{
- _cupsLangPrintError(_("ERROR: Unable to reserve port"));
+ perror("DEBUG: Unable to reserve port");
sleep(1);
continue;
return (CUPS_BACKEND_FAILED);
}
+ fprintf(stderr, "DEBUG: Connection error: %s\n", strerror(error));
+
if (error == ECONNREFUSED || error == EHOSTDOWN ||
error == EHOSTUNREACH)
{
if (contimeout && (time(NULL) - start_time) > contimeout)
{
- _cupsLangPuts(stderr, _("ERROR: Printer not responding\n"));
+ _cupsLangPuts(stderr, _("ERROR: The printer is not responding.\n"));
return (CUPS_BACKEND_FAILED);
}
- _cupsLangPrintf(stderr,
- _("WARNING: Network host \'%s\' is busy; will retry in "
- "%d seconds...\n"), hostname, delay);
+ switch (error)
+ {
+ case EHOSTDOWN :
+ _cupsLangPrintf(stderr,
+ _("WARNING: Network printer \'%s\' may not exist "
+ "or is unavailable at this time.\n"),
+ hostname);
+ break;
+
+ case EHOSTUNREACH :
+ _cupsLangPrintf(stderr,
+ _("WARNING: Network printer \'%s\' is "
+ "unreachable at this time.\n"),
+ hostname);
+ break;
+
+ case ECONNREFUSED :
+ default :
+ _cupsLangPrintf(stderr,
+ _("WARNING: Network printer \'%s\' is busy.\n"),
+ hostname);
+ break;
+ }
sleep(delay);
}
else
{
- fprintf(stderr, "DEBUG: Connection error: %s\n", strerror(errno));
- _cupsLangPuts(stderr,
- _("ERROR: Unable to connect to printer; will retry in 30 "
- "seconds...\n"));
+ _cupsLangPrintf(stderr, _("ERROR: Network printer \'%s\' is not "
+ "responding.\n"), hostname);
sleep(30);
}
}
httpAddrFreeList(addrlist);
close(fd);
- _cupsLangPrintError(_("ERROR: unable to stat print file"));
+ perror("DEBUG: unable to stat print file");
return (CUPS_BACKEND_FAILED);
}
if (lpd_write(fd, control, strlen(control) + 1) < (strlen(control) + 1))
{
status = errno;
- _cupsLangPrintError(_("ERROR: Unable to write control file"));
+ perror("DEBUG: Unable to write control file");
+
}
else
{
if (lpd_write(fd, buffer, nbytes) < nbytes)
{
- _cupsLangPrintError(_("ERROR: Unable to send print file to printer"));
+ perror("DEBUG: Unable to send print file to printer");
break;
}
else
status = errno;
else if (lpd_write(fd, "", 1) < 1)
{
- _cupsLangPrintError(_("ERROR: Unable to send trailing nul to printer"));
+ perror("DEBUG: Unable to send trailing nul to printer");
status = errno;
}
else
if (lpd_write(fd, control, strlen(control) + 1) < (strlen(control) + 1))
{
status = errno;
- _cupsLangPrintError(_("ERROR: Unable to write control file"));
+ perror("DEBUG: Unable to write control file");
}
else
{
if (zip_getmyzone(ZIP_DEF_INTERFACE, &at_zone))
{
- _cupsLangPrintError(_("ERROR: Unable to get default AppleTalk zone"));
+ perror("DEBUG: Unable to get default AppleTalk zone.");
return -2;
}
if ((numberFound = nbp_lookup(&entity, buf, MAX_PRINTERS, &retry)) < 0)
{
- _cupsLangPrintError(_("ERROR: Unable to lookup AppleTalk printers"));
+ perror("DEBUG: Unable to lookup AppleTalk printers.");
return numberFound;
}
/* try to find our printer */
if ((err = nbp_make_entity(&entity, name, type, zone)) != noErr)
{
- _cupsLangPrintError(_("ERROR: Unable to make AppleTalk address"));
+ perror("DEBUG: Unable to make AppleTalk address.");
goto Exit;
}
/* Start the tickle packets and set a timeout alarm */
if ((err = papSendRequest(gSockfd, &gSessionAddr, gConnID, AT_PAP_TYPE_TICKLE, 0, false, false)) < 0)
{
- _cupsLangPrintError(_("ERROR: Unable to send PAP tickle request"));
+ perror("DEBUG: Unable to send PAP tickle request.");
goto Exit;
}
signal(SIGALRM, signalHandler);
/* Prime the pump with an initial send-data packet */
if ((err = papSendRequest(gSockfd, &gSessionAddr, gConnID, AT_PAP_TYPE_SEND_DATA, 0xFF, true, true)) < 0)
{
- _cupsLangPrintError(_("ERROR: Unable to send initial PAP send data request"));
+ perror("DEBUG: Unable to send initial PAP send data request.");
goto Exit;
}
/* Wait here for something interesting to happen */
if ((err = select(maxfdp1, &readSet, 0, 0, timeoutPtr)) < 0)
{
- _cupsLangPrintError(_("ERROR: select() failed"));
+ perror("DEBUG: select() failed.");
break;
}
{
/* Time to send a status request */
if ((err = papSendRequest(gSockfd, &tuple.enu_addr, 0, AT_PAP_TYPE_SEND_STATUS, 0x01, false, false)) < 0)
- _cupsLangPrintError(_("WARNING: Unable to send PAP status request"));
+ _cupsLangPrintError(_("WARNING: Unable to send PAP status request"));
if (gStatusInterval)
nextStatusTime = time(NULL) + gStatusInterval;
{
if ((rc = atp_look(gSockfd)) < 0)
{
- _cupsLangPrintError(_("ERROR: Unable to look for PAP response"));
+ perror("DEBUG: Unable to look for PAP response.");
break;
}
if ((err = atp_getresp(gSockfd, &tid, &resp)) < 0)
{
- _cupsLangPrintError(_("ERROR: Unable to get PAP response"));
+ perror("DEBUG: Unable to get PAP response.");
break;
}
userdata = resp.userdata[0];
reqlen = sizeof(atpReqBuf);
if ((err = atp_getreq(gSockfd, &src, atpReqBuf, &reqlen, &userdata, &xo, &tid, &bitmap, 0)) < 0)
{
- _cupsLangPrintError(_("ERROR: Unable to get PAP request"));
+ perror("DEBUG: Unable to get PAP response.");
break;
}
}
if (paperout != 1 && update_state)
{
fputs("STATE: +media-empty-warning\n", stderr);
- _cupsLangPuts(stderr, _("ERROR: Out of paper\n"));
+ _cupsLangPuts(stderr, _("DEBUG: Out of paper\n"));
paperout = 1;
}
}
*
* Serial port backend for the Common UNIX Printing System (CUPS).
*
- * Copyright 2007-2009 by Apple Inc.
+ * 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
*/
#include "backend-private.h"
+#include <stdio.h>
#ifdef __hpux
# include <sys/modem.h>
if (errno != EAGAIN || errno != EINTR)
{
- _cupsLangPrintError(_("ERROR: Unable to read print data"));
+ perror("DEBUG: Unable to read print data");
tcsetattr(device_fd, TCSADRAIN, &origopts);
if (errno != EAGAIN && errno != EINTR && errno != ENOTTY)
{
- _cupsLangPrintError(_("ERROR: Unable to write print data"));
+ perror("DEBUG: Unable to write print data");
tcsetattr(device_fd, TCSADRAIN, &origopts);
return (CUPS_BACKEND_FAILED);
}
+ fprintf(stderr, "DEBUG: Connection error: %s\n", strerror(error));
+
if (error == ECONNREFUSED || error == EHOSTDOWN ||
error == EHOSTUNREACH)
{
if (contimeout && (time(NULL) - start_time) > contimeout)
{
- _cupsLangPuts(stderr, _("ERROR: Printer not responding\n"));
+ _cupsLangPuts(stderr, _("ERROR: The printer is not responding.\n"));
return (CUPS_BACKEND_FAILED);
}
- _cupsLangPrintf(stderr,
- _("WARNING: Network host \'%s\' is busy; will retry in "
- "%d seconds...\n"), hostname, delay);
+ switch (error)
+ {
+ case EHOSTDOWN :
+ _cupsLangPrintf(stderr,
+ _("WARNING: Network printer \'%s\' may not exist "
+ "or is unavailable at this time.\n"),
+ hostname);
+ break;
+
+ case EHOSTUNREACH :
+ _cupsLangPrintf(stderr,
+ _("WARNING: Network printer \'%s\' is "
+ "unreachable at this time.\n"),
+ hostname);
+ break;
+
+ case ECONNREFUSED :
+ default :
+ _cupsLangPrintf(stderr,
+ _("WARNING: Network printer \'%s\' is busy.\n"),
+ hostname);
+ break;
+ }
sleep(delay);
}
else
{
- _cupsLangPrintf(stderr, "DEBUG: Connection error: %s\n",
- strerror(errno));
- _cupsLangPuts(stderr,
- _("ERROR: Unable to connect to printer; will retry in 30 "
- "seconds...\n"));
+ _cupsLangPrintf(stderr, _("ERROR: Network printer \'%s\' is not "
+ "responding.\n"), hostname);
sleep(30);
}
}
#define DEBUG_WRITES 0
-/*
- * WAIT_EOF_DELAY is number of seconds we'll wait for responses from
- * the printer after we've finished sending all the data
- */
-#define WAIT_EOF_DELAY 7
-#define WAIT_SIDE_DELAY 3
#define DEFAULT_TIMEOUT 5000L
#define USB_INTERFACE_KIND CFUUIDGetUUIDBytes(kIOUSBInterfaceInterfaceID190)
Boolean wait_eof;
int drain_output; /* Drain all pending output */
int bidi_flag; /* 0=unidirectional, 1=bidirectional */
-
- pthread_mutex_t sidechannel_thread_mutex;
- pthread_cond_t sidechannel_thread_cond;
- int sidechannel_thread_stop;
- int sidechannel_thread_done;
} globals_t;
UInt32 bytes; /* Bytes written */
struct timeval *timeout, /* Timeout pointer */
stimeout; /* Timeout for select() */
- struct timespec cond_timeout; /* pthread condition timeout */
/*
if (!g.make || !g.model)
{
- _cupsLangPuts(stderr, _("ERROR: Fatal USB error\n"));
+ fprintf(stderr, "DEBUG: Fatal USB error.\n");
+ _cupsLangPuts(stderr, _("ERROR: There was an unrecoverable USB error.\n"));
if (!g.make)
fputs("DEBUG: USB make string is NULL\n", stderr);
strlcpy(print_buffer, "USB class driver", sizeof(print_buffer));
fputs("STATE: +apple-missing-usbclassdriver-error\n", stderr);
- _cupsLangPuts(stderr, _("ERROR: Fatal USB error\n"));
+ _cupsLangPuts(stderr, _("ERROR: There was an unrecoverable USB error.\n"));
fprintf(stderr, "DEBUG: Could not load %s\n", print_buffer);
if (driverBundlePath)
if (have_sidechannel)
{
- g.sidechannel_thread_stop = 0;
- g.sidechannel_thread_done = 0;
-
- pthread_cond_init(&g.sidechannel_thread_cond, NULL);
- pthread_mutex_init(&g.sidechannel_thread_mutex, NULL);
-
if (pthread_create(&sidechannel_thread_id, NULL, sidechannel_thread, NULL))
{
- _cupsLangPuts(stderr, _("ERROR: Fatal USB error\n"));
+ fprintf(stderr, "DEBUG: Fatal USB error.\n");
+ _cupsLangPuts(stderr, _("ERROR: There was an unrecoverable USB error.\n"));
fputs("DEBUG: Couldn't create side-channel thread\n", stderr);
registry_close();
return (CUPS_BACKEND_STOP);
if (pthread_create(&read_thread_id, NULL, read_thread, NULL))
{
- _cupsLangPuts(stderr, _("ERROR: Fatal USB error\n"));
+ fprintf(stderr, "DEBUG: Fatal USB error.\n");
+ _cupsLangPuts(stderr, _("ERROR: There was an unrecoverable USB error.\n"));
fputs("DEBUG: Couldn't create read thread\n", stderr);
registry_close();
return (CUPS_BACKEND_STOP);
}
else if (errno != EAGAIN && errno != EINTR)
{
- _cupsLangPuts(stderr, _("ERROR: Unable to read print data\n"));
+ _cupsLangPuts(stderr, _("ERROR: Unable to read print data.\n"));
perror("DEBUG: select");
registry_close();
return (CUPS_BACKEND_FAILED);
if (errno != EAGAIN && errno != EINTR)
{
- _cupsLangPuts(stderr, _("ERROR: Unable to read print data\n"));
+ _cupsLangPuts(stderr, _("ERROR: Unable to read print data.\n"));
perror("DEBUG: read");
registry_close();
return (CUPS_BACKEND_FAILED);
/*
* Write error - bail if we don't see an error we can retry...
*/
-
- _cupsLangPuts(stderr, _("ERROR: Unable to send print data\n"));
+ _cupsLangPuts(stderr, _("ERROR: Unable to send print data to printer.\n"));
fprintf(stderr, "DEBUG: USB class driver WritePipe returned %x\n",
iostatus);
fprintf(stderr, "DEBUG: Sent %lld bytes...\n", (off_t)total_bytes);
- /*
- * Wait for the side channel thread to exit...
- */
-
- if (have_sidechannel)
- {
- close(CUPS_SC_FD);
- pthread_mutex_lock(&g.readwrite_lock_mutex);
- g.readwrite_lock = 0;
- pthread_cond_signal(&g.readwrite_lock_cond);
- pthread_mutex_unlock(&g.readwrite_lock_mutex);
-
- g.sidechannel_thread_stop = 1;
- pthread_mutex_lock(&g.sidechannel_thread_mutex);
- if (!g.sidechannel_thread_done)
- {
- /*
- * Wait for the side-channel thread to exit...
- */
-
- cond_timeout.tv_sec = time(NULL) + WAIT_SIDE_DELAY;
- cond_timeout.tv_nsec = 0;
- if (pthread_cond_timedwait(&g.sidechannel_thread_cond,
- &g.sidechannel_thread_mutex,
- &cond_timeout) != 0)
- {
- /*
- * Force the side-channel thread to exit...
- */
-
- pthread_kill(sidechannel_thread_id, SIGTERM);
- }
- }
- pthread_mutex_unlock(&g.sidechannel_thread_mutex);
-
- pthread_join(sidechannel_thread_id, NULL);
-
- pthread_cond_destroy(&g.sidechannel_thread_cond);
- pthread_mutex_destroy(&g.sidechannel_thread_mutex);
- }
-
- pthread_cond_destroy(&g.readwrite_lock_cond);
- pthread_mutex_destroy(&g.readwrite_lock_mutex);
-
- /*
- * Signal the read thread to stop...
- */
-
- g.read_thread_stop = 1;
-
- /*
- * Give the read thread WAIT_EOF_DELAY seconds to complete all the data. If
- * we are not signaled in that time then force the thread to exit.
- */
-
- pthread_mutex_lock(&g.read_thread_mutex);
-
- if (!g.read_thread_done)
- {
- cond_timeout.tv_sec = time(NULL) + WAIT_EOF_DELAY;
- cond_timeout.tv_nsec = 0;
-
- if (pthread_cond_timedwait(&g.read_thread_cond, &g.read_thread_mutex,
- &cond_timeout) != 0)
- {
- /*
- * Force the read thread to exit...
- */
-
- g.wait_eof = 0;
- pthread_kill(read_thread_id, SIGTERM);
- }
- }
- pthread_mutex_unlock(&g.read_thread_mutex);
-
- pthread_join(read_thread_id, NULL); /* wait for the read thread to return */
-
- pthread_cond_destroy(&g.read_thread_cond);
- pthread_mutex_destroy(&g.read_thread_mutex);
-
/*
* Close the connection and input file and general clean up...
*/
break;
}
}
- while (!g.sidechannel_thread_stop);
-
- pthread_mutex_lock(&g.sidechannel_thread_mutex);
- g.sidechannel_thread_done = 1;
- pthread_cond_signal(&g.sidechannel_thread_cond);
- pthread_mutex_unlock(&g.sidechannel_thread_mutex);
+ while (1);
return NULL;
}
resource, sizeof(resource)) < HTTP_URI_OK)
{
_cupsLangPuts(stderr,
- _("ERROR: No device URI found in argv[0] or in DEVICE_URI "
- "environment variable\n"));
+ _("ERROR: No device URI found in argv[0] or in DEVICE_URI "
+ "environment variable\n"));
return (1);
}
if (!cgiGetVariable("CURRENT_MAKE"))
cgiSetVariable("CURRENT_MAKE", make);
- cgiSetVariable("PPD_MAKE", make);
-
if (!cgiGetVariable("CURRENT_MAKE_AND_MODEL"))
cgiSetVariable("CURRENT_MAKE_AND_MODEL", uriptr);
ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, "printer-uri",
NULL, "ipp://localhost/printers/");
- if ((var = cgiGetVariable("CURRENT_MAKE")) == NULL)
- var = cgiGetVariable("PPD_MAKE");
+ if ((var = cgiGetVariable("PPD_MAKE")) == NULL)
+ var = cgiGetVariable("CURRENT_MAKE");
if (var && !cgiGetVariable("SELECT_MAKE"))
{
const char *make_model; /* Make and model */
/*
- * See who is logged in...
+ * Make sure we have a username...
*/
- user = getenv("REMOTE_USER");
+ if ((user = getenv("REMOTE_USER")) == NULL)
+ {
+ puts("Status: 401\n");
+ exit(0);
+ }
/*
* See if the user has already selected a new destination...
* Read the hex code...
*/
+ if (!isxdigit(data[1] & 255) || !isxdigit(data[2] & 255))
+ return (0);
+
if (s < (value + sizeof(value) - 1))
{
data ++;
_cupsMD5Append(&md5, (unsigned char *)buffer, (int)strlen(buffer));
_cupsMD5Finish(&md5, sum);
- cgiSetCookie(CUPS_SID, httpMD5String(sum, sid), "/", server_name, 0, 0);
+ cgiSetCookie(CUPS_SID, httpMD5String(sum, sid), "/", NULL, 0, 0);
return (cupsGetOption(CUPS_SID, num_cookies, cookies));
}
# Set the default printer/job policies...
<Policy default>
# Job-related operations must be done by the owner or an administrator...
+ <Limit Create-Job Print-Job Print-URI Validate-Job>
+ Order deny,allow
+ </Limit>
+
<Limit Send-Document Send-URI Hold-Job Release-Job Restart-Job Purge-Jobs Set-Job-Attributes Create-Job-Subscription Renew-Subscription Cancel-Subscription Get-Notifications Reprocess-Job Cancel-Current-Job Suspend-Current-Job Resume-Job Cancel-My-Jobs Close-Job CUPS-Move-Job CUPS-Get-Document>
Require user @OWNER @SYSTEM
Order deny,allow
# Set the authenticated printer/job policies...
<Policy authenticated>
# Job-related operations must be done by the owner or an administrator...
- <Limit Create-Job Print-Job Print-URI>
+ <Limit Create-Job Print-Job Print-URI Validate-Job>
AuthType Default
Order deny,allow
</Limit>
AC_DEFINE(HAVE_TM_GMTOFF),
AC_MSG_RESULT(no))
+dnl See if the stat structure has the st_gen member...
+AC_MSG_CHECKING(for st_gen member in stat structure)
+AC_TRY_COMPILE([#include <sys/stat.h>],[struct stat t;
+ int o = t.st_gen;],
+ AC_MSG_RESULT(yes)
+ AC_DEFINE(HAVE_ST_GEN),
+ AC_MSG_RESULT(no))
+
dnl See if we have the removefile(3) function for securely removing files
AC_CHECK_FUNCS(removefile)
if test x$enable_shared = xno; then
LINKCUPS="../cups/lib$cupsbase.a"
LINKCUPSIMAGE="../filter/libcupsimage.a"
+
+ EXTLINKCUPS="-lcups"
+ EXTLINKCUPSDRIVER="-lcupsdriver"
+ EXTLINKCUPSIMAGE="-lcupsimage"
else
if test $uname = AIX; then
LINKCUPS="-l${cupsbase}_s"
LINKCUPSIMAGE="-lcupsimage_s"
+
+ EXTLINKCUPS="-lcups_s"
+ EXTLINKCUPSDRIVER="-lcupsdriver_s"
+ EXTLINKCUPSIMAGE="-lcupsimage_s"
else
LINKCUPS="-l${cupsbase}"
LINKCUPSIMAGE="-lcupsimage"
+
+ EXTLINKCUPS="-lcups"
+ EXTLINKCUPSDRIVER="-lcupsdriver"
+ EXTLINKCUPSIMAGE="-lcupsimage"
fi
fi
+AC_SUBST(EXTLINKCUPS)
+AC_SUBST(EXTLINKCUPSDRIVER)
+AC_SUBST(EXTLINKCUPSIMAGE)
AC_SUBST(LINKCUPS)
AC_SUBST(LINKCUPSIMAGE)
AC_DEFINE(HAVE_CDSASSL)
dnl Check for the various security headers...
+ AC_CHECK_HEADER(Security/SecItemPriv.h,
+ AC_DEFINE(HAVE_SECITEMPRIV_H))
AC_CHECK_HEADER(Security/SecPolicy.h,
AC_DEFINE(HAVE_SECPOLICY_H))
AC_CHECK_HEADER(Security/SecPolicyPriv.h,
AC_MSG_RESULT(yes)
else
AC_MSG_RESULT(no)
+ fi
+
+ dnl Check for SecPolicyCreateSSL...
+ AC_MSG_CHECKING(for SecPolicyCreateSSL)
+ if test $uversion -ge 100; then
+ AC_DEFINE(HAVE_SECPOLICYCREATESSL)
+ AC_MSG_RESULT(yes)
+ else
+ AC_MSG_RESULT(no)
fi])
fi
fi
AC_PATH_PROG(LIBGNUTLSCONFIG,libgnutls-config)
AC_PATH_PROG(LIBGCRYPTCONFIG,libgcrypt-config)
if $PKGCONFIG --exists gnutls; then
- have_ssl=1
- SSLLIBS=`$PKGCONFIG --libs gnutls`
- SSLFLAGS=`$PKGCONFIG --cflags gnutls`
- AC_DEFINE(HAVE_SSL)
- AC_DEFINE(HAVE_GNUTLS)
- elif "x$LIBGNUTLSCONFIG" != x; then
- have_ssl=1
- SSLLIBS=`$LIBGNUTLSCONFIG --libs`
- SSLFLAGS=`$LIBGNUTLSCONFIG --cflags`
- AC_DEFINE(HAVE_SSL)
- AC_DEFINE(HAVE_GNUTLS)
+ if test "x$have_pthread" = xyes; then
+ AC_MSG_WARN([The current version of GNU TLS cannot be made thread-safe.])
+ else
+ have_ssl=1
+ SSLLIBS=`$PKGCONFIG --libs gnutls`
+ SSLFLAGS=`$PKGCONFIG --cflags gnutls`
+ AC_DEFINE(HAVE_SSL)
+ AC_DEFINE(HAVE_GNUTLS)
+ fi
+ elif test "x$LIBGNUTLSCONFIG" != x; then
+ if test "x$have_pthread" = xyes; then
+ AC_MSG_WARN([The current version of GNU TLS cannot be made thread-safe.])
+ else
+ have_ssl=1
+ SSLLIBS=`$LIBGNUTLSCONFIG --libs`
+ SSLFLAGS=`$LIBGNUTLSCONFIG --cflags`
+ AC_DEFINE(HAVE_SSL)
+ AC_DEFINE(HAVE_GNUTLS)
+ fi
fi
if test $have_ssl = 1; then
if $PKGCONFIG --exists gcrypt; then
SSLLIBS="$SSLLIBS `$PKGCONFIG --libs gcrypt`"
SSLFLAGS="$SSLFLAGS `$PKGCONFIG --cflags gcrypt`"
- elif "x$LIBGCRYPTCONFIG" != x; then
+ elif test "x$LIBGCRYPTCONFIG" != x; then
SSLLIBS="$SSLLIBS `$LIBGCRYPTCONFIG --libs`"
SSLFLAGS="$SSLFLAGS `$LIBGCRYPTCONFIG --cflags`"
fi
*/
#undef HAVE_AUTHORIZATION_H
+#undef HAVE_SECITEMPRIV_H
#undef HAVE_SECPOLICY_H
#undef HAVE_SECPOLICYPRIV_H
#undef HAVE_SECBASEPRIV_H
#undef HAVE_SECIDENTITYSEARCHCREATEWITHPOLICY
+/*
+ * Do we have the SecPolicyCreateSSL function?
+ */
+
+#undef HAVE_SECPOLICYCREATESSL
+
+
/*
* Do we have the SLP library?
*/
#undef HAVE_SYS_IOCTL_H
+/*
+ * Does the "stat" structure contain the "st_gen" member?
+ */
+
+#undef HAVE_ST_GEN
+
+
/*
* Does the "tm" structure contain the "tm_gmtoff" member?
*/
sinclude(config-scripts/cups-slp.m4)
sinclude(config-scripts/cups-gssapi.m4)
sinclude(config-scripts/cups-ldap.m4)
+sinclude(config-scripts/cups-threads.m4)
sinclude(config-scripts/cups-ssl.m4)
sinclude(config-scripts/cups-pam.m4)
-sinclude(config-scripts/cups-threads.m4)
sinclude(config-scripts/cups-largefile.m4)
sinclude(config-scripts/cups-dnssd.m4)
sinclude(config-scripts/cups-launchd.m4)
man/cupsaddsmb.man
man/cupsd.conf.man
man/cupsd.man
- man/drv.man
man/lpoptions.man
scheduler/cups-lpd.xinetd
scheduler/cups.sh
#
# CUPS configuration utility.
#
-# Copyright 2007-2008 by Apple Inc.
+# Copyright 2007-2010 by Apple Inc.
# Copyright 2001-2006 by Easy Software Products, all rights reserved.
#
# These coded instructions, statements, and computer programs are the
#
VERSION="@CUPS_VERSION@"
-APIVERSION="1.4"
+APIVERSION="1.5"
BUILD="@CUPS_BUILD@"
prefix=@prefix@
;;
--libs)
if test $static = no; then
- libs="-lcups $LIBS";
+ libs="@EXTLINKCUPS@ $LIBS";
if test $image = yes; then
- libs="-lcupsimage $libs"
+ libs="@EXTLINKCUPSIMAGE@ $libs"
fi
if test $driver = yes; then
- libs="-lcupsdriver $libs"
+ libs="@EXTLINKCUPSDRIVER@ $libs"
fi
else
libs="$libdir/libcups.a $LIBS";
CFArrayRemoveValueAtIndex(newlocations, locindex);
}
else
- newlocations = CFArrayCreateMutable(kCFAllocatorDefault, 0, NULL);
+ newlocations = CFArrayCreateMutable(kCFAllocatorDefault, 0,
+ &kCFTypeArrayCallBacks);
newlocation = CFDictionaryCreateMutable(kCFAllocatorDefault, 0,
&kCFTypeDictionaryKeyCallBacks,
*/
#include "file-private.h"
+#include <sys/stat.h>
+#include <sys/types.h>
/*
static ssize_t cups_compress(cups_file_t *fp, const char *buf, size_t bytes);
#endif /* HAVE_LIBZ */
static ssize_t cups_fill(cups_file_t *fp);
+static int cups_open(const char *filename, int mode);
static ssize_t cups_read(cups_file_t *fp, char *buf, size_t bytes);
static ssize_t cups_write(cups_file_t *fp, const char *buf, size_t bytes);
switch (*mode)
{
case 'a' : /* Append file */
- fd = open(filename, O_RDWR | O_CREAT | O_APPEND | O_LARGEFILE | O_BINARY, 0666);
+ fd = cups_open(filename,
+ O_RDWR | O_CREAT | O_APPEND | O_LARGEFILE | O_BINARY);
break;
case 'r' : /* Read file */
break;
case 'w' : /* Write file */
- fd = open(filename, O_WRONLY | O_TRUNC | O_CREAT | O_LARGEFILE | O_BINARY, 0666);
+ fd = cups_open(filename, O_WRONLY | O_LARGEFILE | O_BINARY);
+ if (fd < 0 && errno == ENOENT)
+ {
+ fd = cups_open(filename,
+ O_WRONLY | O_CREAT | O_EXCL | O_LARGEFILE | O_BINARY);
+ if (fd < 0 && errno == EEXIST)
+ fd = cups_open(filename, O_WRONLY | O_LARGEFILE | O_BINARY);
+ }
+
+ if (fd >= 0)
+#ifdef WIN32
+ _chsize(fd, 0);
+#else
+ ftruncate(fd, 0);
+#endif /* WIN32 */
break;
case 's' : /* Read/write socket */
}
+/*
+ * 'cups_open()' - Safely open a file for writing.
+ *
+ * We don't allow appending to directories or files that are hard-linked or
+ * symlinked.
+ */
+
+static int /* O - File descriptor or -1 otherwise */
+cups_open(const char *filename, /* I - Filename */
+ int mode) /* I - Open mode */
+{
+ int fd; /* File descriptor */
+ struct stat fileinfo; /* File information */
+#ifndef WIN32
+ struct stat linkinfo; /* Link information */
+#endif /* !WIN32 */
+
+
+ /*
+ * Open the file...
+ */
+
+ if ((fd = open(filename, mode, 0666)) < 0)
+ return (-1);
+
+ /*
+ * Then verify that the file descriptor doesn't point to a directory or hard-
+ * linked file.
+ */
+
+ if (fstat(fd, &fileinfo))
+ {
+ close(fd);
+ return (-1);
+ }
+
+ if (fileinfo.st_nlink != 1)
+ {
+ close(fd);
+ errno = EPERM;
+ return (-1);
+ }
+
+#ifdef WIN32
+ if (fileinfo.st_mode & _S_IFDIR)
+#else
+ if (S_ISDIR(fileinfo.st_mode))
+#endif /* WIN32 */
+ {
+ close(fd);
+ errno = EISDIR;
+ return (-1);
+ }
+
+#ifndef WIN32
+ /*
+ * Then use lstat to determine whether the filename is a symlink...
+ */
+
+ if (lstat(filename, &linkinfo))
+ {
+ close(fd);
+ return (-1);
+ }
+
+ if (S_ISLNK(linkinfo.st_mode) ||
+ fileinfo.st_dev != linkinfo.st_dev ||
+ fileinfo.st_ino != linkinfo.st_ino ||
+#ifdef HAVE_ST_GEN
+ fileinfo.st_gen != linkinfo.st_gen ||
+#endif /* HAVE_ST_GEN */
+ fileinfo.st_nlink != linkinfo.st_nlink ||
+ fileinfo.st_mode != linkinfo.st_mode)
+ {
+ /*
+ * Yes, don't allow!
+ */
+
+ close(fd);
+ errno = EPERM;
+ return (-1);
+ }
+#endif /* !WIN32 */
+
+ return (fd);
+}
+
+
/*
* 'cups_read()' - Read from a file descriptor.
*/
cupsFileClose(cg->stdio_files[1]);
cupsFileClose(cg->stdio_files[2]);
+# ifndef CUPS_LITE
cupsFreeOptions(cg->cupsd_num_settings, cg->cupsd_settings);
+# endif /* !CUPS_LITE */
free(cg);
}
if (strstr(hostname, "._tcp"))
{
#ifdef HAVE_DNSSD
+# ifdef WIN32
+# pragma comment(lib, "dnssd.lib")
+# endif /* WIN32 */
DNSServiceRef ref, /* DNS-SD master service reference */
domainref, /* DNS-SD service reference for domain */
localref; /* DNS-SD service reference for .local */
}
#ifdef WIN32
- WSAStartup(MAKEWORD(1,1), &winsockdata);
+ WSAStartup(MAKEWORD(2,2), &winsockdata);
#elif !defined(SO_NOSIGPIPE)
/*
HTTP_GATEWAY_TIMEOUT, /* Gateway connection timed out */
HTTP_NOT_SUPPORTED, /* HTTP version not supported */
- HTTP_AUTHORIZATION_CANCELED = 1000 /* User cancelled authorization */
+ HTTP_AUTHORIZATION_CANCELED = 1000 /* User canceled authorization */
} http_status_t;
/**** New in CUPS 1.2 ****/
ipp_attribute_t *prev; /* Previous attribute (for read) @since CUPS 1.2/Mac OS X 10.5@ */
-/**** New in CUPS 1.5 ****/
- int use; /* Use count */
+/**** New in CUPS 1.4.4 ****/
+ int use; /* Use count @since CUPS 1.4.4/Mac OS X 10.6.?@ */
};
{
if (encoding < 0 ||
encoding >= (sizeof(lang_encodings) / sizeof(const char *)))
+ {
+ DEBUG_printf(("1_cupsEncodingName(encoding=%d) = out of range (\"%s\")",
+ encoding, lang_encodings[0]));
return (lang_encodings[0]);
+ }
else
+ {
+ DEBUG_printf(("1_cupsEncodingName(encoding=%d) = \"%s\"",
+ encoding, lang_encodings[encoding]));
return (lang_encodings[encoding]);
+ }
}
int num_options, /* I - Number of options */
cups_option_t *options) /* I - Options */
{
- int i, j, k; /* Looping vars */
+ int i, j; /* Looping vars */
char *ptr, /* Pointer into string */
s[255]; /* Temporary string */
const char *val, /* Pointer into value */
*page_size, /* PageSize option */
*ppd_keyword; /* PPD keyword */
cups_option_t *optptr; /* Current option */
- ppd_option_t *option; /* PPD option */
ppd_attr_t *attr; /* PPD attribute */
- static const char * const duplex_options[] =
- { /* Duplex option names */
- "Duplex", /* Adobe */
- "EFDuplex", /* EFI */
- "EFDuplexing", /* EFI */
- "KD03Duplex", /* Kodak */
- "JCLDuplex" /* Samsung */
- };
- static const char * const duplex_one[] =
- { /* one-sided names */
- "None",
- "False"
- };
- static const char * const duplex_two_long[] =
- { /* two-sided-long-edge names */
- "DuplexNoTumble", /* Adobe */
- "LongEdge", /* EFI */
- "Top" /* EFI */
- };
- static const char * const duplex_two_short[] =
- { /* two-sided-long-edge names */
- "DuplexTumble", /* Adobe */
- "ShortEdge", /* EFI */
- "Bottom" /* EFI */
- };
/*
*/
for (i = num_options, optptr = options; i > 0; i --, optptr ++)
- if (!strcasecmp(optptr->name, "media"))
+ if (!strcasecmp(optptr->name, "media") ||
+ !strcasecmp(optptr->name, "output-bin") ||
+ !strcasecmp(optptr->name, "output-mode") ||
+ !strcasecmp(optptr->name, "sides"))
continue;
- else if (!strcasecmp(optptr->name, "sides"))
- {
- for (j = 0;
- j < (int)(sizeof(duplex_options) / sizeof(duplex_options[0]));
- j ++)
- if (cupsGetOption(duplex_options[j], num_options, options))
- break;
-
- if (j < (int)(sizeof(duplex_options) / sizeof(duplex_options[0])))
- {
- /*
- * Don't override the PPD option with the IPP attribute...
- */
-
- continue;
- }
-
- if (!strcasecmp(optptr->value, "one-sided"))
- {
- /*
- * Mark the appropriate duplex option for one-sided output...
- */
-
- for (j = 0;
- j < (int)(sizeof(duplex_options) / sizeof(duplex_options[0]));
- j ++)
- if ((option = ppdFindOption(ppd, duplex_options[j])) != NULL)
- break;
-
- if (j < (int)(sizeof(duplex_options) / sizeof(duplex_options[0])))
- {
- for (k = 0;
- k < (int)(sizeof(duplex_one) / sizeof(duplex_one[0]));
- k ++)
- if (ppdFindChoice(option, duplex_one[k]))
- {
- ppd_mark_option(ppd, duplex_options[j], duplex_one[k]);
- break;
- }
- }
- }
- else if (!strcasecmp(optptr->value, "two-sided-long-edge"))
- {
- /*
- * Mark the appropriate duplex option for two-sided-long-edge output...
- */
-
- for (j = 0;
- j < (int)(sizeof(duplex_options) / sizeof(duplex_options[0]));
- j ++)
- if ((option = ppdFindOption(ppd, duplex_options[j])) != NULL)
- break;
-
- if (j < (int)(sizeof(duplex_options) / sizeof(duplex_options[0])))
- {
- for (k = 0;
- k < (int)(sizeof(duplex_two_long) / sizeof(duplex_two_long[0]));
- k ++)
- if (ppdFindChoice(option, duplex_two_long[k]))
- {
- ppd_mark_option(ppd, duplex_options[j], duplex_two_long[k]);
- break;
- }
- }
- }
- else if (!strcasecmp(optptr->value, "two-sided-short-edge"))
- {
- /*
- * Mark the appropriate duplex option for two-sided-short-edge output...
- */
-
- for (j = 0;
- j < (int)(sizeof(duplex_options) / sizeof(duplex_options[0]));
- j ++)
- if ((option = ppdFindOption(ppd, duplex_options[j])) != NULL)
- break;
-
- if (j < (int)(sizeof(duplex_options) / sizeof(duplex_options[0])))
- {
- for (k = 0;
- k < (int)(sizeof(duplex_two_short) / sizeof(duplex_two_short[0]));
- k ++)
- if (ppdFindChoice(option, duplex_two_short[k]))
- {
- ppd_mark_option(ppd, duplex_options[j], duplex_two_short[k]);
- break;
- }
- }
- }
- }
else if (!strcasecmp(optptr->name, "resolution") ||
!strcasecmp(optptr->name, "printer-resolution"))
{
ppd_mark_option(ppd, "CNRes_PGP", optptr->value);
/* Canon */
}
- else if (!strcasecmp(optptr->name, "output-bin"))
- {
- if (!cupsGetOption("OutputBin", num_options, options) &&
- (ppd_keyword = _pwgGetOutputBin((_pwg_t *)ppd->pwg,
- optptr->value)) != NULL)
- ppd_mark_option(ppd, "OutputBin", ppd_keyword);
- }
else if (!strcasecmp(optptr->name, "multiple-document-handling"))
{
if (!cupsGetOption("Collate", num_options, options) &&
* This function looks for strings of the form:
*
* *option choice ... *optionN choiceN
+ * property value ... propertyN valueN
*
* It stops when it finds a string that doesn't match this format.
*/
_ppdParseOptions(
const char *s, /* I - String to parse */
int num_options, /* I - Number of options */
- cups_option_t **options) /* IO - Options */
+ cups_option_t **options, /* IO - Options */
+ _ppd_parse_t which) /* I - What to parse */
{
- char option[PPD_MAX_NAME], /* Current option */
- choice[PPD_MAX_NAME], /* Current choice */
+ char option[PPD_MAX_NAME + 1], /* Current option/property */
+ choice[PPD_MAX_NAME], /* Current choice/value */
*ptr; /* Pointer into option or choice */
return (num_options);
/*
- * Read all of the "*Option Choice" pairs from the string, marking PPD
- * options as we go...
+ * Read all of the "*Option Choice" and "property value" pairs from the
+ * string, add them to an options array as we go...
*/
while (*s)
while (isspace(*s & 255))
s ++;
- if (*s != '*')
- break;
-
/*
- * Get the option name...
+ * Get the option/property name...
*/
- s ++;
ptr = option;
while (*s && !isspace(*s & 255) && ptr < (option + sizeof(option) - 1))
*ptr++ = *s++;
- if (ptr == s)
+ if (ptr == s || !isspace(*s & 255))
break;
*ptr = '\0';
while (*s && !isspace(*s & 255) && ptr < (choice + sizeof(choice) - 1))
*ptr++ = *s++;
+ if (!isspace(*s & 255) && *s)
+ break;
+
*ptr = '\0';
/*
* Add it to the options array...
*/
- num_options = cupsAddOption(option, choice, num_options, options);
+ if (option[0] == '*' && which != _PPD_PARSE_PROPERTIES)
+ num_options = cupsAddOption(option + 1, choice, num_options, options);
+ else if (option[0] != '*' && which != _PPD_PARSE_OPTIONS)
+ num_options = cupsAddOption(option, choice, num_options, options);
}
return (num_options);
return;
options = NULL;
- num_options = _ppdParseOptions(s, 0, &options);
+ num_options = _ppdParseOptions(s, 0, &options, 0);
for (i = num_options, option = options; i > 0; i --, option ++)
ppd_mark_option(ppd, option->name, option->value);
* Include necessary headers...
*/
+# include <cups/cups.h>
# include <cups/ppd.h>
# include "pwg-private.h"
/*
- * Structures...
+ * Types and structures...
*/
+typedef enum _ppd_parse_e /**** Selector for _ppdParseOptions ****/
+{
+ _PPD_PARSE_OPTIONS, /* Parse only the options */
+ _PPD_PARSE_PROPERTIES, /* Parse only the properties */
+ _PPD_PARSE_ALL /* Parse everything */
+} _ppd_parse_t;
+
typedef struct _ppd_cups_uiconst_s /**** Constraint from cupsUIConstraints ****/
{
ppd_option_t *option; /* Constrained option */
_ppd_cups_uiconst_t *constraints; /* Constraints */
} _ppd_cups_uiconsts_t;
+typedef enum _pwg_output_mode_e /**** PWG output-mode indices ****/
+{
+ _PWG_OUTPUT_MODE_MONOCHROME = 0, /* output-mode=monochrome */
+ _PWG_OUTPUT_MODE_COLOR, /* output-mode=color */
+ _PWG_OUTPUT_MODE_MAX
+} _pwg_output_mode_t;
+
+typedef enum _pwg_print_quality_e /**** PWG print-quality indices ****/
+{
+ _PWG_PRINT_QUALITY_DRAFT = 0, /* print-quality=3 */
+ _PWG_PRINT_QUALITY_NORMAL, /* print-quality=4 */
+ _PWG_PRINT_QUALITY_HIGH, /* print-quality=5 */
+ _PWG_PRINT_QUALITY_MAX
+} _pwg_print_quality_t;
+
+typedef struct _pwg_s /**** PWG-PPD conversion data ****/
+{
+ int num_bins; /* Number of output bins */
+ _pwg_map_t *bins; /* Output bins */
+ int num_sizes; /* Number of media sizes */
+ _pwg_size_t *sizes; /* Media sizes */
+ int custom_max_width, /* Maximum custom width in 2540ths */
+ custom_max_length, /* Maximum custom length in 2540ths */
+ custom_min_width, /* Minimum custom width in 2540ths */
+ custom_min_length; /* Minimum custom length in 2540ths */
+ char *custom_max_keyword, /* Maximum custom size PWG keyword */
+ *custom_min_keyword, /* Minimum custom size PWG keyword */
+ custom_ppd_size[41]; /* Custom PPD size name */
+ _pwg_size_t custom_size; /* Custom size record */
+ int num_sources; /* Number of media sources */
+ _pwg_map_t *sources; /* Media sources */
+ int num_types; /* Number of media types */
+ _pwg_map_t *types; /* Media types */
+ int num_presets[_PWG_OUTPUT_MODE_MAX][_PWG_PRINT_QUALITY_MAX];
+ /* Number of output-mode/print-quality options */
+ cups_option_t *presets[_PWG_OUTPUT_MODE_MAX][_PWG_PRINT_QUALITY_MAX];
+ /* output-mode/print-quality options */
+ char *sides_option, /* PPD option for sides */
+ *sides_1sided, /* Choice for one-sided */
+ *sides_2sided_long, /* Choice for two-sided-long-edge */
+ *sides_2sided_short; /* Choice for two-sided-short-edge */
+} _pwg_t;
+
/*
* Prototypes...
char *buffer,
size_t bufsize);
extern int _ppdParseOptions(const char *s, int num_options,
- cups_option_t **options);
+ cups_option_t **options,
+ _ppd_parse_t which);
+extern _pwg_t *_pwgCreateWithFile(const char *filename);
extern _pwg_t *_pwgCreateWithPPD(ppd_file_t *ppd);
+extern void _pwgDestroy(_pwg_t *pwg);
extern const char *_pwgGetBin(_pwg_t *pwg, const char *output_bin);
extern const char *_pwgGetInputSlot(_pwg_t *pwg, ipp_t *job,
const char *keyword);
char *name, size_t namesize);
extern const char *_pwgPageSizeForMedia(_pwg_media_t *media,
char *name, size_t namesize);
+extern int _pwgWriteFile(_pwg_t *pwg, const char *filename);
/*
cups_array_t *cups_uiconstraints; /* cupsUIConstraints @since CUPS 1.4/Mac OS X 10.6@ @private@ */
/**** New in CUPS 1.5 ****/
- void *pwg; /* PWG to/from PPD mappings */
+ void *pwg; /* PWG to/from PPD mappings @since CUPS 1.5@ @private@ */
} ppd_file_t;
num_sizes, /* Number of sizes in file */
num_sources, /* Number of sources in file */
num_types; /* Number of types in file */
- char line[512], /* Current line */
+ char line[2048], /* Current line */
*value, /* Pointer to value in line */
+ *valueptr, /* Pointer into value */
pwg_keyword[128], /* PWG keyword */
ppd_keyword[PPD_MAX_NAME];
/* PPD keyword */
+ _pwg_output_mode_t output_mode; /* Output mode for preset */
+ _pwg_print_quality_t print_quality; /* Print quality for preset */
DEBUG_printf(("_pwgCreateWithFile(filename=\"%s\")", filename));
pwg->num_types ++;
}
+ else if (!strcasecmp(line, "Preset"))
+ {
+ /*
+ * Preset output-mode print-quality name=value ...
+ */
+
+ output_mode = (_pwg_output_mode_t)strtol(value, &valueptr, 10);
+ print_quality = (_pwg_print_quality_t)strtol(valueptr, &valueptr, 10);
+
+ if (output_mode < _PWG_OUTPUT_MODE_MONOCHROME ||
+ output_mode >= _PWG_OUTPUT_MODE_MAX ||
+ print_quality < _PWG_PRINT_QUALITY_DRAFT ||
+ print_quality >= _PWG_PRINT_QUALITY_MAX ||
+ valueptr == value || !*valueptr)
+ {
+ DEBUG_printf(("_pwgCreateWithFile: Bad Preset on line %d.", linenum));
+ _cupsSetError(IPP_INTERNAL_ERROR, _("Bad PWG mapping file."), 1);
+ goto create_error;
+ }
+
+ pwg->num_presets[output_mode][print_quality] =
+ cupsParseOptions(valueptr, 0,
+ pwg->presets[output_mode] + print_quality);
+ }
+ else if (!strcasecmp(line, "SidesOption"))
+ pwg->sides_option = _cupsStrAlloc(value);
+ else if (!strcasecmp(line, "Sides1Sided"))
+ pwg->sides_1sided = _cupsStrAlloc(value);
+ else if (!strcasecmp(line, "Sides2SidedLong"))
+ pwg->sides_2sided_long = _cupsStrAlloc(value);
+ else if (!strcasecmp(line, "Sides2SidedShort"))
+ pwg->sides_2sided_short = _cupsStrAlloc(value);
else
{
DEBUG_printf(("_pwgCreateWithFile: Unknown %s on line %d.", line,
_pwgWriteFile(_pwg_t *pwg, /* I - PWG mapping data */
const char *filename) /* I - File to write */
{
- int i; /* Looping var */
+ int i, j, k; /* Looping vars */
cups_file_t *fp; /* Output file */
_pwg_size_t *size; /* Current size */
_pwg_map_t *map; /* Current map */
+ cups_option_t *option; /* Current option */
/*
cupsFilePrintf(fp, "Type %s %s\n", map->pwg, map->ppd);
}
+ /*
+ * Presets...
+ */
+
+ for (i = _PWG_OUTPUT_MODE_MONOCHROME; i < _PWG_OUTPUT_MODE_MAX; i ++)
+ for (j = _PWG_PRINT_QUALITY_DRAFT; i < _PWG_PRINT_QUALITY_MAX; i ++)
+ if (pwg->num_presets[i][j])
+ {
+ cupsFilePrintf(fp, "Preset %d %d", i, j);
+ for (k = pwg->num_presets[i][j], option = pwg->presets[i][j];
+ k > 0;
+ k --, option ++)
+ cupsFilePrintf(fp, " %s=%s", option->name, option->value);
+ cupsFilePutChar(fp, '\n');
+ }
+
+ /*
+ * Duplex/sides...
+ */
+
+ if (pwg->sides_option)
+ cupsFilePrintf(fp, "SidesOption %s\n", pwg->sides_option);
+
+ if (pwg->sides_1sided)
+ cupsFilePrintf(fp, "Sides1Sided %s\n", pwg->sides_1sided);
+
+ if (pwg->sides_2sided_long)
+ cupsFilePrintf(fp, "Sides2SidedLong %s\n", pwg->sides_2sided_long);
+
+ if (pwg->sides_2sided_short)
+ cupsFilePrintf(fp, "Sides2SidedShort %s\n", pwg->sides_2sided_short);
+
/*
* Close and return...
*/
_pwg_t * /* O - PWG mapping data */
_pwgCreateWithPPD(ppd_file_t *ppd) /* I - PPD file */
{
- int i, j; /* Looping vars */
- _pwg_t *pwg; /* PWG mapping data */
- ppd_option_t *input_slot, /* InputSlot option */
- *media_type, /* MediaType option */
- *output_bin; /* OutputBin option */
- ppd_choice_t *choice; /* Current InputSlot/MediaType */
- _pwg_map_t *map; /* Current source/type map */
- ppd_size_t *ppd_size; /* Current PPD size */
- _pwg_size_t *pwg_size; /* Current PWG size */
- char pwg_keyword[3 + PPD_MAX_NAME + 1 + 12 + 1 + 12 + 3],
+ int i, j; /* Looping vars */
+ _pwg_t *pwg; /* PWG mapping data */
+ ppd_option_t *input_slot, /* InputSlot option */
+ *media_type, /* MediaType option */
+ *output_bin, /* OutputBin option */
+ *color_model, /* ColorModel option */
+ *duplex; /* Duplex option */
+ ppd_choice_t *choice; /* Current InputSlot/MediaType */
+ _pwg_map_t *map; /* Current source/type map */
+ ppd_attr_t *ppd_attr; /* Current PPD preset attribute */
+ int num_options; /* Number of preset options and props */
+ cups_option_t *options; /* Preset options and properties */
+ ppd_size_t *ppd_size; /* Current PPD size */
+ _pwg_size_t *pwg_size; /* Current PWG size */
+ char pwg_keyword[3 + PPD_MAX_NAME + 1 + 12 + 1 + 12 + 3],
/* PWG keyword string */
- ppd_name[PPD_MAX_NAME]; /* Normalized PPD name */
- const char *pwg_name; /* Standard PWG media name */
- _pwg_media_t *pwg_media; /* PWG media data */
+ ppd_name[PPD_MAX_NAME];
+ /* Normalized PPD name */
+ const char *pwg_name; /* Standard PWG media name */
+ _pwg_media_t *pwg_media; /* PWG media data */
+ _pwg_output_mode_t pwg_output_mode;/* output-mode index */
+ _pwg_print_quality_t pwg_print_quality;
+ /* print-quality index */
DEBUG_printf(("_pwgCreateWithPPD(ppd=%p)", ppd));
}
}
+ if ((ppd_attr = ppdFindAttr(ppd, "APPrinterPreset", NULL)) != NULL)
+ {
+ /*
+ * Copy and convert APPrinterPreset (output-mode + print-quality) data...
+ */
+
+ const char *quality, /* com.apple.print.preset.quality value */
+ *output_mode, /* com.apple.print.preset.output-mode value */
+ *color_model_val; /* ColorModel choice */
+
+
+ do
+ {
+ num_options = _ppdParseOptions(ppd_attr->value, 0, &options,
+ _PPD_PARSE_ALL);
+
+ if ((quality = cupsGetOption("com.apple.print.preset.quality",
+ num_options, options)) != NULL)
+ {
+ /*
+ * Get the print-quality for this preset...
+ */
+
+ if (!strcmp(quality, "low"))
+ pwg_print_quality = _PWG_PRINT_QUALITY_DRAFT;
+ else if (!strcmp(quality, "high"))
+ pwg_print_quality = _PWG_PRINT_QUALITY_HIGH;
+ else
+ pwg_print_quality = _PWG_PRINT_QUALITY_NORMAL;
+
+ /*
+ * Get the output mode for this preset...
+ */
+
+ output_mode = cupsGetOption("com.apple.print.preset.output-mode",
+ num_options, options);
+ color_model_val = cupsGetOption("ColorModel", num_options, options);
+
+ if (output_mode)
+ {
+ if (!strcmp(output_mode, "monochrome"))
+ pwg_output_mode = _PWG_OUTPUT_MODE_MONOCHROME;
+ else
+ pwg_output_mode = _PWG_OUTPUT_MODE_COLOR;
+ }
+ else if (color_model_val)
+ {
+ if (!strcasecmp(color_model_val, "Gray"))
+ pwg_output_mode = _PWG_OUTPUT_MODE_MONOCHROME;
+ else
+ pwg_output_mode = _PWG_OUTPUT_MODE_COLOR;
+ }
+ else
+ pwg_output_mode = _PWG_OUTPUT_MODE_COLOR;
+
+ /*
+ * Save the options for this combination as needed...
+ */
+
+ if (!pwg->num_presets[pwg_output_mode][pwg_print_quality])
+ pwg->num_presets[pwg_output_mode][pwg_print_quality] =
+ _ppdParseOptions(ppd_attr->value, 0,
+ pwg->presets[pwg_output_mode] +
+ pwg_print_quality, _PPD_PARSE_OPTIONS);
+ }
+
+ cupsFreeOptions(num_options, options);
+ }
+ while ((ppd_attr = ppdFindNextAttr(ppd, "APPrinterPreset", NULL)) != NULL);
+ }
+
+ if (!pwg->num_presets[_PWG_OUTPUT_MODE_MONOCHROME][_PWG_PRINT_QUALITY_DRAFT] &&
+ !pwg->num_presets[_PWG_OUTPUT_MODE_MONOCHROME][_PWG_PRINT_QUALITY_NORMAL] &&
+ !pwg->num_presets[_PWG_OUTPUT_MODE_MONOCHROME][_PWG_PRINT_QUALITY_HIGH] &&
+ (color_model = ppdFindOption(ppd, "ColorModel")) != NULL &&
+ ppdFindChoice(color_model, "Gray"))
+ {
+ /*
+ * Copy and convert ColorModel (output-mode) data...
+ */
+
+ cups_option_t *coption, /* Color option */
+ *moption; /* Monochrome option */
+
+ for (pwg_print_quality = _PWG_PRINT_QUALITY_DRAFT;
+ pwg_print_quality < _PWG_PRINT_QUALITY_MAX;
+ pwg_print_quality ++)
+ {
+ if (pwg->num_presets[_PWG_OUTPUT_MODE_COLOR][pwg_print_quality])
+ {
+ /*
+ * Copy the color options...
+ */
+
+ num_options = pwg->num_presets[_PWG_OUTPUT_MODE_COLOR]
+ [pwg_print_quality];
+ options = calloc(sizeof(cups_option_t), num_options);
+
+ if (options)
+ {
+ for (i = num_options, moption = options,
+ coption = pwg->presets[_PWG_OUTPUT_MODE_COLOR]
+ [pwg_print_quality];
+ i > 0;
+ i --, moption ++, coption ++)
+ {
+ moption->name = _cupsStrRetain(coption->name);
+ moption->value = _cupsStrRetain(coption->value);
+ }
+
+ pwg->num_presets[_PWG_OUTPUT_MODE_MONOCHROME][pwg_print_quality] =
+ num_options;
+ pwg->presets[_PWG_OUTPUT_MODE_MONOCHROME][pwg_print_quality] =
+ options;
+ }
+ }
+ else if (pwg_print_quality != _PWG_PRINT_QUALITY_NORMAL)
+ continue;
+
+ /*
+ * Add ColorModel=Gray to the preset...
+ */
+
+ pwg->num_presets[_PWG_OUTPUT_MODE_MONOCHROME][pwg_print_quality] =
+ cupsAddOption("ColorModel", "Gray",
+ pwg->num_presets[_PWG_OUTPUT_MODE_MONOCHROME]
+ [pwg_print_quality],
+ pwg->presets[_PWG_OUTPUT_MODE_MONOCHROME] +
+ pwg_print_quality);
+ }
+ }
+
+ /*
+ * Copy and convert Duplex (sides) data...
+ */
+
+ if ((duplex = ppdFindOption(ppd, "Duplex")) == NULL)
+ if ((duplex = ppdFindOption(ppd, "JCLDuplex")) == NULL)
+ if ((duplex = ppdFindOption(ppd, "EFDuplex")) == NULL)
+ if ((duplex = ppdFindOption(ppd, "EFDuplexing")) == NULL)
+ duplex = ppdFindOption(ppd, "KD03Duplex");
+
+ if (duplex)
+ {
+ pwg->sides_option = _cupsStrAlloc(duplex->keyword);
+
+ for (i = duplex->num_choices, choice = duplex->choices;
+ i > 0;
+ i --, choice ++)
+ {
+ if ((!strcasecmp(choice->choice, "None") ||
+ !strcasecmp(choice->choice, "False")) && !pwg->sides_1sided)
+ pwg->sides_1sided = _cupsStrAlloc(choice->choice);
+ else if ((!strcasecmp(choice->choice, "DuplexNoTumble") ||
+ !strcasecmp(choice->choice, "LongEdge") ||
+ !strcasecmp(choice->choice, "Top")) && !pwg->sides_2sided_long)
+ pwg->sides_2sided_long = _cupsStrAlloc(choice->choice);
+ else if ((!strcasecmp(choice->choice, "DuplexTumble") ||
+ !strcasecmp(choice->choice, "ShortEdge") ||
+ !strcasecmp(choice->choice, "Bottom")) &&
+ !pwg->sides_2sided_short)
+ pwg->sides_2sided_short = _cupsStrAlloc(choice->choice);
+ }
+ }
+
return (pwg);
/*
* Types and structures...
*/
-# ifndef _CUPS_PPD_H_
-typedef struct ppd_file_s ppd_file_t;
-# endif /* _CUPS_PPD_H_ */
+typedef struct _pwg_map_s /**** Map element - PPD to/from PWG */
+{
+ char *pwg, /* PWG media keyword */
+ *ppd; /* PPD option keyword */
+} _pwg_map_t;
typedef struct _pwg_media_s /**** Common media size data ****/
{
length; /* Length in 2540ths */
} _pwg_media_t;
-typedef struct _pwg_map_s /**** Map element - PPD to/from PWG */
-{
- char *pwg, /* PWG media keyword */
- *ppd; /* PPD option keyword */
-} _pwg_map_t;
-
typedef struct _pwg_size_s /**** Size element - PPD to/from PWG */
{
_pwg_map_t map; /* Map element */
top; /* Top margin in 2540ths */
} _pwg_size_t;
-typedef struct _pwg_s /**** PWG-PPD conversion data ****/
-{
- int num_bins; /* Number of output bins */
- _pwg_map_t *bins; /* Output bins */
- int num_sizes; /* Number of media sizes */
- _pwg_size_t *sizes; /* Media sizes */
- int custom_max_width, /* Maximum custom width in 2540ths */
- custom_max_length, /* Maximum custom length in 2540ths */
- custom_min_width, /* Minimum custom width in 2540ths */
- custom_min_length; /* Minimum custom length in 2540ths */
- char *custom_max_keyword, /* Maximum custom size PWG keyword */
- *custom_min_keyword, /* Minimum custom size PWG keyword */
- custom_ppd_size[41]; /* Custom PPD size name */
- _pwg_size_t custom_size; /* Custom size record */
- int num_sources; /* Number of media sources */
- _pwg_map_t *sources; /* Media sources */
- int num_types; /* Number of media types */
- _pwg_map_t *types; /* Media types */
-} _pwg_t;
-
/*
* Functions...
*/
-extern _pwg_t *_pwgCreateWithFile(const char *filename);
-extern void _pwgDestroy(_pwg_t *pwg);
extern void _pwgGenerateSize(char *keyword, size_t keysize,
const char *prefix,
- const char *ppdname,
+ const char *name,
int width, int length);
extern int _pwgInitSize(_pwg_size_t *size, ipp_t *job,
int *margins_set);
extern _pwg_media_t *_pwgMediaForLegacy(const char *legacy);
extern _pwg_media_t *_pwgMediaForPWG(const char *pwg);
extern _pwg_media_t *_pwgMediaForSize(int width, int length);
-extern int _pwgWriteFile(_pwg_t *pwg, const char *filename);
# ifdef __cplusplus
/*
* "$Id$"
*
- * Raster file definitions for the Common UNIX Printing System (CUPS).
+ * Raster file definitions for CUPS.
*
- * Copyright 2007-2008 by Apple Inc.
+ * Copyright 2007-2010 by Apple Inc.
* Copyright 1997-2006 by Easy Software Products.
*
* This file is part of the CUPS Imaging library.
typedef enum cups_cspace_e /**** cupsColorSpace attribute values ****/
{
- CUPS_CSPACE_W = 0, /* Luminance */
- CUPS_CSPACE_RGB = 1, /* Red, green, blue */
- CUPS_CSPACE_RGBA = 2, /* Red, green, blue, alpha */
- CUPS_CSPACE_K = 3, /* Black */
- CUPS_CSPACE_CMY = 4, /* Cyan, magenta, yellow */
- CUPS_CSPACE_YMC = 5, /* Yellow, magenta, cyan */
- CUPS_CSPACE_CMYK = 6, /* Cyan, magenta, yellow, black */
- CUPS_CSPACE_YMCK = 7, /* Yellow, magenta, cyan, black */
- CUPS_CSPACE_KCMY = 8, /* Black, cyan, magenta, yellow */
- CUPS_CSPACE_KCMYcm = 9, /* Black, cyan, magenta, yellow, *
- * light-cyan, light-magenta */
- CUPS_CSPACE_GMCK = 10, /* Gold, magenta, yellow, black */
- CUPS_CSPACE_GMCS = 11, /* Gold, magenta, yellow, silver */
- CUPS_CSPACE_WHITE = 12, /* White ink (as black) */
- CUPS_CSPACE_GOLD = 13, /* Gold foil */
- CUPS_CSPACE_SILVER = 14, /* Silver foil */
+ CUPS_CSPACE_W = 0, /* Luminance (DeviceGray, gamma 2.2 by default) */
+ CUPS_CSPACE_RGB = 1, /* Red, green, blue (DeviceRGB, sRGB by default) */
+ CUPS_CSPACE_RGBA = 2, /* Red, green, blue, alpha (DeviceRGB, sRGB by default) */
+ CUPS_CSPACE_K = 3, /* Black (DeviceK) */
+ CUPS_CSPACE_CMY = 4, /* Cyan, magenta, yellow (DeviceCMY) */
+ CUPS_CSPACE_YMC = 5, /* Yellow, magenta, cyan @deprecated@ */
+ CUPS_CSPACE_CMYK = 6, /* Cyan, magenta, yellow, black (DeviceCMYK) */
+ CUPS_CSPACE_YMCK = 7, /* Yellow, magenta, cyan, black @deprecated@ */
+ CUPS_CSPACE_KCMY = 8, /* Black, cyan, magenta, yellow @deprecated@ */
+ CUPS_CSPACE_KCMYcm = 9, /* Black, cyan, magenta, yellow, light-cyan, light-magenta @deprecated@ */
+ CUPS_CSPACE_GMCK = 10, /* Gold, magenta, yellow, black @deprecated@ */
+ CUPS_CSPACE_GMCS = 11, /* Gold, magenta, yellow, silver @deprecated@ */
+ CUPS_CSPACE_WHITE = 12, /* White ink (as black) @deprecated@ */
+ CUPS_CSPACE_GOLD = 13, /* Gold foil @deprecated@ */
+ CUPS_CSPACE_SILVER = 14, /* Silver foil @deprecated@ */
CUPS_CSPACE_CIEXYZ = 15, /* CIE XYZ @since CUPS 1.1.19/Mac OS X 10.3@ */
CUPS_CSPACE_CIELab = 16, /* CIE Lab @since CUPS 1.1.19/Mac OS X 10.3@ */
- CUPS_CSPACE_RGBW = 17, /* Red, green, blue, white @since CUPS 1.2/Mac OS X 10.5@ */
+ CUPS_CSPACE_RGBW = 17, /* Red, green, blue, white (DeviceRGB, sRGB by default) @since CUPS 1.2/Mac OS X 10.5@ */
+ CUPS_CSPACE_SW = 18, /* Luminance (gamma 2.2) @since CUPS 1.4.5@ */
+ CUPS_CSPACE_SRGB = 19, /* Red, green, blue (sRGB) @since CUPS 1.4.5@ */
+ CUPS_CSPACE_ADOBERGB = 20, /* Red, green, blue (Adobe RGB) @since CUPS 1.4.5@ */
CUPS_CSPACE_ICC1 = 32, /* ICC-based, 1 color @since CUPS 1.1.19/Mac OS X 10.3@ */
CUPS_CSPACE_ICC2 = 33, /* ICC-based, 2 colors @since CUPS 1.1.19/Mac OS X 10.3@ */
CUPS_CSPACE_ICCC = 43, /* ICC-based, 12 colors @since CUPS 1.1.19/Mac OS X 10.3@ */
CUPS_CSPACE_ICCD = 44, /* ICC-based, 13 colors @since CUPS 1.1.19/Mac OS X 10.3@ */
CUPS_CSPACE_ICCE = 45, /* ICC-based, 14 colors @since CUPS 1.1.19/Mac OS X 10.3@ */
- CUPS_CSPACE_ICCF = 46 /* ICC-based, 15 colors @since CUPS 1.1.19/Mac OS X 10.3@ */
+ CUPS_CSPACE_ICCF = 46, /* ICC-based, 15 colors @since CUPS 1.1.19/Mac OS X 10.3@ */
+
+ CUPS_CSPACE_DEVICE1 = 48, /* DeviceN, 1 color @since CUPS 1.4.5@ */
+ CUPS_CSPACE_DEVICE2 = 49, /* DeviceN, 2 colors @since CUPS 1.4.5@ */
+ CUPS_CSPACE_DEVICE3 = 50, /* DeviceN, 3 colors @since CUPS 1.4.5@ */
+ CUPS_CSPACE_DEVICE4 = 51, /* DeviceN, 4 colors @since CUPS 1.4.5@ */
+ CUPS_CSPACE_DEVICE5 = 52, /* DeviceN, 5 colors @since CUPS 1.4.5@ */
+ CUPS_CSPACE_DEVICE6 = 53, /* DeviceN, 6 colors @since CUPS 1.4.5@ */
+ CUPS_CSPACE_DEVICE7 = 54, /* DeviceN, 7 colors @since CUPS 1.4.5@ */
+ CUPS_CSPACE_DEVICE8 = 55, /* DeviceN, 8 colors @since CUPS 1.4.5@ */
+ CUPS_CSPACE_DEVICE9 = 56, /* DeviceN, 9 colors @since CUPS 1.4.5@ */
+ CUPS_CSPACE_DEVICEA = 57, /* DeviceN, 10 colors @since CUPS 1.4.5@ */
+ CUPS_CSPACE_DEVICEB = 58, /* DeviceN, 11 colors @since CUPS 1.4.5@ */
+ CUPS_CSPACE_DEVICEC = 59, /* DeviceN, 12 colors @since CUPS 1.4.5@ */
+ CUPS_CSPACE_DEVICED = 60, /* DeviceN, 13 colors @since CUPS 1.4.5@ */
+ CUPS_CSPACE_DEVICEE = 61, /* DeviceN, 14 colors @since CUPS 1.4.5@ */
+ CUPS_CSPACE_DEVICEF = 62 /* DeviceN, 15 colors @since CUPS 1.4.5@ */
} cups_cspace_t;
typedef enum cups_cut_e /**** CutMedia attribute values ****/
#endif /* !WIN32 */
/*
- * Count lines in euc-jp.txt, rewind, then count again.
+ * Count lines in psglyphs, rewind, then count again.
*/
- fputs("\ncupsFileOpen(\"../data/euc-jp.txt\", \"r\"): ", stdout);
+ fputs("\ncupsFileOpen(\"../data/psglyphs\", \"r\"): ", stdout);
- if ((fp = cupsFileOpen("../data/euc-jp.txt", "r")) == NULL)
+ if ((fp = cupsFileOpen("../data/psglyphs", "r")) == NULL)
{
puts("FAIL");
status ++;
puts("PASS");
fputs("cupsFileGets: ", stdout);
- if ((count = count_lines(fp)) != 15184)
+ if ((count = count_lines(fp)) != 1051)
{
- printf("FAIL (got %d lines, expected 15184)\n", count);
+ printf("FAIL (got %d lines, expected 1051)\n", count);
status ++;
}
else
puts("PASS");
fputs("cupsFileGets: ", stdout);
- if ((count = count_lines(fp)) != 15184)
+ if ((count = count_lines(fp)) != 1051)
{
- printf("FAIL (got %d lines, expected 15184)\n", count);
+ printf("FAIL (got %d lines, expected 1051)\n", count);
status ++;
}
else
--- /dev/null
+/*
+ * "$Id$"
+ *
+ * Private threading definitions for CUPS.
+ *
+ * Copyright 2009-2010 by Apple Inc.
+ *
+ * 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"
+ * which should have been included with this file. If this file is
+ * file is missing or damaged, see the license at "http://www.cups.org/".
+ */
+
+#ifndef _CUPS_THREAD_PRIVATE_H_
+# define _CUPS_THREAD_PRIVATE_H_
+
+/*
+ * Include necessary headers...
+ */
+
+# include "config.h"
+
+
+/*
+ * C++ magic...
+ */
+
+# ifdef __cplusplus
+extern "C" {
+# endif /* __cplusplus */
+
+
+# ifdef HAVE_PTHREAD_H
+# include <pthread.h>
+typedef void *(*_cups_thread_func_t)(void *arg);
+typedef pthread_mutex_t _cups_mutex_t;
+typedef pthread_key_t _cups_threadkey_t;
+# define _CUPS_MUTEX_INITIALIZER PTHREAD_MUTEX_INITIALIZER
+# define _CUPS_THREADKEY_INITIALIZER -1
+# define _cupsThreadGetData(k) pthread_getspecific(k)
+# define _cupsThreadSetData(k,p) pthread_setspecific(k,p)
+
+# elif defined(WIN32)
+# include <winsock2.h>
+# include <windows.h>
+typedef void *(__stdcall *_cups_thread_func_t)(void *arg);
+typedef struct _cups_mutex_s
+{
+ int m_init; /* Flag for on-demand initialization */
+ CRITICAL_SECTION m_criticalSection;
+ /* Win32 Critical Section */
+} _cups_mutex_t;
+typedef DWORD _cups_threadkey_t;
+# define _CUPS_MUTEX_INITIALIZER { 0, 0 }
+# define _CUPS_THREADKEY_INITIALIZER 0
+# define _cupsThreadGetData(k) TlsGetValue(k)
+# define _cupsThreadSetData(k,p) TlsSetValue(k,p)
+
+# else
+typedef char _cups_mutex_t;
+typedef void *_cups_threadkey_t;
+# define _CUPS_MUTEX_INITIALIZER 0
+# define _CUPS_THREADKEY_INITIALIZER (void *)0
+# define _cupsThreadGetData(k) k
+# define _cupsThreadSetData(k,p) k=p
+# endif /* HAVE_PTHREAD_H */
+
+
+/*
+ * Functions...
+ */
+
+extern void _cupsMutexLock(_cups_mutex_t *mutex);
+extern void _cupsMutexUnlock(_cups_mutex_t *mutex);
+extern int _cupsThreadCreate(_cups_thread_func_t func, void *arg);
+
+
+# ifdef __cplusplus
+}
+# endif /* __cplusplus */
+#endif /* !_CUPS_THREAD_PRIVATE_H_ */
+
+/*
+ * End of "$Id$".
+ */
--- /dev/null
+/*
+ * "$Id$"
+ *
+ * Threading primitives for CUPS.
+ *
+ * Copyright 2009-2010 by Apple Inc.
+ *
+ * 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"
+ * which should have been included with this file. If this file is
+ * file is missing or damaged, see the license at "http://www.cups.org/".
+ *
+ * Contents:
+ *
+ * _cupsMutexLock() - Lock a mutex.
+ * _cupsMutexUnlock() - Unlock a mutex.
+ * _cupsThreadCreate() - Create a thread.
+ */
+
+/*
+ * Include necessary headers...
+ */
+
+#include "cups-private.h"
+#include "thread-private.h"
+
+
+#if defined(HAVE_PTHREAD_H)
+/*
+ * '_cupsMutexLock()' - Lock a mutex.
+ */
+
+void
+_cupsMutexLock(_cups_mutex_t *mutex) /* I - Mutex */
+{
+ pthread_mutex_lock(mutex);
+}
+
+
+/*
+ * '_cupsMutexUnlock()' - Unlock a mutex.
+ */
+
+void
+_cupsMutexUnlock(_cups_mutex_t *mutex) /* I - Mutex */
+{
+ pthread_mutex_unlock(mutex);
+}
+
+
+/*
+ * '_cupsThreadCreate()' - Create a thread.
+ */
+
+int /* O - 0 on failure, 1 on success */
+_cupsThreadCreate(
+ _cups_thread_func_t func, /* I - Entry point */
+ void *arg) /* I - Entry point context */
+{
+ pthread_t thread;
+
+ return (pthread_create(&thread, NULL, (void *(*)(void *))func, arg) == 0);
+}
+
+
+#elif defined(WIN32)
+# include <process.h>
+
+
+/*
+ * '_cupsMutexLock()' - Lock a mutex.
+ */
+
+void
+_cupsMutexLock(_cups_mutex_t *mutex) /* I - Mutex */
+{
+ if (!mutex->m_init)
+ {
+ _cupsGlobalLock();
+
+ if (!mutex->m_init)
+ {
+ InitializeCriticalSection(&mutex->m_criticalSection);
+ mutex->m_init = 1;
+ }
+
+ _cupsGlobalUnlock();
+ }
+
+ EnterCriticalSection(&mutex->m_criticalSection);
+}
+
+
+/*
+ * '_cupsMutexUnlock()' - Unlock a mutex.
+ */
+
+void
+_cupsMutexUnlock(_cups_mutex_t *mutex) /* I - Mutex */
+{
+ LeaveCriticalSection(&mutex->m_criticalSection);
+}
+
+
+/*
+ * '_cupsThreadCreate()' - Create a thread.
+ */
+
+int /* O - 0 on failure, 1 on success */
+_cupsThreadCreate(
+ _cups_thread_func_t func, /* I - Entry point */
+ void *arg) /* I - Entry point context */
+{
+ return (_beginthreadex(NULL, 0, (LPTHREAD_START_ROUTINE) func, arg, 0, NULL)
+ != 0);
+}
+
+
+#else
+/*
+ * '_cupsMutexLock()' - Lock a mutex.
+ */
+
+void
+_cupsMutexLock(_cups_mutex_t *mutex) /* I - Mutex */
+{
+}
+
+
+/*
+ * '_cupsMutexUnlock()' - Unlock a mutex.
+ */
+
+void
+_cupsMutexUnlock(_cups_mutex_t *mutex) /* I - Mutex */
+{
+}
+#endif /* HAVE_PTHREAD_H */
+
+
+/*
+ * End of "$Id$".
+ */
# define _CUPS_API_1_2 AVAILABLE_MAC_OS_X_VERSION_10_5_AND_LATER
# define _CUPS_API_1_3 AVAILABLE_MAC_OS_X_VERSION_10_5_AND_LATER
# define _CUPS_API_1_4 AVAILABLE_MAC_OS_X_VERSION_10_6_AND_LATER
+# define _CUPS_API_1_5
# else
# define _CUPS_API_1_1_19
# define _CUPS_API_1_1_20
# define _CUPS_API_1_2
# define _CUPS_API_1_3
# define _CUPS_API_1_4
+# define _CUPS_API_1_5
# endif /* __APPLE__ && !_CUPS_SOURCE */
/*
help/man-cupsenable.html \
help/man-cupstestdsc.html \
help/man-cupstestppd.html \
- help/man-drv.html \
help/man-filter.html \
help/man-ipptool.html \
help/man-ipptoolfile.html \
<!--
"$Id: spec-ppd.html 7937 2008-09-11 16:16:41Z mike $"
- CUPS PPD extensions specification for the Common UNIX Printing System (CUPS).
+ CUPS PPD extensions specification for CUPS.
- Copyright 2007-2009 by Apple Inc.
+ Copyright 2007-2010 by Apple Inc.
Copyright 1997-2007 by Easy Software Products.
These coded instructions, statements, and computer programs are the
*cupsPreFilter: "image/png 0 mypngprefilter"
</pre>
+
+<h3><span class='info'>CUPS 1.5</span><a name='cupsPrintQuality'>cupsPrintQuality</a></h3>
+
+<p class='summary'>*cupsPrintQuality keyword/text: "code"</p>
+
+<p>This UI keyword defines standard print qualities that directly map from the IPP "print-quality" job template attribute. Standard keyword values are "Draft", "Normal", and "High" which are mapped from the IPP "print-quality" values 3, 4, and 5 respectively. Each <code>cupsPrintQuality</code> option typically sets output mode and resolution parameters in the page device dictionary, eliminating the need for separate (and sometimes confusing) output mode and resolution options.</p>
+
+<blockquote><b>Note:</b>
+
+<p>Unlike all of the other keywords defined in this document, <code>cupsPrintQuality</code> is a UI keyword that MUST be enclosed inside the PPD <code>OpenUI</code> and <code>CloseUI</code> keywords.</p>
+
+</blockquote>
+
+<p>Examples:</p>
+
+<pre class='command'>
+*OpenUI *cupsPrintQuality/Print Quality: PickOne
+*OrderDependency: 10 AnySetup *cupsPrintQuality
+*DefaultcupsPrintQuality: Normal
+*cupsPrintQuality Draft/Draft: "code"
+*cupsPrintQuality Normal/Normal: "code"
+*cupsPrintQuality High/Photo: "code"
+*CloseUI: *cupsPrintQuality
+</pre>
+
<h3><span class='info'>CUPS 1.4/Mac OS X 10.6</span><a name='cupsSNMPSupplies'>cupsSNMPSupplies</a></h3>
<p class='summary'>*cupsSNMPSupplies: boolean</p>
in the print dialog of applications (such as iPhoto) that set the job
style hint to <tt>NSPrintPhotoJobStyleHint</tt>. Each preset maps to one or
more pairs of PPD options and choices as well as providing key/value data for
-the application. The following preset names are currently defined:</p>
+the application. The following standard preset names are currently defined:</p>
<ul>
- <li><code>Photo_with_Paper_Auto-Detect</code>; Photo printing
- with paper auto-detect</li>
+ <li><code>General_with_Paper_Auto-Detect</code>; Normal quality general printing with auto-detected media.</li>
+
+ <li><code>General_with_Paper_Auto-Detect_-_Draft</code>; Draft quality general printing with auto-detected media.</li>
+
+ <li><code>General_on_Plain_Paper</code>; Normal quality general printing on plain paper.</li>
+
+ <li><code>General_on_Plain_Paper_-_Draft</code>; Draft quality general printing on plain paper.</li>
- <li><code>Photo_with_Paper_Auto-Detect_-_Fine</code>; Photo printing
- with paper auto-detect - fine</li>
+ <li><code>Photo_with_Paper_Auto-Detect</code>; Normal quality photo printing with auto-detected media.</li>
- <li><code>Photo_on_Plain_Paper</code>; Photo printing on plain paper</li>
+ <li><code>Photo_with_Paper_Auto-Detect_-_Fine</code>; High quality photo printing with auto-detected media.</li>
- <li><code>Photo_on_Plain_Paper_-_Fine</code>; Photo printing on plain
- paper - fine</li>
+ <li><code>Photo_on_Plain_Paper</code>; Normal quality photo printing on plain paper.</li>
- <li><code>Photo_on_Photo_Paper</code>; Photo printing on photo paper</li>
+ <li><code>Photo_on_Plain_Paper_-_Fine</code>; High quality photo printing on plain paper.</li>
- <li><code>Photo_on_Photo_Paper_-_Fine</code>; Photo printing on photo
- paper - fine</li>
+ <li><code>Photo_on_Photo_Paper</code>; Normal quality photo printing on glossy photo paper.</li>
- <li><code>Photo_on_Matte_Paper</code>; Photo printing on matte paper</li>
+ <li><code>Photo_on_Photo_Paper_-_Fine</code>; High quality photo printing on glossy photo paper.</li>
- <li><code>Photo_on_Matte_Paper_-_Fine</code>; Photo printing on matte
- paper - fine</li>
+ <li><code>Photo_on_Matte_Paper</code>; Normal quality photo printing on matte paper.</li>
+
+ <li><code>Photo_on_Matte_Paper_-_Fine</code>; High quality photo printing on matte paper.</li>
</ul>
<p>The value string consists of pairs of keywords, either an option name and
choice (*MainKeyword OptionKeyword) or a preset identifier and value
-(com.apple.print.preset.foo value). Preset identifiers and their supported
-values are documented in "<a
-href='http://developer.apple.com/documentation/Printing/Conceptual/PresetDraft/presets_intro/chapter_1_section_2.html'
->Creating Printing Presets for iPhoto: Printing Presets File Format</a>".</p>
+(com.apple.print.preset.foo value). The following preset identifiers are currently used:</p>
+
+<ul>
+
+ <li><code>com.apple.print.preset.graphicsType</code>; specifies the type of printing used for this printing - "General" for general purpose printing and "Photo" for photo printing.</li>
+
+ <li><code>com.apple.print.preset.media-front-coating</code>; specifies the media type selected by this preset - "none" (plain paper), "glossy", "high-gloss", "semi-gloss", "satin", "matte", and "autodetect".</li>
+
+ <li><code>com.apple.print.preset.output-mode</code>; specifies the output mode for this preset - "color" (default for color printers) or "monochrome" (grayscale, default for B&W printers).</li>
+
+ <li><code>com.apple.print.preset.quality</code>; specifies the overall print quality selected by this preset - "low" (draft), "mid" (normal), or "high".</li>
+
+</ul>
<p>Presets, like options, can also be localized in multiple languages.</p>
<h2 class='title'><a name='HISTORY'>Change History</a></h2>
+<h3>Changes in CUPS 1.4.5</h3>
+
+<ul>
+
+ <li>Added <a href='#cupsPrintQuality'><tt>cupsPrintQuality</tt></a> UI keyword.</li>
+
+ <li>Added new properties and values for the <a href='#APPrinterPreset'><tt>APPrinterPreset</tt></a> keyword.</li>
+
+</ul>
+
+
<h3>Changes in CUPS 1.4</h3>
<ul>
if (!ppd)
{
- _cupsLangPuts(stderr, _("ERROR: Unable to open PPD file\n"));
+ ppd_status_t status; /* PPD error */
+ int linenum; /* Line number */
+
+ _cupsLangPrintf(stderr, _("ERROR: The PPD file could not be opened.\n"));
+
+ status = ppdLastError(&linenum);
+
+ fprintf(stderr, "DEBUG: %s on line %d.\n", ppdErrorString(status), linenum);
+
return (1);
}
if (page == 0)
{
- _cupsLangPuts(stderr, _("ERROR: No pages found\n"));
+ _cupsLangPuts(stderr, _("ERROR: No pages were found.\n"));
return (1);
}
else
if (!ppd)
{
- _cupsLangPuts(stderr, _("ERROR: Unable to open PPD file\n"));
+ ppd_status_t status; /* PPD error */
+ int linenum; /* Line number */
+
+ _cupsLangPrintf(stderr, _("ERROR: The PPD file could not be opened.\n"));
+
+ status = ppdLastError(&linenum);
+
+ fprintf(stderr, "DEBUG: %s on line %d.\n", ppdErrorString(status), linenum);
+
return (1);
}
if (Page == 0)
{
- _cupsLangPuts(stderr, _("ERROR: No pages found\n"));
+ _cupsLangPuts(stderr, _("ERROR: No pages were found.\n"));
return (1);
}
else
if (cupsRasterInterpretPPD(&header, ppd, num_options, options, raster_cb))
{
- _cupsLangPuts(stderr, _("ERROR: Bad page setup\n"));
+ _cupsLangPuts(stderr, _("ERROR: The page setup information was not valid.\n"));
fprintf(stderr, "DEBUG: %s\n", cupsRasterErrorString());
return (1);
}
switch (header.cupsColorSpace)
{
case CUPS_CSPACE_W :
+ case CUPS_CSPACE_SW :
if (header.cupsBitsPerColor >= 8)
{
primary = CUPS_IMAGE_WHITE;
}
break;
- default :
case CUPS_CSPACE_RGB :
case CUPS_CSPACE_RGBA :
case CUPS_CSPACE_RGBW :
+ case CUPS_CSPACE_SRGB :
+ case CUPS_CSPACE_ADOBERGB :
if (header.cupsBitsPerColor >= 8)
{
primary = CUPS_IMAGE_RGB;
primary = CUPS_IMAGE_CMY;
secondary = CUPS_IMAGE_CMY;
break;
+
+ case CUPS_CSPACE_CIEXYZ :
+ case CUPS_CSPACE_CIELab :
+ case CUPS_CSPACE_ICC1 :
+ case CUPS_CSPACE_ICC2 :
+ case CUPS_CSPACE_ICC3 :
+ case CUPS_CSPACE_ICC4 :
+ case CUPS_CSPACE_ICC5 :
+ case CUPS_CSPACE_ICC6 :
+ case CUPS_CSPACE_ICC7 :
+ case CUPS_CSPACE_ICC8 :
+ case CUPS_CSPACE_ICC9 :
+ case CUPS_CSPACE_ICCA :
+ case CUPS_CSPACE_ICCB :
+ case CUPS_CSPACE_ICCC :
+ case CUPS_CSPACE_ICCD :
+ case CUPS_CSPACE_ICCE :
+ case CUPS_CSPACE_ICCF :
+ case CUPS_CSPACE_DEVICE1 :
+ case CUPS_CSPACE_DEVICE2 :
+ case CUPS_CSPACE_DEVICE3 :
+ case CUPS_CSPACE_DEVICE4 :
+ case CUPS_CSPACE_DEVICE5 :
+ case CUPS_CSPACE_DEVICE6 :
+ case CUPS_CSPACE_DEVICE7 :
+ case CUPS_CSPACE_DEVICE8 :
+ case CUPS_CSPACE_DEVICE9 :
+ case CUPS_CSPACE_DEVICEA :
+ case CUPS_CSPACE_DEVICEB :
+ case CUPS_CSPACE_DEVICEC :
+ case CUPS_CSPACE_DEVICED :
+ case CUPS_CSPACE_DEVICEE :
+ case CUPS_CSPACE_DEVICEF :
+ fprintf(stderr, "ERROR: Colorspace %d not supported.\n",
+ header.cupsColorSpace);
+ exit(1);
break;
}
if (img == NULL)
{
- _cupsLangPuts(stderr, _("ERROR: Unable to open image file for printing\n"));
+ _cupsLangPuts(stderr, _("ERROR: The image file to print could not be opened.\n"));
ppdClose(ppd);
return (1);
}
header.cupsBytesPerLine)
{
_cupsLangPuts(stderr,
- _("ERROR: Unable to write raster data to "
- "driver\n"));
+ _("ERROR: The raster data could not be written "
+ "to the driver.\n"));
cupsImageClose(img);
exit(1);
}
if (cupsRasterWritePixels(ras, row, header.cupsBytesPerLine) <
header.cupsBytesPerLine)
{
- _cupsLangPuts(stderr,
- _("ERROR: Unable to write raster data to driver\n"));
+ _cupsLangPuts(stderr,
+ _("ERROR: The raster data could not be written to "
+ "the driver.\n"));
cupsImageClose(img);
exit(1);
}
header.cupsBytesPerLine)
{
_cupsLangPuts(stderr,
- _("ERROR: Unable to write raster data to "
- "driver\n"));
+ _("ERROR: The raster data could not be written "
+ "to the driver.\n"));
cupsImageClose(img);
exit(1);
}
if ((fd = cupsTempFd(tempfile, sizeof(tempfile))) < 0)
{
- _cupsLangPrintError(_("ERROR: Unable to copy PDF file"));
+ perror("DEBUG: Unable to copy PDF file");
return (1);
}
if (pipe(pstops_pipe))
{
- _cupsLangPrintError(_("ERROR: Unable to create pipe"));
+ perror("DEBUG: Unable to create pipe");
exit_status = 1;
goto error;
#ifdef HAVE_PDFTOPS
execv(CUPS_PDFTOPS, pdf_argv);
- _cupsLangPrintError(_("ERROR: Unable to execute pdftops program"));
+ perror("DEBUG: Unable to execute pdftops program");
#else
execv(CUPS_GHOSTSCRIPT, pdf_argv);
- _cupsLangPrintError(_("ERROR: Unable to execute gs program"));
+ perror("DEBUG: Unable to execute gs program");
#endif /* HAVE_PDFTOPS */
exit(1);
*/
#ifdef HAVE_PDFTOPS
- _cupsLangPrintError(_("ERROR: Unable to execute pdftops program"));
+ perror("DEBUG: Unable to execute pdftops program");
#else
- _cupsLangPrintError(_("ERROR: Unable to execute gs program"));
+ perror("DEBUG: Unable to execute gs program");
#endif /* HAVE_PDFTOPS */
exit_status = 1;
close(pstops_pipe[1]);
execv(pstops_path, pstops_argv);
- _cupsLangPrintError(_("ERROR: Unable to execute pstops program"));
+ perror("DEBUG: Unable to execute pstops program");
exit(1);
}
* Unable to fork!
*/
- _cupsLangPrintError(_("ERROR: Unable to execute pstops program"));
+ perror("DEBUG: Unable to execute pstops program");
exit_status = 1;
goto error;
if ((len = cupsFileGetLine(fp, line, sizeof(line))) == 0)
{
- _cupsLangPuts(stderr, _("ERROR: Empty print file\n"));
+ fputs("DEBUG: The print file is empty.\n", stderr);
return (1);
}
{
int pages; /* Number of pages */
-
- if (saw_pages)
- _cupsLangPuts(stderr, _("ERROR: Duplicate %%Pages: comment seen\n"));
+ if (saw_pages)
+ fputs("DEBUG: A duplicate %%Pages: comment was seen.\n", stderr);
saw_pages = 1;
}
else if (!strncmp(line, "%%BoundingBox:", 14))
{
- if (saw_bounding_box)
- _cupsLangPuts(stderr,
- _("ERROR: Duplicate %%BoundingBox: comment seen\n"));
+ if (saw_bounding_box)
+ fputs("DEBUG: A duplicate %%BoundingBox: comment was seen.\n", stderr);
else if (strstr(line + 14, "(atend)"))
{
/*
doc->bounding_box + 1, doc->bounding_box + 2,
doc->bounding_box + 3) != 4)
{
- _cupsLangPuts(stderr, _("ERROR: Bad %%BoundingBox: comment seen\n"));
+ fputs("DEBUG: A bad %%BoundingBox: comment was seen.\n", stderr);
doc->bounding_box[0] = (int)PageLeft;
doc->bounding_box[1] = (int)PageBottom;
break;
}
- if (!saw_bounding_box)
- _cupsLangPuts(stderr, _("ERROR: No %%BoundingBox: comment in header\n"));
+ if (!saw_bounding_box)
+ fputs("DEBUG: There wasn't a %%BoundingBox: comment in the header.\n",
+ stderr);
- if (!saw_pages)
- _cupsLangPuts(stderr, _("ERROR: No %%Pages: comment in header\n"));
+ if (!saw_pages)
+ fputs("DEBUG: There wasn't a %%Pages: comment in the header.\n", stderr);
if (!saw_for)
WriteTextComment("For", doc->user);
* that may not print correctly...
*/
- _cupsLangPuts(stderr,
- _("WARNING: This document does not conform to the Adobe "
- "Document Structuring Conventions and may not print "
- "correctly\n"));
+ fputs("DEBUG: This document does not conform to the Adobe Document "
+ "Structuring Conventions and may not print correctly.\n", stderr);
/*
* Then write a standard DSC comment section...
if (!parse_text(line + 7, &ptr, label, sizeof(label)))
{
- _cupsLangPuts(stderr, _("ERROR: Bad %%Page: comment in file\n"));
+ fputs("DEBUG: There was a bad %%Page: comment in the file.\n", stderr);
label[0] = '\0';
number = doc->page;
}
else if (strtol(ptr, &ptr, 10) == LONG_MAX || !isspace(*ptr & 255))
{
- _cupsLangPuts(stderr, _("ERROR: Bad %%Page: comment in file\n"));
+ fputs("DEBUG: There was a bad %%Page: comment in the file.\n", stderr);
number = doc->page;
}
bounding_box + 1, bounding_box + 2,
bounding_box + 3) != 4)
{
- _cupsLangPuts(stderr,
- _("ERROR: Bad %%PageBoundingBox: comment in file\n"));
+ fputs("DEBUG: There was a bad %%PageBoundingBox: comment in the file.\n", stderr);
memcpy(bounding_box, doc->bounding_box,
sizeof(bounding_box));
}
if (!strncmp(line, "%%EndProlog", 11))
linelen = cupsFileGetLine(fp, line, linesize);
- else
- _cupsLangPuts(stderr, _("ERROR: Missing %%EndProlog\n"));
+ else
+ fputs("DEBUG: The %%EndProlog comment is missing.\n", stderr);
}
doc_puts(doc, "%%EndProlog\n");
if (!strncmp(line, "%%EndSetup", 10))
linelen = cupsFileGetLine(fp, line, linesize);
- else
- _cupsLangPuts(stderr, _("ERROR: Missing %%EndSetup\n"));
+ else
+ fputs("DEBUG: The %%EndSetup comment is missing.\n", stderr);
}
if (num_options > 0)
if (sscanf(line + 17, "%254s%254s", name, value) != 2)
{
- _cupsLangPuts(stderr, _("ERROR: Bad %%IncludeFeature: comment\n"));
+ fputs("DEBUG: The %%IncludeFeature: comment is not valid.\n", stderr);
return (num_options);
}
if ((doc->temp = cupsTempFile2(doc->tempfile,
sizeof(doc->tempfile))) == NULL)
{
- _cupsLangPrintError(_("ERROR: Unable to create temporary file"));
+ perror("DEBUG: Unable to create temporary file");
exit(1);
}
}
/*
* "$Id: raster.c 7720 2008-07-11 22:46:21Z mike $"
*
- * Raster file routines for the Common UNIX Printing System (CUPS).
+ * Raster file routines for CUPS.
*
- * Copyright 2007-2008 by Apple Inc.
+ * Copyright 2007-2010 by Apple Inc.
* Copyright 1997-2006 by Easy Software Products.
*
* This file is part of the CUPS Imaging library.
case CUPS_CSPACE_WHITE :
case CUPS_CSPACE_GOLD :
case CUPS_CSPACE_SILVER :
+ case CUPS_CSPACE_SW :
r->header.cupsNumColors = 1;
break;
case CUPS_CSPACE_YMC :
case CUPS_CSPACE_CIEXYZ :
case CUPS_CSPACE_CIELab :
+ case CUPS_CSPACE_SRGB :
+ case CUPS_CSPACE_ADOBERGB :
case CUPS_CSPACE_ICC1 :
case CUPS_CSPACE_ICC2 :
case CUPS_CSPACE_ICC3 :
else
r->header.cupsNumColors = 4;
break;
+
+ case CUPS_CSPACE_DEVICE1 :
+ case CUPS_CSPACE_DEVICE2 :
+ case CUPS_CSPACE_DEVICE3 :
+ case CUPS_CSPACE_DEVICE4 :
+ case CUPS_CSPACE_DEVICE5 :
+ case CUPS_CSPACE_DEVICE6 :
+ case CUPS_CSPACE_DEVICE7 :
+ case CUPS_CSPACE_DEVICE8 :
+ case CUPS_CSPACE_DEVICE9 :
+ case CUPS_CSPACE_DEVICEA :
+ case CUPS_CSPACE_DEVICEB :
+ case CUPS_CSPACE_DEVICEC :
+ case CUPS_CSPACE_DEVICED :
+ case CUPS_CSPACE_DEVICEE :
+ case CUPS_CSPACE_DEVICEF :
+ r->header.cupsNumColors = r->header.cupsColorSpace -
+ CUPS_CSPACE_DEVICE1 + 1;
+ break;
}
}
*/
ppd = ppdOpenFile(getenv("PPD"));
- if (ppd)
- Model = ppd->model_number;
+ if (!ppd)
+ {
+ ppd_status_t status; /* PPD error */
+ int linenum; /* Line number */
+
+ _cupsLangPrintf(stderr, _("ERROR: The PPD file could not be opened.\n"));
+
+ status = ppdLastError(&linenum);
+
+ fprintf(stderr, "DEBUG: %s on line %d.\n", ppdErrorString(status), linenum);
+
+ return (1);
+ }
+
+ Model = ppd->model_number;
Setup();
if (page == 0)
{
- _cupsLangPuts(stderr, _("ERROR: No pages found\n"));
+ _cupsLangPuts(stderr, _("ERROR: No pages were found.\n"));
return (1);
}
else
*/
ppd = ppdOpenFile(getenv("PPD"));
+ if (!ppd)
+ {
+ ppd_status_t status; /* PPD error */
+ int linenum; /* Line number */
+
+ _cupsLangPrintf(stderr, _("ERROR: The PPD file could not be opened.\n"));
+
+ status = ppdLastError(&linenum);
+
+ fprintf(stderr, "DEBUG: %s on line %d.\n", ppdErrorString(status), linenum);
+
+ return (1);
+ }
Setup();
if (Page == 0)
{
- _cupsLangPuts(stderr, _("ERROR: No pages found\n"));
+ _cupsLangPuts(stderr, _("ERROR: No pages were found.\n"));
return (1);
}
else
num_options = cupsParseOptions(argv[5], 0, &options);
- if ((ppd = ppdOpenFile(getenv("PPD"))) != NULL)
+ ppd = ppdOpenFile(getenv("PPD"));
+ if (!ppd)
{
- ppdMarkDefaults(ppd);
- cupsMarkOptions(ppd, num_options, options);
+ ppd_status_t status; /* PPD error */
+ int linenum; /* Line number */
+
+ _cupsLangPrintf(stderr, _("ERROR: The PPD file could not be opened.\n"));
+
+ status = ppdLastError(&linenum);
+
+ fprintf(stderr, "DEBUG: %s on line %d.\n", ppdErrorString(status), linenum);
+
+ return (1);
}
+ ppdMarkDefaults(ppd);
+ cupsMarkOptions(ppd, num_options, options);
+
/*
* Initialize the print device...
*/
if (Page == 0)
{
- _cupsLangPuts(stderr, _("ERROR: No pages found\n"));
+ _cupsLangPuts(stderr, _("ERROR: No pages were found.\n"));
return (1);
}
else
if (SizeColumns <= 0 || SizeColumns > 32767 ||
SizeLines <= 0 || SizeLines > 32767)
{
- _cupsLangPrintf(stderr, _("ERROR: Unable to print %dx%d text page\n"),
+ _cupsLangPrintf(stderr, _("ERROR: Unable to print %dx%d text page.\n"),
+ SizeColumns, SizeLines);
+ exit(1);
+ }
+
+ if ((Page = calloc(sizeof(lchar_t *), SizeLines)) == NULL)
+ {
+ _cupsLangPrintf(stderr, _("ERROR: Unable to print %dx%d text page.\n"),
+ SizeColumns, SizeLines);
+ exit(1);
+ }
+
+ if ((Page[0] = calloc(sizeof(lchar_t), SizeColumns * SizeLines)) == NULL)
+ {
+ _cupsLangPrintf(stderr, _("ERROR: Unable to print %dx%d text page.\n"),
SizeColumns, SizeLines);
exit(1);
}
- Page = calloc(sizeof(lchar_t *), SizeLines);
- Page[0] = calloc(sizeof(lchar_t), SizeColumns * SizeLines);
for (i = 1; i < SizeLines; i ++)
Page[i] = Page[0] + i * SizeColumns;
printers.conf.$(MAN5EXT) \
subscriptions.conf.$(MAN5EXT)
MAN7 = backend.$(MAN7EXT) \
- drv.$(MAN7EXT) \
filter.$(MAN7EXT) \
notifier.$(MAN7EXT)
MAN8 = cupsaccept.$(MAN8EXT) \
+++ /dev/null
-.\"
-.\" "$Id$"
-.\"
-.\" drv man page for the Common UNIX Printing System.
-.\"
-.\" Copyright 2008-2009 by Apple Inc.
-.\"
-.\" 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"
-.\" which should have been included with this file. If this file is
-.\" file is missing or damaged, see the license at "http://www.cups.org/".
-.\"
-.TH drv 1 "CUPS" "9 March 2009" "Apple Inc."
-.SH NAME
-drv \- cups driver interface for ppd compiler files
-.SH SYNOPSIS
-.B drv list
-.br
-.B drv cat
-.I drv:///filename.drv/pcfilename
-.SH DESCRIPTION
-\fIdrv\fR lists and compiles PPDC source files installed in the
-@CUPS_DATADIR@/drv and (on Mac OS X) /Library/Printers/PPDs/Contents/Resources
-directories on behalf of the scheduler, \fIcupsd(8)\fR.
-.PP
-The first form of the command lists all of the PPD files that can be produced
-by the driver information files in the two directories.
-.PP
-The second form of the command compiles the requested PPD and sends it to the
-standard output.
-.SH SEE ALSO
-ppdc(1), ppdhtml(1), ppdi(1), ppdmerge(1), ppdpo(1), ppdcfile(5)
-.br
-http://localhost:631/help
-.SH COPYRIGHT
-Copyright 2008-2009 by Apple Inc.
-.\"
-.\" End of "$Id$".
-.\"
fputs("DEBUG: QUIT\n", stderr);
if (!cupsFileGets(fp, response, sizeof(response)) || atoi(response) >= 500)
- goto smtp_error;
- fprintf(stderr, "DEBUG: <<< %s\n", response);
+ fprintf(stderr, "ERROR: Got \"%s\" trying to QUIT connection.\n",
+ response);
+ else
+ fprintf(stderr, "DEBUG: <<< %s\n", response);
cupsFileClose(fp);
f 0444 root sys $MANDIR/man5/mime.types.$MAN5EXT man/mime.types.$MAN5EXT
f 0444 root sys $MANDIR/man5/printers.conf.$MAN5EXT man/printers.conf.$MAN5EXT
-f 0444 root sys $MANDIR/man7/drv.$MAN7EXT man/drv.$MAN7EXT
-
l 0644 root sys $AMANDIR/man$MAN8DIR/accept.$MAN8EXT cupsaccept.$MAN8EXT
f 0444 root sys $AMANDIR/man$MAN8DIR/cupsaccept.$MAN8EXT man/cupsaccept.$MAN8EXT
l 0644 root sys $AMANDIR/man$MAN8DIR/cupsreject.$MAN8EXT cupsaccept.$MAN8EXT
while (isspace(*newv & 255))
newv ++;
- if (strncmp(newv, "==", 2))
+ if (!strncmp(newv, "==", 2))
{
compop = PPDC_EQ;
newv += 2;
}
- else if (strncmp(newv, "!=", 2))
+ else if (!strncmp(newv, "!=", 2))
{
compop = PPDC_NE;
newv += 2;
}
- else if (strncmp(newv, "<=", 2))
+ else if (!strncmp(newv, "<=", 2))
{
compop = PPDC_LE;
newv += 2;
compop = PPDC_LT;
newv ++;
}
- else if (strncmp(newv, ">=", 2))
+ else if (!strncmp(newv, ">=", 2))
{
compop = PPDC_GE;
newv += 2;
if (*newv == ')' || !*newv)
return (-1);
- if (isdigit(*v & 255) || *v == '-' || *v == '+')
+ if (isdigit(*newv & 255) || *newv == '-' || *newv == '+')
{
// Get the second number...
temp2 = strtol(newv, &newv, 0);
var = find_variable(name);
if (var)
{
- strncpy(bufptr, var->value->value, bufend - bufptr);
- bufptr += strlen(var->value->value);
+ strlcpy(bufptr, var->value->value, bufend - bufptr + 1);
+ bufptr += strlen(bufptr);
}
else
{
"%s.\n"), name, fp->line, fp->filename);
snprintf(bufptr, bufend - bufptr + 1, "$%s", name);
- bufptr += strlen(name) + 1;
+ bufptr += strlen(bufptr);
}
}
}
con->type = CUPSD_AUTH_DIGEST;
}
#ifdef HAVE_GSSAPI
+# ifdef HAVE_KRB5_IPC_CLIENT_SET_TARGET_UID
+ else if (con->http.hostaddr->addr.sa_family == AF_LOCAL &&
+ !strncmp(authorization, "Negotiate", 9))
+ {
+ /*
+ * Pull the credentials directly from the user...
+ */
+
+ krb5_error_code error; /* Kerberos error code */
+ cupsd_ucred_t peercred; /* Peer credentials */
+ socklen_t peersize; /* Size of peer credentials */
+ krb5_ccache peerccache; /* Peer Kerberos credentials */
+ const char *peername; /* Peer username */
+
+ peersize = sizeof(peercred);
+
+# ifdef __APPLE__
+ if (getsockopt(con->http.fd, 0, LOCAL_PEERCRED, &peercred, &peersize))
+# else
+ if (getsockopt(con->http.fd, SOL_SOCKET, SO_PEERCRED, &peercred, &peersize))
+# endif /* __APPLE__ */
+ {
+ cupsdLogMessage(CUPSD_LOG_ERROR, "Unable to get peer credentials - %s",
+ strerror(errno));
+ return;
+ }
+
+ cupsdLogMessage(CUPSD_LOG_DEBUG,
+ "cupsdAuthorize: Copying credentials for UID %d...",
+ CUPSD_UCRED_UID(peercred));
+
+ krb5_ipc_client_set_target_uid(CUPSD_UCRED_UID(peercred));
+
+ if ((error = krb5_cc_default(KerberosContext, &peerccache)) != 0)
+ {
+ cupsdLogMessage(CUPSD_LOG_ERROR,
+ "Unable to get credentials cache for UID %d (%d/%s)",
+ (int)CUPSD_UCRED_UID(peercred), error, strerror(errno));
+ return;
+ }
+
+ if ((peername = krb5_cc_get_name(KerberosContext, peerccache)) != NULL)
+ {
+ strlcpy(username, peername, sizeof(username));
+
+ con->have_gss = 1;
+ con->type = CUPSD_AUTH_NEGOTIATE;
+
+ cupsdLogMessage(CUPSD_LOG_DEBUG,
+ "cupsdAuthorize: Authorized as %s using Negotiate",
+ username);
+ }
+ else
+ cupsdLogMessage(CUPSD_LOG_ERROR,
+ "Unable to get Kerberos name for UID %d",
+ (int)CUPSD_UCRED_UID(peercred));
+
+ krb5_cc_close(KerberosContext, peerccache);
+ krb5_ipc_client_clear_target();
+ }
+# endif /* HAVE_KRB5_IPC_CLIENT_SET_TARGET_UID */
else if (!strncmp(authorization, "Negotiate", 9))
{
int len; /* Length of authorization string */
if (!*authorization)
{
cupsdLogMessage(CUPSD_LOG_DEBUG2,
- "cupsdAuthorize: No authentication data specified.");
+ "cupsdAuthorize: No authentication data specified.");
return;
}
len = strlen(authorization);
input_token.value = malloc(len);
input_token.value = httpDecode64_2(input_token.value, &len,
- authorization);
+ authorization);
input_token.length = len;
/*
if (GSS_ERROR(major_status))
{
cupsdLogGSSMessage(CUPSD_LOG_DEBUG, major_status, minor_status,
- "cupsdAuthorize: Error accepting GSSAPI security "
+ "cupsdAuthorize: Error accepting GSSAPI security "
"context");
if (context != GSS_C_NO_CONTEXT)
if (!con->gss_creds)
cupsdLogMessage(CUPSD_LOG_DEBUG,
- "cupsdAuthorize: No delegated credentials!");
+ "cupsdAuthorize: No delegated credentials!");
if (major_status == GSS_S_CONTINUE_NEEDED)
cupsdLogGSSMessage(CUPSD_LOG_DEBUG, major_status, minor_status,
if (GSS_ERROR(major_status))
{
cupsdLogGSSMessage(CUPSD_LOG_DEBUG, major_status, minor_status,
- "cupsdAuthorize: Error getting username");
+ "cupsdAuthorize: Error getting username");
gss_release_cred(&minor_status, &con->gss_creds);
gss_release_name(&minor_status, &client_name);
gss_delete_sec_context(&minor_status, &context, GSS_C_NO_BUFFER);
#ifdef HAVE_CDSASSL
# include <Security/Security.h>
+# include <Security/SecItem.h>
+# ifdef HAVE_SECITEMPRIV_H
+# include <Security/SecItemPriv.h>
+# else /* Declare constant from that header... */
+extern const CFTypeRef kSecClassIdentity;
+# endif /* HAVE_SECITEMPRIV_H */
# ifdef HAVE_SECIDENTITYSEARCHPRIV_H
# include <Security/SecIdentitySearchPriv.h>
# else /* Declare prototype for function in that header... */
-extern OSStatus SecIdentitySearchCreateWithPolicy(SecPolicyRef policy,
- CFStringRef idString, CSSM_KEYUSE keyUsage,
- CFTypeRef keychainOrArray,
- Boolean returnOnlyValidIdentities,
+extern OSStatus SecIdentitySearchCreateWithPolicy(SecPolicyRef policy,
+ CFStringRef idString, CSSM_KEYUSE keyUsage,
+ CFTypeRef keychainOrArray,
+ Boolean returnOnlyValidIdentities,
SecIdentitySearchRef* searchRef);
# endif /* HAVE_SECIDENTITYSEARCHPRIV_H */
# ifdef HAVE_SECPOLICYPRIV_H
# include <Security/SecPolicyPriv.h>
# else /* Declare prototype for function in that header... */
-extern OSStatus SecPolicySetValue(SecPolicyRef policyRef,
+extern OSStatus SecPolicySetValue(SecPolicyRef policyRef,
const CSSM_DATA *value);
# endif /* HAVE_SECPOLICYPRIV_H */
# ifdef HAVE_SECBASEPRIV_H
cupsd_client_t *con) /* I - Client connection */
{
OSStatus err; /* Error info */
- SecKeychainRef keychain; /* Keychain reference */
- SecIdentitySearchRef search; /* Search reference */
- SecIdentityRef identity; /* Identity */
+ SecKeychainRef keychain = NULL;/* Keychain reference */
+ SecIdentitySearchRef search = NULL; /* Search reference */
+ SecIdentityRef identity = NULL;/* Identity */
CFArrayRef certificates = NULL;
/* Certificate array */
+# if HAVE_SECPOLICYCREATESSL
+ SecPolicyRef policy = NULL; /* Policy ref */
+ CFStringRef servername = NULL;
+ /* Server name */
+ CFMutableDictionaryRef query = NULL; /* Query qualifiers */
+ char localname[1024];/* Local hostname */
+# elif defined(HAVE_SECIDENTITYSEARCHCREATEWITHPOLICY)
+ SecPolicyRef policy = NULL; /* Policy ref */
+ SecPolicySearchRef policy_search = NULL;
+ /* Policy search ref */
+ CSSM_DATA options; /* Policy options */
+ CSSM_APPLE_TP_SSL_OPTIONS
+ ssl_options; /* SSL Option for hostname */
+ char localname[1024];/* Local hostname */
+# endif /* HAVE_SECPOLICYCREATESSL */
+
+ cupsdLogMessage(CUPSD_LOG_DEBUG,
+ "get_cdsa_certificate: Looking for certs for \"%s\"...",
+ con->servername);
if ((err = SecKeychainOpen(ServerCertificate, &keychain)))
{
cupsdLogMessage(CUPSD_LOG_ERROR, "Cannot open keychain \"%s\" - %s (%d)",
ServerCertificate, cssmErrorString(err), (int)err);
- return (NULL);
+ goto cleanup;
+ }
+
+# if HAVE_SECPOLICYCREATESSL
+ servername = CFStringCreateWithCString(kCFAllocatorDefault, con->servername,
+ kCFStringEncodingUTF8);
+
+ if ((policy = SecPolicyCreateSSL(1, servername)) == NULL)
+ {
+ cupsdLogMessage(CUPSD_LOG_ERROR, "Cannot create ssl policy reference");
+ goto cleanup;
+ }
+
+ if (servername)
+ CFRelease(servername);
+
+ if (!(query = CFDictionaryCreateMutable(kCFAllocatorDefault, 0,
+ &kCFTypeDictionaryKeyCallBacks,
+ &kCFTypeDictionaryValueCallBacks)))
+ {
+ cupsdLogMessage(CUPSD_LOG_ERROR, "Cannot create query dictionary");
+ goto cleanup;
+ }
+
+ CFDictionaryAddValue(query, kSecClass, kSecClassIdentity);
+ CFDictionaryAddValue(query, kSecMatchPolicy, policy);
+ CFDictionaryAddValue(query, kSecReturnRef, kCFBooleanTrue);
+ CFDictionaryAddValue(query, kSecMatchLimit, kSecMatchLimitOne);
+
+ err = SecItemCopyMatching(query, (CFTypeRef *)&identity);
+
+ if (err && DNSSDHostName)
+ {
+ /*
+ * Search for the connection server name failed; try the DNS-SD .local
+ * hostname instead...
+ */
+
+ snprintf(localname, sizeof(localname), "%s.local", DNSSDHostName);
+
+ cupsdLogMessage(CUPSD_LOG_DEBUG,
+ "get_cdsa_certificate: Looking for certs for \"%s\"...",
+ localname);
+
+ servername = CFStringCreateWithCString(kCFAllocatorDefault, localname,
+ kCFStringEncodingUTF8);
+
+ CFRelease(policy);
+
+ if ((policy = SecPolicyCreateSSL(1, servername)) == NULL)
+ {
+ cupsdLogMessage(CUPSD_LOG_ERROR, "Cannot create ssl policy reference");
+ goto cleanup;
+ }
+
+ if (servername)
+ CFRelease(servername);
+
+ CFDictionarySetValue(query, kSecMatchPolicy, policy);
+
+ err = SecItemCopyMatching(query, (CFTypeRef *)&identity);
}
-# if HAVE_SECIDENTITYSEARCHCREATEWITHPOLICY
+ if (err)
+ {
+ cupsdLogMessage(CUPSD_LOG_DEBUG,
+ "Cannot find signing key in keychain \"%s\": %s (%d)",
+ ServerCertificate, cssmErrorString(err), (int)err);
+ goto cleanup;
+ }
+
+# elif defined(HAVE_SECIDENTITYSEARCHCREATEWITHPOLICY)
/*
* Use a policy to search for valid certificates who's common name matches the
* servername...
*/
- SecPolicySearchRef policy_search; /* Policy search ref */
- SecPolicyRef policy; /* Policy ref */
- CSSM_DATA options; /* Policy options */
- CSSM_APPLE_TP_SSL_OPTIONS
- ssl_options; /* SSL Option for hostname */
- char localname[1024];/* Local hostname */
-
-
- if (SecPolicySearchCreate(CSSM_CERT_X_509v3, &CSSMOID_APPLE_TP_SSL,
+ if (SecPolicySearchCreate(CSSM_CERT_X_509v3, &CSSMOID_APPLE_TP_SSL,
NULL, &policy_search))
{
cupsdLogMessage(CUPSD_LOG_ERROR, "Cannot create a policy search reference");
- CFRelease(keychain);
- return (NULL);
+ goto cleanup;
}
if (SecPolicySearchCopyNext(policy_search, &policy))
{
cupsdLogMessage(CUPSD_LOG_ERROR,
"Cannot find a policy to use for searching");
- CFRelease(keychain);
- CFRelease(policy_search);
- return (NULL);
+ goto cleanup;
}
memset(&ssl_options, 0, sizeof(ssl_options));
ssl_options.ServerName = con->servername;
ssl_options.ServerNameLen = strlen(con->servername);
- cupsdLogMessage(CUPSD_LOG_DEBUG,
- "get_cdsa_certificate: Looking for certs for \"%s\"...",
- con->servername);
-
options.Data = (uint8 *)&ssl_options;
options.Length = sizeof(ssl_options);
{
cupsdLogMessage(CUPSD_LOG_ERROR,
"Cannot set policy value to use for searching");
- CFRelease(keychain);
- CFRelease(policy_search);
- return (NULL);
+ goto cleanup;
}
- err = SecIdentitySearchCreateWithPolicy(policy, NULL, CSSM_KEYUSE_SIGN,
- keychain, FALSE, &search);
+ if ((err = SecIdentitySearchCreateWithPolicy(policy, NULL, CSSM_KEYUSE_SIGN,
+ keychain, FALSE, &search)))
+ {
+ cupsdLogMessage(CUPSD_LOG_ERROR,
+ "Cannot create identity search reference: %s (%d)",
+ cssmErrorString(err), (int)err);
+ goto cleanup;
+ }
+
+ err = SecIdentitySearchCopyNext(search, &identity);
+
if (err && DNSSDHostName)
{
/*
{
cupsdLogMessage(CUPSD_LOG_ERROR,
"Cannot set policy value to use for searching");
- CFRelease(keychain);
- CFRelease(policy_search);
- return (NULL);
+ goto cleanup;
}
- err = SecIdentitySearchCreateWithPolicy(policy, NULL, CSSM_KEYUSE_SIGN,
- keychain, FALSE, &search);
+ err = SecIdentitySearchCopyNext(search, &identity);
+ }
+
+ if (err)
+ {
+ cupsdLogMessage(CUPSD_LOG_DEBUG,
+ "Cannot find signing key in keychain \"%s\": %s (%d)",
+ ServerCertificate, cssmErrorString(err), (int)err);
+ goto cleanup;
}
# else
* Assume there is exactly one SecIdentity in the keychain...
*/
- err = SecIdentitySearchCreate(keychain, CSSM_KEYUSE_SIGN, &search);
-# endif /* HAVE_SECIDENTITYSEARCHCREATEWITHPOLICY */
-
- if (err)
+ if ((err = SecIdentitySearchCreate(keychain, CSSM_KEYUSE_SIGN, &search)))
+ {
cupsdLogMessage(CUPSD_LOG_DEBUG,
- "Cannot create keychain search reference: %s (%d)",
- cssmErrorString(err), (int)err);
- else
+ "Cannot create identity search reference (%d)", (int)err);
+ goto cleanup;
+ }
+
+ if ((err = SecIdentitySearchCopyNext(search, &identity)))
{
- if ((err = SecIdentitySearchCopyNext(search, &identity)))
- {
- cupsdLogMessage(CUPSD_LOG_DEBUG,
- "Cannot find signing key in keychain \"%s\": %s (%d)",
- ServerCertificate, cssmErrorString(err), (int)err);
- }
- else
- {
- if (CFGetTypeID(identity) != SecIdentityGetTypeID())
- cupsdLogMessage(CUPSD_LOG_ERROR,
- "SecIdentitySearchCopyNext CFTypeID failure!");
- else
- {
- if ((certificates = CFArrayCreate(NULL, (const void **)&identity,
- 1, &kCFTypeArrayCallBacks)) == NULL)
- cupsdLogMessage(CUPSD_LOG_ERROR, "Cannot create certificate array");
- }
+ cupsdLogMessage(CUPSD_LOG_DEBUG,
+ "Cannot find signing key in keychain \"%s\": %s (%d)",
+ ServerCertificate, cssmErrorString(err), (int)err);
+ goto cleanup;
+ }
+# endif /* HAVE_SECPOLICYCREATESSL */
- CFRelease(identity);
- }
+ if (CFGetTypeID(identity) != SecIdentityGetTypeID())
+ {
+ cupsdLogMessage(CUPSD_LOG_ERROR, "SecIdentity CFTypeID failure!");
+ goto cleanup;
+ }
- CFRelease(search);
+ if ((certificates = CFArrayCreate(NULL, (const void **)&identity,
+ 1, &kCFTypeArrayCallBacks)) == NULL)
+ {
+ cupsdLogMessage(CUPSD_LOG_ERROR, "Cannot create certificate array");
+ goto cleanup;
}
-# if HAVE_SECIDENTITYSEARCHCREATEWITHPOLICY
- CFRelease(policy);
- CFRelease(policy_search);
-# endif /* HAVE_SECIDENTITYSEARCHCREATEWITHPOLICY */
+ cleanup :
+
+ if (keychain)
+ CFRelease(keychain);
+ if (search)
+ CFRelease(search);
+ if (identity)
+ CFRelease(identity);
+
+# if HAVE_SECPOLICYCREATESSL
+ if (policy)
+ CFRelease(policy);
+ if (query)
+ CFRelease(query);
+
+# elif defined(HAVE_SECIDENTITYSEARCHCREATEWITHPOLICY)
+ if (policy)
+ CFRelease(policy);
+ if (policy_search)
+ CFRelease(policy_search);
+# endif /* HAVE_SECPOLICYCREATESSL */
return (certificates);
}
char argbuf[10240], /* Argument buffer */
*argv[100], /* Argument strings */
*envp[MAX_ENV + 20]; /* Environment variables */
- char auth_type[256], /* CUPSD_AUTH_TYPE environment variable */
+ char auth_type[256], /* AUTH_TYPE environment variable */
content_length[1024], /* CONTENT_LENGTH environment variable */
content_type[1024], /* CONTENT_TYPE environment variable */
http_cookie[32768], /* HTTP_COOKIE environment variable */
argv[0] = command;
if (options)
- strlcpy(argbuf, options, sizeof(argbuf));
+ {
+ commptr = options;
+ if (*commptr == ' ')
+ commptr ++;
+ strlcpy(argbuf, commptr, sizeof(argbuf));
+ }
else
argbuf[0] = '\0';
if (con->username[0])
{
- snprintf(auth_type, sizeof(auth_type), "CUPSD_AUTH_TYPE=%s",
+ snprintf(auth_type, sizeof(auth_type), "AUTH_TYPE=%s",
httpGetField(HTTP(con), HTTP_FIELD_AUTHORIZATION));
if ((uriptr = strchr(auth_type + 10, ' ')) != NULL)
DefaultPolicyPtr = p = cupsdAddPolicy("default");
cupsdLogMessage(CUPSD_LOG_INFO, "<Policy default>");
+ cupsdLogMessage(CUPSD_LOG_INFO,
+ "<Limit Create-Job Print-Job Print-URI Validate-Job>");
+ cupsdLogMessage(CUPSD_LOG_INFO, "Order Deny,Allow");
+
+ po = cupsdAddPolicyOp(p, NULL, IPP_CREATE_JOB);
+ po->order_type = CUPSD_AUTH_ALLOW;
+
+ cupsdAddPolicyOp(p, po, IPP_PRINT_JOB);
+ cupsdAddPolicyOp(p, po, IPP_PRINT_URI);
+ cupsdAddPolicyOp(p, po, IPP_VALIDATE_JOB);
+
+ cupsdLogMessage(CUPSD_LOG_INFO, "</Limit>");
+
cupsdLogMessage(CUPSD_LOG_INFO,
"<Limit Send-Document Send-URI Cancel-Job Hold-Job "
"Release-Job Restart-Job Purge-Jobs "
linenum);
/*
- * Verify that we have an explicit policy for Cancel-Jobs, Cancel-My-Jobs,
- * Close-Job, and CUPS-Get-Document (ensures that upgrades do not
- * introduce new security issues...)
+ * Verify that we have an explicit policy for Validate-Job, Cancel-Jobs,
+ * Cancel-My-Jobs, Close-Job, and CUPS-Get-Document, which ensures that
+ * upgrades do not introduce new security issues...
*/
+ if ((op = cupsdFindPolicyOp(pol, IPP_VALIDATE_JOB)) == NULL ||
+ op->op == IPP_ANY_OPERATION)
+ {
+ if ((op = cupsdFindPolicyOp(pol, IPP_PRINT_JOB)) != NULL &&
+ op->op != IPP_ANY_OPERATION)
+ {
+ /*
+ * Add a new limit for Validate-Job using the Print-Job limit as a
+ * template...
+ */
+
+ cupsdLogMessage(CUPSD_LOG_WARN,
+ "No limit for Validate-Job defined in policy %s "
+ "- using Print-Job's policy", pol->name);
+
+ cupsdAddPolicyOp(pol, op, IPP_VALIDATE_JOB);
+ }
+ }
+
if ((op = cupsdFindPolicyOp(pol, IPP_CANCEL_JOBS)) == NULL ||
op->op == IPP_ANY_OPERATION)
{
type='service'
version='1'>
+ <restarter>
+ <service_fmri value='svc:/network/inetd:default' />
+ </restarter>
+
<dependency
name='filesystem_minimal'
grouping='require_all'
timeout_seconds='60' />
<instance name='default' enabled='false' >
- <restarter>
- <service_fmri value='svc:/network/inetd:default' />
- </restarter>
-
<dependency
name='cupsd'
grouping='require_all'
if (modify)
{
- cupsdAddEvent(CUPSD_EVENT_PRINTER_MODIFIED | CUPSD_EVENT_PRINTER_CONFIG,
+ cupsdAddEvent(CUPSD_EVENT_PRINTER_MODIFIED,
pclass, NULL, "Class \"%s\" modified by \"%s\".",
pclass->name, get_username(con));
{
cupsdAddPrinterHistory(pclass);
- cupsdAddEvent(CUPSD_EVENT_PRINTER_ADDED | CUPSD_EVENT_PRINTER_CONFIG,
+ cupsdAddEvent(CUPSD_EVENT_PRINTER_ADDED,
pclass, NULL, "New class \"%s\" added by \"%s\".",
pclass->name, get_username(con));
* Do media selection as needed...
*/
- if (!ippFindAttribute(con->request, "InputSlot", IPP_TAG_ZERO) &&
- (ppd = _pwgGetInputSlot(printer->pwg, con->request, NULL)) != NULL)
- ippAddString(con->request, IPP_TAG_JOB, IPP_TAG_NAME, "InputSlot", NULL,
- ppd);
-
- if (!ippFindAttribute(con->request, "MediaType", IPP_TAG_ZERO) &&
- (ppd = _pwgGetMediaType(printer->pwg, con->request, NULL)) != NULL)
- ippAddString(con->request, IPP_TAG_JOB, IPP_TAG_NAME, "MediaType", NULL,
- ppd);
-
- if (!ippFindAttribute(con->request, "PageSize", IPP_TAG_ZERO) &&
+ if (!ippFindAttribute(con->request, "PageRegion", IPP_TAG_ZERO) &&
+ !ippFindAttribute(con->request, "PageSize", IPP_TAG_ZERO) &&
(ppd = _pwgGetPageSize(printer->pwg, con->request, NULL, &exact)) != NULL)
{
- ippAddString(con->request, IPP_TAG_JOB, IPP_TAG_NAME, "PageSize", NULL,
- ppd);
-
if (!exact &&
(media_col = ippFindAttribute(con->request, "media-col",
IPP_TAG_BEGIN_COLLECTION)) != NULL)
{
/*
* If we changed the PPD/interface script, then remove the printer's cache
- * file...
+ * file and clear the printer-state-reasons...
*/
char cache_name[1024]; /* Cache filename for printer attrs */
printer->name);
unlink(cache_name);
+ cupsdSetPrinterReasons(printer, "none");
+
#ifdef __APPLE__
/*
* (Re)register color profiles...
if (modify)
{
- cupsdAddEvent(CUPSD_EVENT_PRINTER_MODIFIED | CUPSD_EVENT_PRINTER_CONFIG,
+ cupsdAddEvent(CUPSD_EVENT_PRINTER_MODIFIED,
printer, NULL, "Printer \"%s\" modified by \"%s\".",
printer->name, get_username(con));
{
cupsdAddPrinterHistory(printer);
- cupsdAddEvent(CUPSD_EVENT_PRINTER_ADDED | CUPSD_EVENT_PRINTER_CONFIG,
+ cupsdAddEvent(CUPSD_EVENT_PRINTER_ADDED,
printer, NULL, "New printer \"%s\" added by \"%s\".",
printer->name, get_username(con));
type) != 2)
{
send_ipp_status(con, IPP_BAD_REQUEST,
- _("Could not scan type \"%s\""),
+ _("Bad document-format \"%s\""),
format->values[0].string.text);
return;
}
if (sscanf(default_format, "%15[^/]/%31[^;]", super, type) != 2)
{
send_ipp_status(con, IPP_BAD_REQUEST,
- _("Could not scan type \"%s\""),
+ _("Bad document-format \"%s\""),
default_format);
return;
}
else if (!filetype)
{
send_ipp_status(con, IPP_DOCUMENT_FORMAT,
- _("Unsupported format \'%s/%s\'"), super, type);
+ _("Unsupported document-format \"%s\""),
+ format ? format->values[0].string.text :
+ "application/octet-stream");
cupsdLogMessage(CUPSD_LOG_INFO,
"Hint: Do you have the raw file printing rules enabled?");
ipp_attribute_t *uri) /* I - Printer URI */
{
http_status_t status; /* Policy status */
- ipp_attribute_t *attr; /* Current attribute */
+ ipp_attribute_t *attr, /* Current attribute */
+ *auth_info; /* auth-info attribute */
ipp_attribute_t *format; /* Document-format attribute */
cups_ptype_t dtype; /* Destination type (printer/class) */
char super[MIME_MAX_SUPER],
*/
if ((attr = ippFindAttribute(con->request, "compression",
- IPP_TAG_KEYWORD)) != NULL &&
- !strcmp(attr->values[0].string.text, "none"))
+ IPP_TAG_KEYWORD)) != NULL)
{
- send_ipp_status(con, IPP_ATTRIBUTES,
- _("Unsupported compression attribute %s"),
- attr->values[0].string.text);
- ippAddString(con->response, IPP_TAG_UNSUPPORTED_GROUP, IPP_TAG_KEYWORD,
- "compression", NULL, attr->values[0].string.text);
- return;
+ if (strcmp(attr->values[0].string.text, "none")
+#ifdef HAVE_LIBZ
+ && strcmp(attr->values[0].string.text, "gzip")
+#endif /* HAVE_LIBZ */
+ )
+ {
+ send_ipp_status(con, IPP_ATTRIBUTES,
+ _("Unsupported compression \"%s\""),
+ attr->values[0].string.text);
+ ippAddString(con->response, IPP_TAG_UNSUPPORTED_GROUP, IPP_TAG_KEYWORD,
+ "compression", NULL, attr->values[0].string.text);
+ return;
+ }
}
/*
cupsdLogMessage(CUPSD_LOG_INFO,
"Hint: Do you have the raw file printing rules enabled?");
send_ipp_status(con, IPP_DOCUMENT_FORMAT,
- _("Unsupported format \"%s\""),
+ _("Unsupported document-format \"%s\""),
format->values[0].string.text);
ippAddString(con->response, IPP_TAG_UNSUPPORTED_GROUP, IPP_TAG_MIMETYPE,
"document-format", NULL, format->values[0].string.text);
* Check policy...
*/
+ auth_info = ippFindAttribute(con->request, "auth-info", IPP_TAG_TEXT);
+
if ((status = cupsdCheckPolicy(printer->op_policy_ptr, con, NULL)) != HTTP_OK)
{
send_http_error(con, status, printer);
return;
}
+ else if (printer->num_auth_info_required == 1 &&
+ !strcmp(printer->auth_info_required[0], "negotiate") &&
+ !con->username[0])
+ {
+ send_http_error(con, HTTP_UNAUTHORIZED, printer);
+ return;
+ }
+#ifdef HAVE_SSL
+ else if (auth_info && !con->http.tls &&
+ !httpAddrLocalhost(con->http.hostaddr))
+ {
+ /*
+ * Require encryption of auth-info over non-local connections...
+ */
+
+ send_http_error(con, HTTP_UPGRADE_REQUIRED, printer);
+ return;
+ }
+#endif /* HAVE_SSL */
/*
* Everything was ok, so return OK status...
static char *get_options(cupsd_job_t *job, int banner_page, char *copies,
size_t copies_size, char *title,
size_t title_size);
-static int ipp_length(ipp_t *ipp);
+static size_t ipp_length(ipp_t *ipp);
static void load_job_cache(const char *filename);
static void load_next_job_id(const char *filename);
static void load_request_root(void);
size_t title_size) /* I - Size of title buffer */
{
int i; /* Looping var */
+ size_t newlength; /* New option buffer length */
char *optptr, /* Pointer to options */
*valptr; /* Pointer in value string */
ipp_attribute_t *attr; /* Current attribute */
+ _pwg_t *pwg; /* PWG->PPD mapping data */
+ int num_pwgppds; /* Number of PWG->PPD options */
+ cups_option_t *pwgppds, /* PWG->PPD options */
+ *pwgppd, /* Current PWG->PPD option */
+ *preset; /* Current preset option */
+ int output_mode, /* Output mode (if any) */
+ print_quality; /* Print quality (if any) */
+ const char *ppd; /* PPD option choice */
+ int exact; /* Did we get an exact match? */
static char *options = NULL;/* Full list of options */
- static int optlength = 0; /* Length of option buffer */
+ static size_t optlength = 0; /* Length of option buffer */
/*
- * Building the options string is harder than it needs to be, but
- * for the moment we need to pass strings for command-line args and
- * not IPP attribute pointers... :)
+ * Building the options string is harder than it needs to be, but for the
+ * moment we need to pass strings for command-line args and not IPP attribute
+ * pointers... :)
*
- * First allocate/reallocate the option buffer as needed...
+ * First build an options array for any PWG->PPD mapped option/choice pairs.
*/
- i = ipp_length(job->attrs);
+ pwg = job->printer->pwg;
+ num_pwgppds = 0;
+ pwgppds = NULL;
- if (i > optlength || !options)
+ if (pwg)
+ {
+ if ((attr = ippFindAttribute(job->attrs, "output-mode",
+ IPP_TAG_KEYWORD)) != NULL &&
+ !strcmp(attr->values[0].string.text, "monochrome"))
+ output_mode = _PWG_OUTPUT_MODE_MONOCHROME;
+ else
+ output_mode = _PWG_OUTPUT_MODE_COLOR;
+
+ if ((attr = ippFindAttribute(job->attrs, "print-quality",
+ IPP_TAG_INTEGER)) != NULL &&
+ attr->values[0].integer >= IPP_QUALITY_DRAFT &&
+ attr->values[0].integer <= IPP_QUALITY_HIGH)
+ print_quality = attr->values[0].integer - IPP_QUALITY_DRAFT;
+ else
+ print_quality = IPP_QUALITY_NORMAL;
+
+ if (pwg->num_presets[output_mode][print_quality] == 0)
+ {
+ /*
+ * Try to find a preset that works so that we maximize the chances of us
+ * getting a good print using IPP attributes.
+ */
+
+ if (pwg->num_presets[output_mode][_PWG_PRINT_QUALITY_NORMAL] > 0)
+ print_quality = _PWG_PRINT_QUALITY_NORMAL;
+ else if (pwg->num_presets[_PWG_OUTPUT_MODE_COLOR][print_quality] > 0)
+ output_mode = _PWG_OUTPUT_MODE_COLOR;
+ else
+ {
+ print_quality = _PWG_PRINT_QUALITY_NORMAL;
+ output_mode = _PWG_OUTPUT_MODE_COLOR;
+ }
+ }
+
+ if (pwg->num_presets[output_mode][print_quality] > 0)
+ {
+ /*
+ * Copy the preset options as long as the corresponding names are not
+ * already defined in the IPP request...
+ */
+
+ for (i = pwg->num_presets[output_mode][print_quality],
+ preset = pwg->presets[output_mode][print_quality];
+ i > 0;
+ i --, preset ++)
+ {
+ if (!ippFindAttribute(job->attrs, preset->name, IPP_TAG_ZERO))
+ num_pwgppds = cupsAddOption(preset->name, preset->value, num_pwgppds,
+ &pwgppds);
+ }
+ }
+
+ if (pwg->sides_option &&
+ !ippFindAttribute(job->attrs, pwg->sides_option, IPP_TAG_ZERO) &&
+ (attr = ippFindAttribute(job->attrs, "sides", IPP_TAG_KEYWORD)) != NULL)
+ {
+ /*
+ * Add a duplex option...
+ */
+
+ if (!strcmp(attr->values[0].string.text, "one-sided"))
+ num_pwgppds = cupsAddOption(pwg->sides_option, pwg->sides_1sided,
+ num_pwgppds, &pwgppds);
+ else if (!strcmp(attr->values[0].string.text, "two-sided-long-edge"))
+ num_pwgppds = cupsAddOption(pwg->sides_option, pwg->sides_2sided_long,
+ num_pwgppds, &pwgppds);
+ else if (!strcmp(attr->values[0].string.text, "two-sided-short-edge"))
+ num_pwgppds = cupsAddOption(pwg->sides_option, pwg->sides_2sided_short,
+ num_pwgppds, &pwgppds);
+ }
+ }
+
+ if (!ippFindAttribute(job->attrs, "InputSlot", IPP_TAG_ZERO) &&
+ (ppd = _pwgGetInputSlot(job->printer->pwg, job->attrs, NULL)) != NULL)
+ num_pwgppds = cupsAddOption("InputSlot", ppd, num_pwgppds, &pwgppds);
+
+ if (!ippFindAttribute(job->attrs, "MediaType", IPP_TAG_ZERO) &&
+ (ppd = _pwgGetMediaType(job->printer->pwg, job->attrs, NULL)) != NULL)
+ num_pwgppds = cupsAddOption("MediaType", ppd, num_pwgppds, &pwgppds);
+
+ if (!ippFindAttribute(job->attrs, "PageRegion", IPP_TAG_ZERO) &&
+ !ippFindAttribute(job->attrs, "PageSize", IPP_TAG_ZERO) &&
+ (ppd = _pwgGetPageSize(job->printer->pwg, job->attrs, NULL,
+ &exact)) != NULL)
+ num_pwgppds = cupsAddOption("PageSize", ppd, num_pwgppds, &pwgppds);
+
+ if (!ippFindAttribute(job->attrs, "OutputBin", IPP_TAG_ZERO) &&
+ (attr = ippFindAttribute(job->attrs, "output-bin",
+ IPP_TAG_ZERO)) != NULL &&
+ (attr->value_tag == IPP_TAG_KEYWORD || attr->value_tag == IPP_TAG_NAME) &&
+ (ppd = _pwgGetOutputBin(pwg, attr->values[0].string.text)) != NULL)
+ num_pwgppds = cupsAddOption("OutputBin", ppd, num_pwgppds, &pwgppds);
+
+ /*
+ * Figure out how much room we need...
+ */
+
+ newlength = ipp_length(job->attrs);
+
+ for (i = num_pwgppds, pwgppd = pwgppds; i > 0; i --, pwgppd ++)
+ newlength += 1 + strlen(pwgppd->name) + 1 + strlen(pwgppd->value);
+
+ /*
+ * Then allocate/reallocate the option buffer as needed...
+ */
+
+ if (newlength > optlength || !options)
{
if (!options)
- optptr = malloc(i);
+ optptr = malloc(newlength);
else
- optptr = realloc(options, i);
+ optptr = realloc(options, newlength);
if (!optptr)
{
cupsdLogJob(job, CUPSD_LOG_CRIT,
- "Unable to allocate %d bytes for option buffer!", i);
+ "Unable to allocate " CUPS_LLFMT " bytes for option buffer!",
+ CUPS_LLCAST newlength);
return (NULL);
}
options = optptr;
- optlength = i;
+ optlength = newlength;
}
/*
* Filter out other unwanted attributes...
*/
- if (attr->value_tag == IPP_TAG_MIMETYPE ||
+ if (attr->value_tag == IPP_TAG_NOVALUE ||
+ attr->value_tag == IPP_TAG_MIMETYPE ||
attr->value_tag == IPP_TAG_NAMELANG ||
attr->value_tag == IPP_TAG_TEXTLANG ||
(attr->value_tag == IPP_TAG_URI && strcmp(attr->name, "job-uuid")) ||
attr->value_tag == IPP_TAG_BEGIN_COLLECTION) /* Not yet supported */
continue;
- if (!strncmp(attr->name, "time-", 5) ||
- !strcmp(attr->name, "job-hold-until"))
+ if (!strcmp(attr->name, "job-hold-until"))
continue;
if (!strncmp(attr->name, "job-", 4) &&
if (!attr->values[i].boolean)
strlcat(optptr, "no", optlength - (optptr - options));
- case IPP_TAG_NOVALUE :
- strlcat(optptr, attr->name,
- optlength - (optptr - options));
- break;
-
case IPP_TAG_RANGE :
if (attr->values[i].range.lower == attr->values[i].range.upper)
snprintf(optptr, optlength - (optptr - options) - 1,
}
}
+ /*
+ * Finally loop through the PWG->PPD mapped options and add them...
+ */
+
+ for (i = num_pwgppds, pwgppd = pwgppds; i > 0; i --, pwgppd ++)
+ {
+ *optptr++ = ' ';
+ strcpy(optptr, pwgppd->name);
+ optptr += strlen(optptr);
+ *optptr++ = '=';
+ strcpy(optptr, pwgppd->value);
+ optptr += strlen(optptr);
+ }
+
+ cupsFreeOptions(num_pwgppds, pwgppds);
+
+ /*
+ * Return the options string...
+ */
return (options);
}
* the textual IPP attributes.
*/
-static int /* O - Size of attribute buffer */
+static size_t /* O - Size of attribute buffer */
ipp_length(ipp_t *ipp) /* I - IPP request */
{
- int bytes; /* Number of bytes */
+ size_t bytes; /* Number of bytes */
int i; /* Looping var */
ipp_attribute_t *attr; /* Current attribute */
* Skip attributes that won't be sent to filters...
*/
- if (attr->value_tag == IPP_TAG_MIMETYPE ||
+ if (attr->value_tag == IPP_TAG_NOVALUE ||
+ attr->value_tag == IPP_TAG_MIMETYPE ||
attr->value_tag == IPP_TAG_NAMELANG ||
attr->value_tag == IPP_TAG_TEXTLANG ||
attr->value_tag == IPP_TAG_URI ||
attr->value_tag == IPP_TAG_URISCHEME)
continue;
- if (strncmp(attr->name, "time-", 5) == 0)
- continue;
-
/*
* Add space for a leading space and commas between each value.
* For the first attribute, the leading space isn't used, so the
!cupsArrayCount(ActiveJobs) &&
(!Browsing ||
(!BrowseRemoteProtocols &&
- (!NumBrowsers || !BrowseLocalProtocols ||
- cupsArrayCount(Printers) == 0))))
+ (!BrowseLocalProtocols || !cupsArrayCount(Printers)))))
{
timeout = LaunchdTimeout;
launchd_idle_exit = 1;
* shared printers to advertise...
*/
- if ((cupsArrayCount(ActiveJobs) || NumPolled ||
- (Browsing &&
- (BrowseRemoteProtocols ||
- (BrowseLocalProtocols && NumBrowsers && cupsArrayCount(Printers))))))
+ if (cupsArrayCount(ActiveJobs) || NumPolled ||
+ (Browsing &&
+ (BrowseRemoteProtocols ||
+ (BrowseLocalProtocols && cupsArrayCount(Printers)))))
{
cupsdLogMessage(CUPSD_LOG_DEBUG,
"Creating launchd keepalive file \"" CUPS_KEEPALIVE
int /* O - 1 if something changed, 0 otherwise */
cupsdSetPrinterReasons(
- cupsd_printer_t *p, /* I - Printer */
- const char *s) /* I - Reasons strings */
+ cupsd_printer_t *p, /* I - Printer */
+ const char *s) /* I - Reasons strings */
{
int i, /* Looping var */
changed = 0; /* Did something change? */
*
* Select abstraction functions for the Common UNIX Printing System (CUPS).
*
- * Copyright 2007-2009 by Apple Inc.
+ * Copyright 2007-2010 by Apple Inc.
* Copyright 2006-2007 by Easy Software Products.
*
* These coded instructions, statements, and computer programs are the
static int compare_fds(_cupsd_fd_t *a, _cupsd_fd_t *b);
static _cupsd_fd_t *find_fd(int fd);
-#define release_fd(f) { \
+#define release_fd(f) { \
(f)->use --; \
if (!(f)->use) free((f));\
}
-#define retain_fd(f) (f)->use++
+#define retain_fd(f) (f)->use++
/*
if (fdptr->read_cb && event->filter == EVFILT_READ)
(*(fdptr->read_cb))(fdptr->data);
- if (fdptr->use > 1 && fdptr->write_cb && event->filter == EVFILT_WRITE)
+ if (fdptr->use > 1 && fdptr->write_cb && event->filter == EVFILT_WRITE &&
+ !cupsArrayFind(cupsd_inactive_fds, fdptr))
(*(fdptr->write_cb))(fdptr->data);
release_fd(fdptr);
(*(fdptr->read_cb))(fdptr->data);
if (fdptr->use > 1 && fdptr->write_cb &&
- (event->events & (EPOLLOUT | EPOLLERR | EPOLLHUP)))
+ (event->events & (EPOLLOUT | EPOLLERR | EPOLLHUP)) &&
+ !cupsArrayFind(cupsd_inactive_fds, fdptr))
(*(fdptr->write_cb))(fdptr->data);
release_fd(fdptr);
<THEAD><TR><TH>Name</TH><TH>Events</TH><TH>Queue Name</TH></TR></THEAD>
<TBODY>{[notify_subscription_id]
<TR><TD><A HREF="{notify_recipient_uri}">{notify_recipient_name}</A><BR>
-<FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="cancel-subscription"><INPUT TYPE="HIDDEN" NAME="notify_subscription_id" VALUE="{notify_subscription_id}"><INPUT TYPE="SUBMIT" VALUE="Cancel RSS Subscription"></FORM> </TD><TD>{notify_events}</TD><TD NOWRAP> {notify_printer_name?{notify_printer_name}:All Queues}</TD></TR>}
+<FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="cancel-subscription"><INPUT TYPE="HIDDEN" NAME="notify_subscription_id" VALUE="{notify_subscription_id}"><INPUT TYPE="SUBMIT" VALUE="Cancel RSS Subscription"></FORM> </TD><TD>{notify_events}</TD><TD NOWRAP> {notify_printer_name?{notify_printer_name}:All Queues}</TD></TR>}
</TBODY>
</TABLE>:}
ATTR uri printer-uri $uri
ATTR name requesting-user-name $user
ATTR keyword which-jobs completed
- DELAY 10
+ DELAY 20
STATUS successful-ok
EXPECT job-id OF-TYPE integer IN-GROUP job-attributes-tag COUNT 1 WITH-VALUE >0
# Test print-job and job-hold-until attribute
{
# The name of the test...
- NAME "Print with print-job + job-hold-until"
-
- # The resource to use for the POST
- # RESOURCE /admin
+ NAME "Print-Job w/job-hold-until=indefinite"
# The operation to use
- OPERATION print-job
+ OPERATION Print-Job
# Attributes, starting in the operation group...
- GROUP operation
+ GROUP operation-attributes-tag
ATTR charset attributes-charset utf-8
ATTR language attributes-natural-language en
ATTR uri printer-uri $uri
FILE $filename
# What statuses are OK?
- STATUS ok
- STATUS ok-subst
+ STATUS successful-ok
+ STATUS successful-ok-ignored-or-substituted-attributes
# What attributes do we expect?
EXPECT job-id
EXPECT job-uri
}
+{
+ NAME "Release-Job"
+ OPERATION Release-Job
+
+ GROUP operation-attributes-tag
+ ATTR charset attributes-charset utf-8
+ ATTR language attributes-natural-language en
+ ATTR uri printer-uri $uri
+ ATTR integer job-id $job-id
+ ATTR name requesting-user-name $user
+
+ # What statuses are OK?
+ STATUS successful-ok
+}
echo "<P>PASS: page_log formatted correctly.</P>" >>$strfile
else
echo "FAIL: page_log formatted incorrectly."
- echo "<P>FAIL: page_log formatted incorrectly.</P>" >>$strfile
+ echo "<P>FAIL: page_log formatted incorrectly - no page size information.</P>" >>$strfile
fail=`expr $fail + 1`
fi
svn up
rev=`svnversion . | sed -e '1,$s/[a-zA-Z]//g'`
fileversion="1.5svn-r$rev"
- version=snapshot
+ version=snapshots
else
fileversion=$1
version=$1
/>\r
</FileConfiguration>\r
</File>\r
+ <File\r
+ RelativePath="..\cups\sspi.c"\r
+ >\r
+ </File>\r
<File\r
RelativePath="..\cups\string.c"\r
>\r
/>\r
</FileConfiguration>\r
</File>\r
+ <File\r
+ RelativePath="..\cups\thread.c"\r
+ >\r
+ </File>\r
<File\r
RelativePath="..\cups\transcode.c"\r
>\r
RelativePath="..\cups\pwg-private.h"\r
>\r
</File>\r
+ <File\r
+ RelativePath="..\cups\sspi-private.h"\r
+ >\r
+ </File>\r
<File\r
RelativePath="..\cups\string.h"\r
>\r
</File>\r
+ <File\r
+ RelativePath="..\cups\thread-private.h"\r
+ >\r
+ </File>\r
<File\r
RelativePath="..\cups\transcode.h"\r
>\r
projects / thirdparty / cups.git / commitdiff
