Import cups.org releases

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/tags/release-1.3.5@4306 a1ca3aef-8c08-0410-bb20-df032aa958be

CHANGES.txt

@@ -1,98 +1,6 @@
-CHANGES.txt - 2008-02-15
+CHANGES.txt - 2007-12-17
 ------------------------
 
-CHANGES IN CUPS V1.3.6
-
-	- Documentation updates (STR #2646, STR #2647, STR #2649)
-	- Fixed a problem with the web interface "Use Kerberos
-	  Authentication" check box (STR #2703)
-	- The scheduler unconditionally overwrote the printer-state-
-	  message with "process-name failed" when a filter or backend
-	  failed, preventing a useful error message from being shown
-	  to the user.
-	- Policies on CUPS-Move-Job didn't work as expected (STR
-	  #2699)
-	- The configure script only supported D-BUS on Linux
-	  (STR #2702)
-	- The scheduler did not support </LimitExcept> (STR #2701)
-	- The scheduler did not reset the job-hold-until attribute
-	  after a job's hold time was reached.
-	- The scheduler did not support printer supply attributes
-	  (STR #1307)
-	- The Kerberos credentials provided by some Windows KDCs
-	  were still too large - now use a dynamic buffer to
-	  support credentials up to 64k in size (STR #2695)
-	- Printing a test page from the web interface incorrectly
-	  defaulted to the "guest" user (STR #2688)
-	- The cupsEncodeOptions2() function did not parse multiple-
-	  value attribute values properly (STR #2690)
-	- The scheduler incorrectly sent printer-stopped events for
-	  status updates from the print filters (STR #2680)
-	- The IPP backend could crash when handling printer errors
-	  (STR #2667)
-	- Multi-file jobs did not print to remote CUPS servers
-	  (STR #2673)
-	- The scheduler did not provide the Apple language ID to
-	  job filters.
-	- Kerberos authentication did not work with the web
-	  interface (STR #2606, STR #2669)
-	- The requesing-user-name-allowed and -denied functionality
-	  did not work for Kerberos-authenticated usernames (STR
-	  #2670)
-	- CUPS didn't compile on HP-UX 11i (STR #2679)
-	- cupsEncodeOptions2() did not handle option values like
-	  "What's up, doc?" properly.
-	- Added lots of memory allocation checks (Fortify)
-	- The scheduler would crash if it was unable to add a job
-	  file (Fortify)
-	- ppdOpen*() did not check all memory allocations (Coverity)
-	- ippReadIO() did not check all memory allocations (Coverity)
-	- The PostScript filter did not detect read errors (Coverity)
-	- The scheduler did not check for a missing job-sheets-completed
-	  attribute when sending an event notification (Coverity)
-	- "Set Printer Options" might not work with raw queues (Coverity)
-	- cupsRasterInterpretPPD() could crash on certain PostScript
-	  errors (Coverity)
-	- The USB backend did not check for back-channel support
-	  properly on all systems (Coverity)
-	- Fixed memory leaks in the GIF and PNM image loading code
-	  (Coverity)
-	- Removed some dead code in the CUPS API and scheduler (Coverity)
-	- Fixed two overflow bugs in the HP-GL/2 filter (Coverity)
-	- Fixed another ASN1 string parsing bug (STR #2665)
-	- The RSS notifier directory was not installed with the
-	  correct permissions.
-	- The standard CUPS backends could use 100% CPU while waiting
-	  for print data (STR #2664)
-	- Filename-based MIME rules did not work (STR #2659)
-	- The cups-polld program did not exit if the scheduler crashed
-	  (STR #2640)
-	- The scheduler would crash if you tried to set the port-monitor
-	  on a raw queue (STR #2639)
-	- The scheduler could crash if a polled remote printer was
-	  converted to a class (STR #2656)
-	- The web interface and cupsctl did not correctly reflect
-	  the "allow printing from the Internet" state (STR #2650)
-	- The scheduler incorrectly treated MIME types as case-
-	  sensitive (STR #2657)
-	- The Java support classes did not send UTF-8 strings to
-	  the scheduler (STR #2651)
-	- The CGI code did not handle interrupted POST requests
-	  properly (STR #2652)
-	- The PostScript filter incorrectly handled number-up when
-	  the number of pages was evenly divisible by the number-up
-	  value.
-	- The PDF filter incorrectly filtered pages when page-ranges
-	  and number-up were both specified (STR #2643)
-	- The IPP backend did not handle printing of pictwps files
-	  to a non-Mac CUPS server properly.
-	- The scheduler did not detect network interface changes
-	  on operating systems other than Mac OS X (STR #2631)
-	- The scheduler now logs the UNIX error message when it
-	  is unable to create a request file such as a print job.
-	- Added support for --enable-pie on Mac OS X.
-
-
 CHANGES IN CUPS V1.3.5
 
 	- The SNMP backend did not check for negative string

INSTALL.txt

@@ -1,4 +1,4 @@
-INSTALL - CUPS v1.3.6 - 2008-02-15
+INSTALL - CUPS v1.3.2 - 2007-09-18
 ----------------------------------
 
 This file describes how to compile and install CUPS from source
@@ -31,8 +31,9 @@ BEFORE YOU BEGIN
     compile and run without these, however you'll miss out on
     many of the features provided by CUPS.
 
-    Kerberos support requires MIT Kerberos 1.6.3 or later or
-    or Heimdal Kerberos, along with the corresponding GSSAPI
+    Kerberos support requires a very recent version of the MIT
+    implementation with the krb5_cc_new_unique() function or the
+    Heimdal implementation, along with the corresponding GSSAPI
     pieces.
 
     Also, please note that CUPS no longer includes the
@@ -46,7 +47,7 @@ COMPILING FROM SUBVERSION
 
     The CUPS Subversion repository doesn't hold a copy of the
     pre-built configure script.  You'll need to run the GNU
-    autoconf software (2.60 or higher) before compiling the
+    autoconf software (2.52 or higher) before compiling the
     software from Subversion:
 
 	autoconf -f

Makedefs.in

@@ -3,7 +3,7 @@
 #
 #   Common makefile definitions for the Common UNIX Printing System (CUPS).
 #
-#   Copyright 2007-2008 by Apple Inc.
+#   Copyright 2007 by Apple Inc.
 #   Copyright 1997-2007 by Easy Software Products, all rights reserved.
 #
 #   These coded instructions, statements, and computer programs are the
@@ -108,17 +108,17 @@ INSTALLSTATIC	=	@INSTALLSTATIC@
 #               for extra debug info)
 #
 
-ALL_CFLAGS	=	-I.. -D_CUPS_SOURCE $(CFLAGS) $(SSLFLAGS) \
-			@LARGEFILE@ @PTHREAD_FLAGS@ $(OPTIONS)
-ALL_CXXFLAGS	=	-I.. -D_CUPS_SOURCE $(CXXFLAGS) $(SSLFLAGS) \
-			@LARGEFILE@ @PTHREAD_FLAGS@ $(OPTIONS)
+ALL_CFLAGS	=	$(CFLAGS) $(SSLFLAGS) @LARGEFILE@ @PTHREAD_FLAGS@ \
+			$(OPTIONS)
 ARCHFLAGS	=	@ARCHFLAGS@
 ARFLAGS		=	@ARFLAGS@
 BACKLIBS	=	@BACKLIBS@
-CFLAGS		=	@CPPFLAGS@ @CFLAGS@
+CFLAGS		=	-I.. @CPPFLAGS@ @CFLAGS@ \
+			@LARGEFILE@ @PTHREAD_FLAGS@ $(OPTIONS)
 COMMONLIBS	=	@LIBS@
 CUPSDLIBS	=	@CUPSDLIBS@
-CXXFLAGS	=	@CPPFLAGS@ @CXXFLAGS@
+CXXFLAGS	=	-I.. $(SSLFLAGS) @CPPFLAGS@ @CXXFLAGS@ \
+			@LARGEFILE@ @PTHREAD_FLAGS@ $(OPTIONS)
 CXXLIBS		=	@CXXLIBS@
 DSOFLAGS	=	@DSOFLAGS@
 DSOLIBS		=	@DSOLIBS@ $(COMMONLIBS)
@@ -258,7 +258,7 @@ DBUSDIR		=	@DBUSDIR@
 
 .cxx.o:
 	echo Compiling $<...
-	$(CXX) $(ARCHFLAGS) $(OPTIM) $(ALL_CXXFLAGS) -c $<
+	$(CXX) $(ARCHFLAGS) $(OPTIM) $(CXXFLAGS) -c $<
 
 .man.1 .man.1m .man.5 .man.7 .man.8:
 	echo Linking $<...

Makefile

@@ -31,10 +31,6 @@ DIRS	=	cups backend berkeley cgi-bin filter locale man monitor \
 
 all:
 	chmod +x cups-config
-	echo Using ALL_CFLAGS="$(ALL_CFLAGS)"
-	echo Using ALL_CXXFLAGS="$(ALL_CXXFLAGS)"
-	echo Using LDFLAGS="$(LDFLAGS)"
-	echo Using LIBS="$(LIBS)"
 	for dir in $(DIRS); do\
 		echo Making all in $$dir... ;\
 		(cd $$dir ; $(MAKE) $(MFLAGS)) || exit 1;\

README.txt

@@ -1,4 +1,4 @@
-README - CUPS v1.3.6 - 2008-02-15
+README - CUPS v1.3.2 - 2007-09-18
 ---------------------------------
 
 Looking for compile instructions?  Read the file "INSTALL.txt"
@@ -153,9 +153,9 @@ PRINTING FILES
 
 LEGAL STUFF
 
-    CUPS is Copyright 2007-2008 Apple Inc.  All Rights Reserved.
-    CUPS, the CUPS logo, and the Common UNIX Printing System are
-    trademarks of Apple Inc.
+    CUPS is Copyright 2007 by Apple Inc.  CUPS, the CUPS logo, and
+    the Common UNIX Printing System are the trademark property of
+    Apple Inc.
 
     The MD5 Digest code is Copyright 1999 Aladdin Enterprises.
 

backend/ipp.c

@@ -3,7 +3,7 @@
  *
  *   IPP backend for the Common UNIX Printing System (CUPS).
  *
- *   Copyright 2007-2008 by Apple Inc.
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2007 by Easy Software Products, all rights reserved.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -521,8 +521,8 @@ main(int  argc,				/* I - Number of command-line args */
 	              _("INFO: Unable to contact printer, queuing on next "
 			"printer in class...\n"));
 
-        if (tmpfilename[0])
-	  unlink(tmpfilename);
+        if (argc == 6 || strcmp(filename, argv[6]))
+	  unlink(filename);
 
        /*
         * Sleep 5 seconds to keep the job from requeuing too rapidly...
@@ -579,8 +579,8 @@ main(int  argc,				/* I - Number of command-line args */
 
   if (job_cancelled)
   {
-    if (tmpfilename[0])
-      unlink(tmpfilename);
+    if (argc == 6 || strcmp(filename, argv[6]))
+      unlink(filename);
 
     return (CUPS_BACKEND_FAILED);
   }
@@ -765,8 +765,8 @@ main(int  argc,				/* I - Number of command-line args */
       ippDelete(supported);
       httpClose(http);
 
-      if (tmpfilename[0])
-	unlink(tmpfilename);
+      if (argc == 6 || strcmp(filename, argv[6]))
+	unlink(filename);
 
      /*
       * Sleep 5 seconds to keep the job from requeuing too rapidly...
@@ -865,13 +865,12 @@ main(int  argc,				/* I - Number of command-line args */
     num_options = cupsParseOptions(argv[5], 0, &options);
 
 #ifdef __APPLE__
-    if (!strcasecmp(final_content_type, "application/pictwps") &&
-        num_files == 1)
+    if (!strcasecmp(content_type, "application/pictwps") && num_files == 1)
     {
       if (format_sup != NULL)
       {
 	for (i = 0; i < format_sup->num_values; i ++)
-	  if (!strcasecmp(final_content_type, format_sup->values[i].string.text))
+	  if (!strcasecmp(content_type, format_sup->values[i].string.text))
 	    break;
       }
 
@@ -882,18 +881,10 @@ main(int  argc,				/* I - Number of command-line args */
 	* so convert the document to PostScript...
 	*/
 
-	if (run_pictwps_filter(argv, files[0]))
-	{
-	  if (pstmpname[0])
-	    unlink(pstmpname);
-
-	  if (tmpfilename[0])
-	    unlink(tmpfilename);
-
+	if (run_pictwps_filter(argv, filename))
 	  return (CUPS_BACKEND_FAILED);
-        }
 
-        files[0] = pstmpname;
+        filename = pstmpname;
 
        /*
 	* Change the MIME type to application/postscript and change the
@@ -1689,6 +1680,7 @@ run_pictwps_filter(char       **argv,	/* I - Command-line arguments */
 
     _cupsLangPrintf(stderr, _("ERROR: Unable to fork pictwpstops: %s\n"),
 		    strerror(errno));
+    unlink(filename);
     if (ppdfile)
       unlink(ppdfile);
     return (-1);
@@ -1703,6 +1695,7 @@ run_pictwps_filter(char       **argv,	/* I - Command-line arguments */
     _cupsLangPrintf(stderr, _("ERROR: Unable to wait for pictwpstops: %s\n"),
 		    strerror(errno));
     close(fd);
+    unlink(filename);
     if (ppdfile)
       unlink(ppdfile);
     return (-1);
@@ -1722,6 +1715,7 @@ run_pictwps_filter(char       **argv,	/* I - Command-line arguments */
       _cupsLangPrintf(stderr, _("ERROR: pictwpstops exited on signal %d!\n"),
 		      status);
 
+    unlink(filename);
     return (status);
   }
 

backend/pap.c

@@ -1,7 +1,7 @@
 /*
 * "$Id$"
 *
-* Copyright 2004-2008 Apple Inc. All rights reserved.
+* © Copyright 2004 Apple Computer, Inc. All rights reserved.
 * 
 * IMPORTANT:  This Apple software is supplied to you by Apple Computer,
 * Inc. ("Apple") in consideration of your agreement to the following
@@ -70,16 +70,6 @@
 *  signalHandler()	 - handle SIGINT to close the session before quiting.
 */
 
-/*
- * This backend uses deprecated APIs for AppleTalk; we know this, so
- * silence any warnings about it...
- */
-
-#ifdef MAC_OS_X_VERSION_MIN_REQUIRED
-#  undef MAC_OS_X_VERSION_MIN_REQUIRED
-#endif /* MAX_OS_X_VERSION_MIN_REQUIRED */
-#define MAC_OS_X_VERSION_MIN_REQUIRED MAC_OS_X_VERSION_10_0
-
 #include <config.h>
 
 #include <stdio.h>
@@ -95,17 +85,17 @@
 #include <sys/time.h>
 #include <sys/errno.h>
 
-#include <cups/cups.h>
-#include <cups/backend.h>
-#include <cups/sidechannel.h>
-#include <cups/i18n.h>
-
 #include <netat/appletalk.h>
 #include <netat/atp.h>
 #include <netat/ddp.h>
 #include <netat/nbp.h>
 #include <netat/pap.h>
 
+#include <cups/cups.h>
+#include <cups/backend.h>
+#include <cups/sidechannel.h>
+#include <cups/i18n.h>
+
 #include <libkern/OSByteOrder.h>
 
 #ifdef HAVE_APPLETALK_AT_PROTO_H

backend/runloop.c

@@ -3,7 +3,7 @@
  *
  *   Common run loop APIs for the Common UNIX Printing System (CUPS).
  *
- *   Copyright 2007-2008 by Apple Inc.
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 2006-2007 by Easy Software Products, all rights reserved.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -216,7 +216,7 @@ backendRunLoop(
       FD_SET(CUPS_SC_FD, &input);
 
     FD_ZERO(&output);
-    if (print_bytes || (!use_bc && !side_cb))
+    if (print_bytes || !use_bc)
       FD_SET(device_fd, &output);
 
     if (use_bc || side_cb)

backend/snmp.c

@@ -1090,7 +1090,7 @@ asn1_get_string(
     * String is larger than the buffer...
     */
 
-    memcpy(string, *buffer, strsize - 1);
+    memcpy(string, buffer, strsize - 1);
     string[strsize - 1] = '\0';
   }
 

backend/usb-darwin.c

@@ -1,7 +1,7 @@
 /*
 * "$Id$"
 *
-* Copyright 2005-2008 Apple Inc. All rights reserved.
+* Copyright � 2005-2007 Apple Inc. All rights reserved.
 *
 * IMPORTANT:  This Apple software is supplied to you by Apple Computer,
 * Inc. ("Apple") in consideration of your agreement to the following
@@ -83,7 +83,6 @@
 #include <fcntl.h>
 #include <termios.h>
 #include <unistd.h>
-#include <sys/stat.h>
 #include <sys/sysctl.h>
 #include <libgen.h>
 #include <mach/mach.h>
@@ -315,8 +314,7 @@ print_device(const char *uri,		/* I - Device URI */
   OSStatus	  status;		/* Function results */
   pthread_t	  read_thread_id,	/* Read thread */
 		  sidechannel_thread_id;/* Side-channel thread */
-  int		  have_sidechannel = 0;	/* Was the side-channel thread started? */
-  struct stat     sidechannel_info;	/* Side-channel file descriptor info */
+  int		  sidechannel_started = 0;/* Was the side-channel thread started? */
   char		  print_buffer[8192],	/* Print data buffer */
 		  *print_ptr;		/* Pointer into print data buffer */
   UInt32	  location;		/* Unique location in bus topology */
@@ -331,17 +329,6 @@ print_device(const char *uri,		/* I - Device URI */
   struct timespec cond_timeout;		/* pthread condition timeout */
 
 
- /*
-  * See if the side-channel descriptor is valid...
-  */
-
-  have_sidechannel = !fstat(CUPS_SC_FD, &sidechannel_info) &&
-                     S_ISSOCK(sidechannel_info.st_mode);
-
- /*
-  * Localize using CoreFoundation...
-  */
-
   setup_cfLanguage();
 
   parse_options(options, serial, sizeof(serial), &location, &g.wait_eof);
@@ -455,14 +442,21 @@ print_device(const char *uri,		/* I - Device URI */
   }
 
  /*
-  * Start the side channel thread if the descriptor is valid...
+  * Start the side channel thread only if the descriptor is valid
+  * (i.e. it's not when the backend is used for auto-setup)...
   */
 
   pthread_mutex_init(&g.readwrite_lock_mutex, NULL);
   pthread_cond_init(&g.readwrite_lock_cond, NULL);
   g.readwrite_lock = 1;
 
-  if (have_sidechannel)
+  FD_ZERO(&input_set);
+  FD_SET(CUPS_SC_FD, &input_set);
+
+  stimeout.tv_sec  = 0;
+  stimeout.tv_usec = 0;
+
+  if ((select(CUPS_SC_FD+1, &input_set, NULL, NULL, &stimeout)) >= 0)
   {
     g.sidechannel_thread_stop = 0;
     g.sidechannel_thread_done = 0;
@@ -475,6 +469,8 @@ print_device(const char *uri,		/* I - Device URI */
       _cupsLangPuts(stderr, _("WARNING: Couldn't create side channel\n"));
       return CUPS_BACKEND_STOP;
     }
+
+    sidechannel_started = 1;
   }
 
  /*
@@ -673,7 +669,7 @@ print_device(const char *uri,		/* I - Device URI */
   * Wait for the side channel thread to exit...
   */
 
-  if (have_sidechannel)
+  if (sidechannel_started)
   {
     close(CUPS_SC_FD);
     pthread_mutex_lock(&g.readwrite_lock_mutex);
@@ -1683,7 +1679,7 @@ static void parse_options(char *options,
 
 /*!
  * @function	setup_cfLanguage
- * @abstract	Convert the contents of the CUPS 'APPLE_LANGUAGE' environment
+ * @abstract	Convert the contents of the CUPS 'LANG' environment
  *		variable into a one element CF array of languages.
  *
  * @discussion	Each submitted job comes with a natural language. CUPS passes
@@ -1699,9 +1695,7 @@ static void setup_cfLanguage(void)
   CFArrayRef	langArray = NULL;
   const char	*requestedLang = NULL;
 
-  if ((requestedLang = getenv("APPLE_LANGUAGE")) == NULL)
-    requestedLang = getenv("LANG");
-
+  requestedLang = getenv("LANG");
   if (requestedLang != NULL)
   {
     lang[0] = CFStringCreateWithCString(kCFAllocatorDefault, requestedLang, kCFStringEncodingUTF8);
@@ -1714,7 +1708,7 @@ static void setup_cfLanguage(void)
     CFRelease(langArray);
   }
   else
-    fputs("DEBUG: usb: LANG and APPLE_LANGUAGE environment variables missing.\n", stderr);
+    fputs("DEBUG: usb: LANG environment variable missing.\n", stderr);
 }
 
 #pragma mark -

backend/usb-unix.c

@@ -516,7 +516,7 @@ open_device(const char *uri,		/* I - Device URI */
   }
 #else
   {
-    if (*use_bc)
+    if (use_bc)
       fd = open(uri + 4, O_RDWR | O_EXCL);
     else
       fd = -1;

cgi-bin/admin.c

@@ -3,7 +3,7 @@
  *
  *   Administration CGI for the Common UNIX Printing System (CUPS).
  *
- *   Copyright 2007-2008 by Apple Inc.
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2007 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -1333,12 +1333,12 @@ do_config_server(http_t *http)		/* I - HTTP connection */
 			*remote_printers,
 					/* REMOTE_PRINTERS value */
 			*share_printers,/* SHARE_PRINTERS value */
-			*user_cancel_any;
-					/* USER_CANCEL_ANY value */
 #ifdef HAVE_GSSAPI
-    char		default_auth_type[255];
+			*default_auth_type,
 					/* DefaultAuthType value */
 #endif /* HAVE_GSSAPI */
+			*user_cancel_any;
+					/* USER_CANCEL_ANY value */
 
 
    /*
@@ -1373,16 +1373,13 @@ do_config_server(http_t *http)		/* I - HTTP connection */
     */
 
     if (cgiGetVariable("KERBEROS"))
-      strlcpy(default_auth_type, "Negotiate", sizeof(default_auth_type));
+      default_auth_type = "Negotiate";
     else
     {
-      const char *val = cupsGetOption("DefaultAuthType", num_settings,
-                                      settings);
-
-      if (val && !strcasecmp(val, "Negotiate"))
-        strlcpy(default_auth_type, "Basic", sizeof(default_auth_type));
-      else
-        strlcpy(default_auth_type, val, sizeof(default_auth_type));
+      default_auth_type = cupsGetOption("DefaultAuthType", num_settings,
+                                        settings);
+      if (!strcasecmp(default_auth_type, "Negotiate"))
+        default_auth_type = "Basic";
     }
 
     fprintf(stderr, "DEBUG: DefaultAuthType %s\n", default_auth_type);
@@ -1650,15 +1647,14 @@ do_config_server(http_t *http)		/* I - HTTP connection */
     * Allocate memory and load the file into a string buffer...
     */
 
-    if ((buffer = calloc(1, info.st_size + 1)) != NULL)
-    {
-      cupsFileRead(cupsd, buffer, info.st_size);
-      cgiSetVariable("CUPSDCONF", buffer);
-      free(buffer);
-    }
+    buffer = calloc(1, info.st_size + 1);
 
+    cupsFileRead(cupsd, buffer, info.st_size);
     cupsFileClose(cupsd);
 
+    cgiSetVariable("CUPSDCONF", buffer);
+    free(buffer);
+
    /*
     * Then get the default cupsd.conf file and put that into a string as
     * well...
@@ -1669,39 +1665,37 @@ do_config_server(http_t *http)		/* I - HTTP connection */
     if (!stat(filename, &info) && info.st_size < (1024 * 1024) &&
         (cupsd = cupsFileOpen(filename, "r")) != NULL)
     {
-      if ((buffer = calloc(1, 2 * info.st_size + 1)) != NULL)
+      buffer = calloc(1, 2 * info.st_size + 1);
+      bufend = buffer + 2 * info.st_size - 1;
+
+      for (bufptr = buffer;
+           bufptr < bufend && (ch = cupsFileGetChar(cupsd)) != EOF;)
       {
-	bufend = buffer + 2 * info.st_size - 1;
-
-	for (bufptr = buffer;
-	     bufptr < bufend && (ch = cupsFileGetChar(cupsd)) != EOF;)
+        if (ch == '\\' || ch == '\"')
 	{
-	  if (ch == '\\' || ch == '\"')
-	  {
-	    *bufptr++ = '\\';
-	    *bufptr++ = ch;
-	  }
-	  else if (ch == '\n')
-	  {
-	    *bufptr++ = '\\';
-	    *bufptr++ = 'n';
-	  }
-	  else if (ch == '\t')
-	  {
-	    *bufptr++ = '\\';
-	    *bufptr++ = 't';
-	  }
-	  else if (ch >= ' ')
-	    *bufptr++ = ch;
+	  *bufptr++ = '\\';
+	  *bufptr++ = ch;
 	}
-
-	*bufptr = '\0';
-
-	cgiSetVariable("CUPSDCONF_DEFAULT", buffer);
-	free(buffer);
+	else if (ch == '\n')
+	{
+	  *bufptr++ = '\\';
+	  *bufptr++ = 'n';
+	}
+	else if (ch == '\t')
+	{
+	  *bufptr++ = '\\';
+	  *bufptr++ = 't';
+	}
+	else if (ch >= ' ')
+	  *bufptr++ = ch;
       }
 
+      *bufptr = '\0';
+
       cupsFileClose(cupsd);
+
+      cgiSetVariable("CUPSDCONF_DEFAULT", buffer);
+      free(buffer);
     }
 
    /*
@@ -3090,7 +3084,7 @@ do_set_options(http_t *http,		/* I - HTTP connection */
     * Binary protocol support...
     */
 
-    if (ppd && ppd->protocols && strstr(ppd->protocols, "BCP"))
+    if (ppd->protocols && strstr(ppd->protocols, "BCP"))
     {
       protocol = ppdFindAttr(ppd, "cupsProtocol", NULL);
 

cgi-bin/ipp-var.c

@@ -3,7 +3,7 @@
  *
  *   CGI <-> IPP variable routines for the Common UNIX Printing System (CUPS).
  *
- *   Copyright 2007-2008 by Apple Inc.
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2007 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -158,8 +158,6 @@ cgiGetAttributes(ipp_t      *request,	/* I - IPP request */
     for (i = 0; i < num_attrs; i ++)
       free(attrs[i]);
   }
-
-  fclose(in);
 }
 
 
@@ -525,7 +523,8 @@ cgiPrintTestPage(http_t     *http,	/* I - Connection to server */
   * See who is logged in...
   */
 
-  user = getenv("REMOTE_USER");
+  if ((user = getenv("REMOTE_USER")) == NULL)
+    user = "guest";
 
  /*
   * Locate the test page file...
@@ -563,9 +562,8 @@ cgiPrintTestPage(http_t     *http,	/* I - Connection to server */
   ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, "printer-uri",
                NULL, uri);
 
-  if (user)
-    ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_NAME,
-		 "requesting-user-name", NULL, user);
+  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_NAME,
+               "requesting-user-name", NULL, user);
 
   ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_NAME, "job-name",
                NULL, "Test Page");
@@ -595,11 +593,6 @@ cgiPrintTestPage(http_t     *http,	/* I - Connection to server */
     snprintf(refresh, sizeof(refresh), "2;URL=%s", uri);
     cgiSetVariable("refresh_page", refresh);
   }
-  else if (cupsLastError() == IPP_NOT_AUTHORIZED)
-  {
-    puts("Status: 401\n");
-    exit(0);
-  }
 
   cgiStartHTML(cgiText(_("Print Test Page")));
 

cgi-bin/jobs.c

@@ -3,7 +3,7 @@
  *
  *   Job status CGI for the Common UNIX Printing System (CUPS).
  *
- *   Copyright 2007-2008 by Apple Inc.
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2006 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -185,11 +185,6 @@ do_job_op(http_t      *http,		/* I - HTTP connection */
     cgiFormEncode(url + 6, getenv("HTTP_REFERER"), sizeof(url) - 6);
     cgiSetVariable("refresh_page", url);
   }
-  else if (cupsLastError() == IPP_NOT_AUTHORIZED)
-  {
-    puts("Status: 401\n");
-    exit(0);
-  }
 
   cgiStartHTML(cgiText(_("Jobs")));
 

cgi-bin/printers.c

@@ -3,7 +3,7 @@
  *
  *   Printer status CGI for the Common UNIX Printing System (CUPS).
  *
- *   Copyright 2007-2008 by Apple Inc.
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2006 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -280,11 +280,6 @@ print_command(http_t     *http,		/* I - Connection to server */
     snprintf(refresh, sizeof(refresh), "2;URL=%s", uri);
     cgiSetVariable("refresh_page", refresh);
   }
-  else if (cupsLastError() == IPP_NOT_AUTHORIZED)
-  {
-    puts("Status: 401\n");
-    exit(0);
-  }
 
   cgiStartHTML(cgiText(_("Printer Maintenance")));
 

cgi-bin/search.c

@@ -3,7 +3,7 @@
  *
  *   Search routines for the Common UNIX Printing System (CUPS).
  *
- *   Copyright 2007-2008 by Apple Inc.
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2006 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -53,8 +53,7 @@ cgiCompileSearch(const char *query)	/* I - Query string */
   * Allocate a regular expression storage structure...
   */
 
-  if ((re = (regex_t *)calloc(1, sizeof(regex_t))) == NULL)
-    return (NULL);
+  re = (regex_t *)calloc(1, sizeof(regex_t));
 
  /*
   * Allocate a buffer to hold the regular expression string, starting
@@ -66,11 +65,7 @@ cgiCompileSearch(const char *query)	/* I - Query string */
   if (slen < 1024)
     slen = 1024;
 
-  if ((s = (char *)malloc(slen)) == NULL)
-  {
-    free(re);
-    return (NULL);
-  }
+  s = (char *)malloc(slen);
 
  /*
   * Copy the query string to the regular expression, handling basic
@@ -232,13 +227,7 @@ cgiCompileSearch(const char *query)	/* I - Query string */
         char *lword2;			/* New "last word" */
 
 
-        if ((lword2 = strdup(sword)) == NULL)
-	{
-	  free(lword);
-	  free(s);
-	  free(re);
-	  return (NULL);
-	}
+        lword2 = strdup(sword);
 
         strcpy(sptr, ".*|.*");
 	sptr += 5;

cgi-bin/template.c

@@ -3,7 +3,7 @@
  *
  *   CGI template function.
  *
- *   Copyright 2007-2008 by Apple Inc.
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2006 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -53,13 +53,6 @@ cgiCopyTemplateFile(FILE       *out,	/* I - Output file */
   fprintf(stderr, "DEBUG2: cgiCopyTemplateFile(out=%p, tmpl=\"%s\")\n", out,
           tmpl ? tmpl : "(null)");
 
- /*
-  * Range check input...
-  */
-
-  if (!tmpl || !out)
-    return;
-
  /*
   * Open the template file...
   */

cgi-bin/var.c

@@ -3,7 +3,7 @@
  *
  *   CGI form variable and array functions.
  *
- *   Copyright 2007-2008 by Apple Inc.
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2005 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -322,15 +322,9 @@ cgiSetArray(const char *name,		/* I - Name of variable */
   {
     if (element >= var->avalues)
     {
-      const char **temp;		/* Temporary pointer */
-
-      temp = (const char **)realloc((void *)(var->values),
-                                    sizeof(char *) * (element + 16));
-      if (!temp)
-        return;
-
       var->avalues = element + 16;
-      var->values  = temp;
+      var->values  = (const char **)realloc((void *)(var->values),
+                                            sizeof(char *) * var->avalues);
     }
 
     if (element >= var->nvalues)
@@ -368,15 +362,9 @@ cgiSetSize(const char *name,		/* I - Name of variable */
 
   if (size >= var->avalues)
   {
-    const char **temp;			/* Temporary pointer */
-
-    temp = (const char **)realloc((void *)(var->values),
-				  sizeof(char *) * (size + 16));
-    if (!temp)
-      return;
-
     var->avalues = size + 16;
-    var->values  = temp;
+    var->values  = (const char **)realloc((void *)(var->values),
+                                          sizeof(char *) * var->avalues);
   }
 
   if (size > var->nvalues)
@@ -438,7 +426,7 @@ cgi_add_variable(const char *name,	/* I - Variable name */
 		 int        element,	/* I - Array element number */
                  const char *value)	/* I - Variable value */
 {
-  _cgi_var_t	*var;			/* New variable */
+  _cgi_var_t	*var;				/* New variable */
 
 
   if (name == NULL || value == NULL || element < 0 || element > 100000)
@@ -450,29 +438,19 @@ cgi_add_variable(const char *name,	/* I - Variable name */
 
   if (form_count >= form_alloc)
   {
-    _cgi_var_t	*temp_vars;		/* Temporary form pointer */
-
-
     if (form_alloc == 0)
-      temp_vars = malloc(sizeof(_cgi_var_t) * 16);
+      form_vars = malloc(sizeof(_cgi_var_t) * 16);
     else
-      temp_vars = realloc(form_vars, (form_alloc + 16) * sizeof(_cgi_var_t));
+      form_vars = realloc(form_vars, (form_alloc + 16) * sizeof(_cgi_var_t));
 
-    if (!temp_vars)
-      return;
-
-    form_vars  = temp_vars;
     form_alloc += 16;
   }
 
-  var = form_vars + form_count;
-
-  if ((var->values = calloc(element + 1, sizeof(char *))) == NULL)
-    return;
-
+  var                  = form_vars + form_count;
   var->name            = strdup(name);
   var->nvalues         = element + 1;
   var->avalues         = element + 1;
+  var->values          = calloc(element + 1, sizeof(char *));
   var->values[element] = strdup(value);
 
   form_count ++;
@@ -806,15 +784,11 @@ cgi_initialize_post(void)
 
   for (tbytes = 0; tbytes < length; tbytes += nbytes)
     if ((nbytes = read(0, data + tbytes, length - tbytes)) < 0)
-    {
       if (errno != EAGAIN)
       {
         free(data);
         return (0);
       }
-      else
-        nbytes = 0;
-    }
 
   data[length] = '\0';
 

conf/cupsd.conf.in

@@ -29,12 +29,14 @@ DefaultAuthType Basic
 # Restrict access to the server...
 <Location />
   Order allow,deny
+  Allow localhost
 </Location>
 
 # Restrict access to the admin pages...
 <Location /admin>
 @ENCRYPTION_REQUIRED@
   Order allow,deny
+  Allow localhost
 </Location>
 
 # Restrict access to configuration files...
@@ -42,6 +44,7 @@ DefaultAuthType Basic
   AuthType Default
   Require user @SYSTEM
   Order allow,deny
+  Allow localhost
 </Location>
 
 # Set the default printer/job policies...

config-scripts/cups-common.m4

@@ -1,9 +1,9 @@
 dnl
-dnl "$Id: cups-common.m4 7325 2008-02-18 18:59:46Z mike $"
+dnl "$Id: cups-common.m4 7057 2007-11-01 23:29:14Z mike $"
 dnl
 dnl   Common configuration stuff for the Common UNIX Printing System (CUPS).
 dnl
-dnl   Copyright 2007-2008 by Apple Inc.
+dnl   Copyright 2007 by Apple Inc.
 dnl   Copyright 1997-2007 by Easy Software Products, all rights reserved.
 dnl
 dnl   These coded instructions, statements, and computer programs are the
@@ -19,9 +19,12 @@ AC_PREREQ(2.60)
 dnl Set the name of the config header file...
 AC_CONFIG_HEADER(config.h)
 
-dnl Version number information...
-CUPS_VERSION="1.3.6"
+dnl Versio number information...
+CUPS_VERSION="1.3.5"
 CUPS_REVISION=""
+#if test -z "$CUPS_REVISION" -a -d .svn; then
+#	CUPS_REVISION="-r`svnversion . | awk -F: '{print $NF}' | sed -e '1,$s/[[a-zA-Z]]*//g'`"
+#fi
 
 AC_SUBST(CUPS_VERSION)
 AC_SUBST(CUPS_REVISION)
@@ -180,66 +183,37 @@ esac
 
 AC_SUBST(ARFLAGS)
 
-dnl Prep libraries specifically for cupsd and backends...
+dnl Extra platform-specific libraries...
 BACKLIBS=""
 CUPSDLIBS=""
-AC_SUBST(BACKLIBS)
-AC_SUBST(CUPSDLIBS)
-
-dnl See if we have POSIX ACL support...
-SAVELIBS="$LIBS"
-LIBS=""
-AC_SEARCH_LIBS(acl_init, acl, AC_DEFINE(HAVE_ACL_INIT))
-CUPSDLIBS="$CUPSDLIBS $LIBS"
-LIBS="$SAVELIBS"
-
-dnl Check for DBUS support
-if test -d /etc/dbus-1; then
-	DBUSDIR="/etc/dbus-1"
-else
-	DBUSDIR=""
-fi
-
-AC_ARG_ENABLE(dbus, [  --enable-dbus           enable DBUS support, default=auto])
-AC_ARG_WITH(dbusdir, [  --with-dbusdir          set DBUS configuration directory ],
-	DBUSDIR="$withval")
-
-if test "x$enable_dbus" != xno; then
-	AC_PATH_PROG(PKGCONFIG, pkg-config)
-	if test "x$PKGCONFIG" != x; then
-		AC_MSG_CHECKING(for DBUS)
-		if $PKGCONFIG --exists dbus-1; then
-			AC_MSG_RESULT(yes)
-			AC_DEFINE(HAVE_DBUS)
-			CFLAGS="$CFLAGS `$PKGCONFIG --cflags dbus-1` -DDBUS_API_SUBJECT_TO_CHANGE"
-			CUPSDLIBS="$CUPSDLIBS `$PKGCONFIG --libs dbus-1`"
-			AC_CHECK_LIB(dbus-1,
-			    dbus_message_iter_init_append,
-			    AC_DEFINE(HAVE_DBUS_MESSAGE_ITER_INIT_APPEND),,
-			    `$PKGCONFIG --libs dbus-1`)
-		else
-			AC_MSG_RESULT(no)
-			DBUSDIR=""
-		fi
-	fi
-fi
-
-AC_SUBST(DBUSDIR)
-
-dnl Extra platform-specific libraries...
+DBUSDIR=""
 CUPS_DEFAULT_PRINTADMIN_AUTH="@SYSTEM"
 CUPS_SYSTEM_AUTHKEY=""
+
+AC_ARG_ENABLE(dbus, [  --enable-dbus           enable DBUS support, default=auto])
+
 FONTS="fonts"
+AC_SUBST(FONTS)
 LEGACY_BACKENDS="parallel scsi"
+AC_SUBST(LEGACY_BACKENDS)
 
 case $uname in
         Darwin*)
 		FONTS=""
 		LEGACY_BACKENDS=""
-                BACKLIBS="$BACKLIBS -framework IOKit"
-                CUPSDLIBS="$CUPSDLIBS -sectorder __TEXT __text cupsd.order -e start -framework IOKit -framework SystemConfiguration"
+                BACKLIBS="-framework IOKit"
+                CUPSDLIBS="-sectorder __TEXT __text cupsd.order -e start -framework IOKit -framework SystemConfiguration"
                 LIBS="-framework CoreFoundation $LIBS"
 
+		dnl Check for CFLocaleCreateCanonicalLocaleIdentifierFromString...
+		AC_MSG_CHECKING(for CFLocaleCreateCanonicalLocaleIdentifierFromString)
+		if test "$uname" = "Darwin" -a $uversion -ge 70; then
+			AC_DEFINE(HAVE_CF_LOCALE_ID)
+			AC_MSG_RESULT(yes)
+		else
+			AC_MSG_RESULT(no)
+		fi
+
 		dnl Check for framework headers...
 		AC_CHECK_HEADER(CoreFoundation/CoreFoundation.h,AC_DEFINE(HAVE_COREFOUNDATION_H))
 		AC_CHECK_HEADER(CoreFoundation/CFPriv.h,AC_DEFINE(HAVE_CFPRIV_H))
@@ -264,14 +238,54 @@ case $uname in
 			CUPS_SYSTEM_AUTHKEY="SystemGroupAuthKey system.preferences"])
 		AC_CHECK_HEADER(Security/SecBasePriv.h,AC_DEFINE(HAVE_SECBASEPRIV_H))
                 ;;
+
+	Linux*)
+		dnl Check for DBUS support
+		if test "x$enable_dbus" != xno; then
+			AC_PATH_PROG(PKGCONFIG, pkg-config)
+			if test "x$PKGCONFIG" != x; then
+				AC_MSG_CHECKING(for DBUS)
+				if $PKGCONFIG --exists dbus-1; then
+					AC_MSG_RESULT(yes)
+					AC_DEFINE(HAVE_DBUS)
+					CFLAGS="$CFLAGS `$PKGCONFIG --cflags dbus-1` -DDBUS_API_SUBJECT_TO_CHANGE"
+					CUPSDLIBS="`$PKGCONFIG --libs dbus-1`"
+					AC_ARG_WITH(dbusdir, [  --with-dbusdir          set DBUS configuration directory ], dbusdir="$withval", dbusdir="/etc/dbus-1")
+					DBUSDIR="$dbusdir"
+					AC_CHECK_LIB(dbus-1,
+					    dbus_message_iter_init_append,
+					    AC_DEFINE(HAVE_DBUS_MESSAGE_ITER_INIT_APPEND))
+				else
+					AC_MSG_RESULT(no)
+				fi
+			fi
+		fi
+		;;
 esac
 
 AC_SUBST(CUPS_DEFAULT_PRINTADMIN_AUTH)
 AC_DEFINE_UNQUOTED(CUPS_DEFAULT_PRINTADMIN_AUTH, "$CUPS_DEFAULT_PRINTADMIN_AUTH")
 AC_SUBST(CUPS_SYSTEM_AUTHKEY)
-AC_SUBST(FONTS)
-AC_SUBST(LEGACY_BACKENDS)
+
+dnl See if we have POSIX ACL support...
+SAVELIBS="$LIBS"
+LIBS=""
+AC_SEARCH_LIBS(acl_init, acl, AC_DEFINE(HAVE_ACL_INIT))
+CUPSDLIBS="$CUPSDLIBS $LIBS"
+LIBS="$SAVELIBS"
+
+AC_SUBST(BACKLIBS)
+AC_SUBST(CUPSDLIBS)
+AC_SUBST(DBUSDIR)
+
+dnl New default port definition for IPP...
+AC_ARG_WITH(ipp-port, [  --with-ipp-port         set default port number for IPP ],
+	DEFAULT_IPP_PORT="$withval",
+	DEFAULT_IPP_PORT="631")
+
+AC_SUBST(DEFAULT_IPP_PORT)
+AC_DEFINE_UNQUOTED(CUPS_DEFAULT_IPP_PORT,$DEFAULT_IPP_PORT)
 
 dnl
-dnl End of "$Id: cups-common.m4 7325 2008-02-18 18:59:46Z mike $".
+dnl End of "$Id: cups-common.m4 7057 2007-11-01 23:29:14Z mike $".
 dnl

config-scripts/cups-compiler.m4

@@ -1,9 +1,9 @@
 dnl
-dnl "$Id: cups-compiler.m4 7247 2008-01-23 15:13:56Z mike $"
+dnl "$Id: cups-compiler.m4 6976 2007-09-18 20:39:31Z mike $"
 dnl
 dnl   Compiler stuff for the Common UNIX Printing System (CUPS).
 dnl
-dnl   Copyright 2007-2008 by Apple Inc.
+dnl   Copyright 2007 by Apple Inc.
 dnl   Copyright 1997-2007 by Easy Software Products, all rights reserved.
 dnl
 dnl   These coded instructions, statements, and computer programs are the
@@ -98,56 +98,36 @@ if test -n "$GCC"; then
 		fi
 	fi
 
-	# Generate position-independent code as needed...
 	if test $PICFLAG = 1 -a $uname != AIX; then
     		OPTIM="-fPIC $OPTIM"
 	fi
 
-	# The -fstack-protector option is available with some versions of
-	# GCC and adds "stack canaries" which detect when the return address
-	# has been overwritten, preventing many types of exploit attacks.
-	AC_MSG_CHECKING(if GCC supports -fstack-protector)
-	OLDCFLAGS="$CFLAGS"
-	CFLAGS="$CFLAGS -fstack-protector"
-	AC_TRY_COMPILE(,,
-		OPTIM="$OPTIM -fstack-protector"
-		AC_MSG_RESULT(yes),
-		AC_MSG_RESULT(no))
-	CFLAGS="$OLDCFLAGS"
+	case $uname in
+		Linux*)
+			if test x$enable_pie = xyes; then
+				PIEFLAGS="-pie -fPIE"
+			fi
 
-	# The -pie option is available with some versions of GCC and adds
-	# randomization of addresses, which avoids another class of exploits
-	# that depend on a fixed address for common functions.
-	if test x$enable_pie = xyes; then
-		AC_MSG_CHECKING(if GCC supports -pie)
-		OLDCFLAGS="$CFLAGS"
-		CFLAGS="$CFLAGS -pie -fPIE"
-		AC_TRY_COMPILE(,,
-			PIEFLAGS="-pie -fPIE"
-			AC_MSG_RESULT(yes),
-			AC_MSG_RESULT(no, ignoring --enable-pie))
-		CFLAGS="$OLDCFLAGS"
-	fi
+			if test x$enable_relro = xyes; then
+				RELROFLAGS="-Wl,-z,relro"
+			fi
+			;;
+
+		*)
+			if test x$enable_pie = xyes; then
+				echo "Sorry, --enable-pie is not supported on this OS!"
+			fi
+			;;
+	esac
 
 	if test "x$with_optim" = x; then
 		# Add useful warning options for tracking down problems...
 		OPTIM="-Wall -Wno-format-y2k $OPTIM"
-		# Additional warning options for development testing...
-		if test -d .svn; then
-			OPTIM="-Wshadow -Wunused $OPTIM"
-		fi
+		# Additional warning options for alpha testing...
+		OPTIM="-Wshadow -Wunused $OPTIM"
 	fi
 
 	case "$uname" in
-		Darwin*)
-			# -D_FORTIFY_SOURCE=2 adds additional object size
-			# checking, basically wrapping all string functions
-			# with buffer-limited ones.  Not strictly needed for
-			# CUPS since we already use buffer-limited calls, but
-			# this will catch any additions that are broken.		
-			CFLAGS="$CFLAGS -D_FORTIFY_SOURCE=2"
-			;;
-
 		HP-UX*)
 			if test "x$enable_32bit" = xyes; then
 				# Build 32-bit libraries, 64-bit base...
@@ -221,12 +201,6 @@ if test -n "$GCC"; then
 			;;
 
 		Linux*)
-			# The -z relro option is provided by the Linux linker command to
-			# make relocatable data read-only.
-			if test x$enable_relro = xyes; then
-				RELROFLAGS="-Wl,-z,relro"
-			fi
-
 			if test "x$enable_32bit" = xyes; then
 				# Build 32-bit libraries, 64-bit base...
 				if test -z "$with_arch32flags"; then
@@ -494,8 +468,8 @@ else
 			# cups-support@cups.org...
 			echo "Building CUPS with default compiler optimizations; contact"
 			echo "cups-bugs@cups.org with uname and compiler options needed"
-			echo "for your platform, or set the CFLAGS, CXXFLAGS, and LDFLAGS"
-			echo "environment variables before running configure."
+			echo "for your platform, or set the CFLAGS and CXXFLAGS"
+			echo "environment variable before running configure."
 			;;
 	esac
 fi
@@ -524,5 +498,5 @@ case $uname in
 esac
 
 dnl
-dnl End of "$Id: cups-compiler.m4 7247 2008-01-23 15:13:56Z mike $".
+dnl End of "$Id: cups-compiler.m4 6976 2007-09-18 20:39:31Z mike $".
 dnl

config-scripts/cups-defaults.m4

@@ -1,10 +1,10 @@
 dnl
-dnl "$Id: cups-defaults.m4 7296 2008-02-12 00:20:32Z mike $"
+dnl "$Id: cups-defaults.m4 6754 2007-08-01 19:00:07Z mike $"
 dnl
 dnl   Default cupsd configuration settings for the Common UNIX Printing System
 dnl   (CUPS).
 dnl
-dnl   Copyright 2007-2008 by Apple Inc.
+dnl   Copyright 2007 by Apple Inc.
 dnl   Copyright 2006-2007 by Easy Software Products, all rights reserved.
 dnl
 dnl   These coded instructions, statements, and computer programs are the
@@ -337,14 +337,6 @@ AC_ARG_WITH(snmp-community, [  --with-snmp-community   set SNMP community, defau
 AC_SUBST(CUPS_SNMP_ADDRESS)
 AC_SUBST(CUPS_SNMP_COMMUNITY)
 
-dnl New default port definition for IPP...
-AC_ARG_WITH(ipp-port, [  --with-ipp-port         set default port number for IPP ],
-	DEFAULT_IPP_PORT="$withval",
-	DEFAULT_IPP_PORT="631")
-
-AC_SUBST(DEFAULT_IPP_PORT)
-AC_DEFINE_UNQUOTED(CUPS_DEFAULT_IPP_PORT,$DEFAULT_IPP_PORT)
-
 dnl
-dnl End of "$Id: cups-defaults.m4 7296 2008-02-12 00:20:32Z mike $".
+dnl End of "$Id: cups-defaults.m4 6754 2007-08-01 19:00:07Z mike $".
 dnl

config-scripts/cups-network.m4

@@ -1,5 +1,5 @@
 dnl
-dnl "$Id: cups-network.m4 7140 2007-12-19 01:47:57Z mike $"
+dnl "$Id: cups-network.m4 6649 2007-07-11 21:46:42Z mike $"
 dnl
 dnl   Networking stuff for the Common UNIX Printing System (CUPS).
 dnl
@@ -29,6 +29,24 @@ fi
 AC_CHECK_MEMBER(struct sockaddr.sa_len,,, [#include <sys/socket.h>])
 AC_CHECK_HEADER(sys/sockio.h, AC_DEFINE(HAVE_SYS_SOCKIO_H))
 
+if test "$uname" = "SunOS"; then
+	case "$uversion" in
+		55* | 56*)
+			maxfiles=1024
+			;;
+		*)
+			maxfiles=4096
+			;;
+	esac
+else
+	maxfiles=4096
+fi
+
+AC_ARG_WITH(maxfiles, [  --with-maxfiles=N       set maximum number of file descriptors for scheduler ],
+	maxfiles=$withval)
+
+AC_DEFINE_UNQUOTED(CUPS_MAX_FDS, $maxfiles)
+
 CUPS_DEFAULT_DOMAINSOCKET=""
 
 dnl Domain socket support...
@@ -66,5 +84,5 @@ AC_CHECK_HEADERS(AppleTalk/at_proto.h,AC_DEFINE(HAVE_APPLETALK_AT_PROTO_H),,
 	[#include <netat/appletalk.h>])
 
 dnl
-dnl End of "$Id: cups-network.m4 7140 2007-12-19 01:47:57Z mike $".
+dnl End of "$Id: cups-network.m4 6649 2007-07-11 21:46:42Z mike $".
 dnl

config.h.in

@@ -76,6 +76,13 @@
 #define CUPS_DEFAULT_MAX_COPIES	100
 
 
+/*
+ * Maximum number of file descriptors to support.
+ */
+
+#define CUPS_MAX_FDS		4096
+
+
 /*
  * Do we have domain socket support?
  */
@@ -438,6 +445,13 @@
 #undef HAVE_CFBUNDLEPRIV_H
 
 
+/*
+ * Do we have CFLocaleCreateCanonicalLocaleIdentifierFromString()?
+ */
+
+#undef HAVE_CF_LOCALE_ID
+
+
 /*
  * Do we have MacOSX 10.4's mbr_XXX functions()?
  */

cups/adminutil.c

@@ -4,7 +4,7 @@
  *   Administration utility API definitions for the Common UNIX Printing
  *   System (CUPS).
  *
- *   Copyright 2007-2008 by Apple Inc.
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 2001-2007 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -1057,7 +1057,7 @@ _cupsAdminGetServerSettings(
 	in_admin_location = 0;
 	in_location       = 0;
       }
-      else if (!strcasecmp(line, "Allow") &&
+      else if (!strcasecmp(line, "Allow") && in_admin_location &&
                strcasecmp(value, "localhost") && strcasecmp(value, "127.0.0.1")
 #ifdef AF_LOCAL
 	       && *value != '/'
@@ -1067,9 +1067,9 @@ _cupsAdminGetServerSettings(
 #endif /* AF_INET6 */
 	       )
       {
-        if (in_admin_location)
-	  remote_admin = 1;
-        else if (!strcasecmp(value, "all"))
+	remote_admin = 1;
+
+	if (!strcasecmp(value, "all"))
 	  remote_any = 1;
       }
       else if (line[0] != '<' && !in_location && !in_policy)
@@ -1578,6 +1578,8 @@ _cupsAdminSetServerSettings(
 	if (remote_admin)
 	  cupsFilePrintf(temp, "  Allow %s\n",
 	                 remote_any > 0 ? "all" : "@LOCAL");
+	else
+	  cupsFilePuts(temp, "  Allow localhost\n");
       }
       else if (in_conf_location && remote_admin >= 0)
       {
@@ -1595,6 +1597,8 @@ _cupsAdminSetServerSettings(
 	if (remote_admin)
 	  cupsFilePrintf(temp, "  Allow %s\n",
 	                 remote_any > 0 ? "all" : "@LOCAL");
+	else
+	  cupsFilePuts(temp, "  Allow localhost\n");
       }
       else if (in_root_location && (remote_admin >= 0 || share_printers >= 0))
       {
@@ -1615,6 +1619,8 @@ _cupsAdminSetServerSettings(
 	if (remote_admin > 0 || share_printers > 0)
 	  cupsFilePrintf(temp, "  Allow %s\n",
 	                 remote_any > 0 ? "all" : "@LOCAL");
+	else
+	  cupsFilePuts(temp, "  Allow localhost\n");
       }
 
       in_admin_location = 0;
@@ -1835,6 +1841,8 @@ _cupsAdminSetServerSettings(
 
     if (remote_admin > 0 || share_printers > 0)
       cupsFilePrintf(temp, "  Allow %s\n", remote_any > 0 ? "all" : "@LOCAL");
+    else
+      cupsFilePuts(temp, "  Allow localhost\n");
 
     cupsFilePuts(temp, "</Location>\n");
   }
@@ -1851,6 +1859,8 @@ _cupsAdminSetServerSettings(
 
     if (remote_admin)
       cupsFilePrintf(temp, "  Allow %s\n", remote_any > 0 ? "all" : "@LOCAL");
+    else
+      cupsFilePuts(temp, "  Allow localhost\n");
 
     cupsFilePuts(temp, "</Location>\n");
   }
@@ -1870,6 +1880,8 @@ _cupsAdminSetServerSettings(
 
     if (remote_admin)
       cupsFilePrintf(temp, "  Allow %s\n", remote_any > 0 ? "all" : "@LOCAL");
+    else
+      cupsFilePuts(temp, "  Allow localhost\n");
 
     cupsFilePuts(temp, "</Location>\n");
   }

cups/auth.c

@@ -3,7 +3,7 @@
  *
  *   Authentication functions for the Common UNIX Printing System (CUPS).
  *
- *   Copyright 2007-2008 by Apple Inc.
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2007 by Easy Software Products.
  *
  *   This file contains Kerberos support code, copyright 2006 by
@@ -91,7 +91,8 @@ cupsDoAuthentication(http_t     *http,	/* I - HTTP connection to server */
   const char	*password;		/* Password string */
   char		prompt[1024],		/* Prompt for user */
 		realm[HTTP_MAX_VALUE],	/* realm="xyz" string */
-		nonce[HTTP_MAX_VALUE];	/* nonce="xyz" string */
+		nonce[HTTP_MAX_VALUE],	/* nonce="xyz" string */
+		encode[4096];		/* Encoded username:password */
   int		localauth;		/* Local authentication result */
   _cups_globals_t *cg;			/* Global data */
 
@@ -300,40 +301,14 @@ cupsDoAuthentication(http_t     *http,	/* I - HTTP connection to server */
     if (major_status == GSS_S_CONTINUE_NEEDED)
       DEBUG_gss_printf(major_status, minor_status, "Continuation needed!");
 
-    if (output_token.length > 0 && output_token.length <= 65536)
+    if (output_token.length)
     {
-     /*
-      * Allocate the authorization string since Windows KDCs can have
-      * arbitrarily large credentials...
-      */
-
-      int authsize = 10 +				/* "Negotiate " */
-                     output_token.length * 4 / 3 + 1 +	/* Base64 */
-		     1;					/* nul */
-
-      httpSetAuthString(http, NULL, NULL);
-
-      if ((http->authstring = malloc(authsize)) == NULL)
-      {
-        http->authstring = http->_authstring;
-	authsize         = sizeof(http->_authstring);
-      }
-
-      strcpy(http->authstring, "Negotiate ");
-      httpEncode64_2(http->authstring + 10, authsize - 10, output_token.value,
+      httpEncode64_2(encode, sizeof(encode), output_token.value,
 		     output_token.length);
+      httpSetAuthString(http, "Negotiate", encode);
  
       major_status = gss_release_buffer(&minor_status, &output_token);
     }
-    else
-    {
-      DEBUG_printf(("cupsDoAuthentication: Kerberos credentials too large - "
-                    "%d bytes!\n", output_token.length));
-
-      major_status = gss_release_buffer(&minor_status, &output_token);
-
-      return (-1);
-    }
 #endif /* HAVE_GSSAPI */
   }
   else if (strncmp(http->fields[HTTP_FIELD_WWW_AUTHENTICATE], "Digest", 6))
@@ -342,9 +317,6 @@ cupsDoAuthentication(http_t     *http,	/* I - HTTP connection to server */
     * Basic authentication...
     */
 
-    char	encode[256];		/* Base64 buffer */
-
-
     httpEncode64_2(encode, sizeof(encode), http->userpass,
                    (int)strlen(http->userpass));
     httpSetAuthString(http, "Basic", encode);
@@ -355,8 +327,7 @@ cupsDoAuthentication(http_t     *http,	/* I - HTTP connection to server */
     * Digest authentication...
     */
 
-    char	encode[33],		/* MD5 buffer */
-		digest[1024];		/* Digest auth data */
+    char digest[1024];			/* Digest auth data */
 
 
     httpGetSubField(http, HTTP_FIELD_WWW_AUTHENTICATE, "realm", realm);

cups/cups.h

@@ -59,10 +59,10 @@ extern "C" {
  * Constants...
  */
 
-#  define CUPS_VERSION		1.0306
+#  define CUPS_VERSION		1.0305
 #  define CUPS_VERSION_MAJOR	1
 #  define CUPS_VERSION_MINOR	3
-#  define CUPS_VERSION_PATCH	6
+#  define CUPS_VERSION_PATCH	5
 #  define CUPS_DATE_ANY		-1
 
 

cups/emit.c

@@ -3,7 +3,7 @@
  *
  *   PPD code emission routines for the Common UNIX Printing System (CUPS).
  *
- *   Copyright 2007-2008 by Apple Inc.
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2007 by Easy Software Products, all rights reserved.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -106,24 +106,15 @@ ppdCollect2(ppd_file_t    *ppd,		/* I - PPD file data */
   DEBUG_printf(("ppdCollect2(ppd=%p, section=%d, min_order=%f, choices=%p)\n",
                 ppd, section, min_order, choices));
 
-  if (!ppd || !choices)
-  {
-    if (choices)
-      *choices = NULL;
-
+  if (ppd == NULL)
     return (0);
-  }
 
  /*
   * Allocate memory for up to 1000 selected choices...
   */
 
-  count = 0;
-  if ((collect = calloc(sizeof(ppd_choice_t *), 1000)) == NULL)
-  {
-    *choices = NULL;
-    return (0);
-  }
+  count   = 0;
+  collect = calloc(sizeof(ppd_choice_t *), 1000);
 
  /*
   * Loop through all options and add choices as needed...

cups/encode.c

@@ -43,98 +43,98 @@
 
 static const _ipp_option_t ipp_options[] =
 {
-  { 1, "auth-info",		IPP_TAG_TEXT,		IPP_TAG_JOB },
-  { 1, "auth-info-required",	IPP_TAG_KEYWORD,	IPP_TAG_PRINTER },
-  { 0, "blackplot",		IPP_TAG_BOOLEAN,	IPP_TAG_JOB },
-  { 0, "blackplot-default",	IPP_TAG_BOOLEAN,	IPP_TAG_PRINTER },
-  { 0, "brightness",		IPP_TAG_INTEGER,	IPP_TAG_JOB },
-  { 0, "brightness-default",	IPP_TAG_INTEGER,	IPP_TAG_PRINTER },
-  { 0, "columns",		IPP_TAG_INTEGER,	IPP_TAG_JOB },
-  { 0, "columns-default",	IPP_TAG_INTEGER,	IPP_TAG_PRINTER },
-  { 0, "copies",		IPP_TAG_INTEGER,	IPP_TAG_JOB },
-  { 0, "copies-default",	IPP_TAG_INTEGER,	IPP_TAG_PRINTER },
-  { 0, "document-format",	IPP_TAG_MIMETYPE,	IPP_TAG_OPERATION },
-  { 0, "document-format-default", IPP_TAG_MIMETYPE,	IPP_TAG_PRINTER },
-  { 1, "finishings",		IPP_TAG_ENUM,		IPP_TAG_JOB },
-  { 1, "finishings-default",	IPP_TAG_ENUM,		IPP_TAG_PRINTER },
-  { 0, "fitplot",		IPP_TAG_BOOLEAN,	IPP_TAG_JOB },
-  { 0, "fitplot-default",	IPP_TAG_BOOLEAN,	IPP_TAG_PRINTER },
-  { 0, "gamma",			IPP_TAG_INTEGER,	IPP_TAG_JOB },
-  { 0, "gamma-default",		IPP_TAG_INTEGER,	IPP_TAG_PRINTER },
-  { 0, "hue",			IPP_TAG_INTEGER,	IPP_TAG_JOB },
-  { 0, "hue-default",		IPP_TAG_INTEGER,	IPP_TAG_PRINTER },
-  { 0, "job-k-limit",		IPP_TAG_INTEGER,	IPP_TAG_JOB },
-  { 0, "job-page-limit",	IPP_TAG_INTEGER,	IPP_TAG_JOB },
-  { 0, "job-priority",		IPP_TAG_INTEGER,	IPP_TAG_JOB },
-  { 0, "job-quota-period",	IPP_TAG_INTEGER,	IPP_TAG_JOB },
-  { 0, "job-uuid",		IPP_TAG_URI,		IPP_TAG_JOB },
-  { 0, "landscape",		IPP_TAG_BOOLEAN,	IPP_TAG_JOB },
-  { 1, "media",			IPP_TAG_KEYWORD,	IPP_TAG_JOB },
-  { 0, "mirror",		IPP_TAG_BOOLEAN,	IPP_TAG_JOB },
-  { 0, "mirror-default",	IPP_TAG_BOOLEAN,	IPP_TAG_PRINTER },
-  { 0, "natural-scaling",	IPP_TAG_INTEGER,	IPP_TAG_JOB },
-  { 0, "natural-scaling-default", IPP_TAG_INTEGER,	IPP_TAG_PRINTER },
-  { 0, "notify-charset",	IPP_TAG_CHARSET,	IPP_TAG_SUBSCRIPTION },
-  { 1, "notify-events",		IPP_TAG_KEYWORD,	IPP_TAG_SUBSCRIPTION },
-  { 1, "notify-events-default",	IPP_TAG_KEYWORD,	IPP_TAG_PRINTER },
-  { 0, "notify-lease-duration",	IPP_TAG_INTEGER,	IPP_TAG_SUBSCRIPTION },
-  { 0, "notify-lease-duration-default", IPP_TAG_INTEGER, IPP_TAG_PRINTER },
-  { 0, "notify-natural-language", IPP_TAG_LANGUAGE,	IPP_TAG_SUBSCRIPTION },
-  { 0, "notify-pull-method",	IPP_TAG_KEYWORD,	IPP_TAG_SUBSCRIPTION },
-  { 0, "notify-recipient-uri",	IPP_TAG_URI,		IPP_TAG_SUBSCRIPTION },
-  { 0, "notify-time-interval",	IPP_TAG_INTEGER,	IPP_TAG_SUBSCRIPTION },
-  { 0, "notify-user-data",	IPP_TAG_STRING,		IPP_TAG_SUBSCRIPTION },
-  { 0, "number-up",		IPP_TAG_INTEGER,	IPP_TAG_JOB },
-  { 0, "number-up-default",	IPP_TAG_INTEGER,	IPP_TAG_PRINTER },
-  { 0, "orientation-requested",	IPP_TAG_ENUM,		IPP_TAG_JOB },
-  { 0, "orientation-requested-default", IPP_TAG_ENUM,	IPP_TAG_PRINTER },
-  { 0, "page-bottom",		IPP_TAG_INTEGER,	IPP_TAG_JOB },
-  { 0, "page-bottom-default",	IPP_TAG_INTEGER,	IPP_TAG_PRINTER },
-  { 0, "page-left",		IPP_TAG_INTEGER,	IPP_TAG_JOB },
-  { 0, "page-left-default",	IPP_TAG_INTEGER,	IPP_TAG_PRINTER },
-  { 1, "page-ranges",		IPP_TAG_RANGE,		IPP_TAG_JOB },
-  { 1, "page-ranges-default",	IPP_TAG_RANGE,		IPP_TAG_PRINTER },
-  { 0, "page-right",		IPP_TAG_INTEGER,	IPP_TAG_JOB },
-  { 0, "page-right-default",	IPP_TAG_INTEGER,	IPP_TAG_PRINTER },
-  { 0, "page-top",		IPP_TAG_INTEGER,	IPP_TAG_JOB },
-  { 0, "page-top-default",	IPP_TAG_INTEGER,	IPP_TAG_PRINTER },
-  { 0, "penwidth",		IPP_TAG_INTEGER,	IPP_TAG_JOB },
-  { 0, "penwidth-default",	IPP_TAG_INTEGER,	IPP_TAG_PRINTER },
-  { 0, "port-monitor",		IPP_TAG_NAME,		IPP_TAG_PRINTER },
-  { 0, "ppi",			IPP_TAG_INTEGER,	IPP_TAG_JOB },
-  { 0, "ppi-default",		IPP_TAG_INTEGER,	IPP_TAG_PRINTER },
-  { 0, "prettyprint",		IPP_TAG_BOOLEAN,	IPP_TAG_JOB },
-  { 0, "prettyprint-default",	IPP_TAG_BOOLEAN,	IPP_TAG_PRINTER },
-  { 0, "print-quality",		IPP_TAG_ENUM,		IPP_TAG_JOB },
-  { 0, "print-quality-default",	IPP_TAG_ENUM,		IPP_TAG_PRINTER },
-  { 0, "printer-error-policy",	IPP_TAG_NAME,		IPP_TAG_PRINTER },
-  { 0, "printer-info",		IPP_TAG_TEXT,		IPP_TAG_PRINTER },
-  { 0, "printer-is-accepting-jobs", IPP_TAG_BOOLEAN,	IPP_TAG_PRINTER },
-  { 0, "printer-is-shared",	IPP_TAG_BOOLEAN,	IPP_TAG_PRINTER },
-  { 0, "printer-location",	IPP_TAG_TEXT,		IPP_TAG_PRINTER },
-  { 0, "printer-make-and-model", IPP_TAG_TEXT,		IPP_TAG_PRINTER },
-  { 0, "printer-more-info",	IPP_TAG_URI,		IPP_TAG_PRINTER },
-  { 0, "printer-op-policy",	IPP_TAG_NAME,		IPP_TAG_PRINTER },
-  { 0, "printer-resolution",	IPP_TAG_RESOLUTION,	IPP_TAG_JOB },
-  { 0, "printer-state",		IPP_TAG_ENUM,		IPP_TAG_PRINTER },
-  { 0, "printer-state-change-time", IPP_TAG_INTEGER,	IPP_TAG_PRINTER },
-  { 1, "printer-state-reasons",	IPP_TAG_KEYWORD,	IPP_TAG_PRINTER },
-  { 0, "printer-type",		IPP_TAG_ENUM,		IPP_TAG_PRINTER },
-  { 0, "printer-uri",		IPP_TAG_URI,		IPP_TAG_OPERATION },
-  { 0, "queued-job-count",	IPP_TAG_INTEGER,	IPP_TAG_PRINTER },
-  { 0, "raw",			IPP_TAG_MIMETYPE,	IPP_TAG_OPERATION },
-  { 1, "requesting-user-name-allowed", IPP_TAG_NAME,	IPP_TAG_PRINTER },
-  { 1, "requesting-user-name-denied", IPP_TAG_NAME,	IPP_TAG_PRINTER },
-  { 0, "resolution",		IPP_TAG_RESOLUTION,	IPP_TAG_JOB },
-  { 0, "resolution-default",	IPP_TAG_RESOLUTION,	IPP_TAG_PRINTER },
-  { 0, "saturation",		IPP_TAG_INTEGER,	IPP_TAG_JOB },
-  { 0, "saturation-default",	IPP_TAG_INTEGER,	IPP_TAG_PRINTER },
-  { 0, "scaling",		IPP_TAG_INTEGER,	IPP_TAG_JOB },
-  { 0, "scaling-default",	IPP_TAG_INTEGER,	IPP_TAG_PRINTER },
-  { 0, "sides",			IPP_TAG_KEYWORD,	IPP_TAG_JOB },
-  { 0, "sides-default",		IPP_TAG_KEYWORD,	IPP_TAG_PRINTER },
-  { 0, "wrap",			IPP_TAG_BOOLEAN,	IPP_TAG_JOB },
-  { 0, "wrap-default",		IPP_TAG_BOOLEAN,	IPP_TAG_PRINTER }
+  { "auth-info",		IPP_TAG_TEXT,		IPP_TAG_JOB },
+  { "auth-info-required",	IPP_TAG_KEYWORD,	IPP_TAG_PRINTER },
+  { "blackplot",		IPP_TAG_BOOLEAN,	IPP_TAG_JOB },
+  { "blackplot-default",	IPP_TAG_BOOLEAN,	IPP_TAG_PRINTER },
+  { "brightness",		IPP_TAG_INTEGER,	IPP_TAG_JOB },
+  { "brightness-default",	IPP_TAG_INTEGER,	IPP_TAG_PRINTER },
+  { "columns",			IPP_TAG_INTEGER,	IPP_TAG_JOB },
+  { "columns-default",		IPP_TAG_INTEGER,	IPP_TAG_PRINTER },
+  { "copies",			IPP_TAG_INTEGER,	IPP_TAG_JOB },
+  { "copies-default",		IPP_TAG_INTEGER,	IPP_TAG_PRINTER },
+  { "document-format",		IPP_TAG_MIMETYPE,	IPP_TAG_OPERATION },
+  { "document-format-default",	IPP_TAG_MIMETYPE,	IPP_TAG_PRINTER },
+  { "finishings",		IPP_TAG_ENUM,		IPP_TAG_JOB },
+  { "finishings-default",	IPP_TAG_ENUM,		IPP_TAG_PRINTER },
+  { "fitplot",			IPP_TAG_BOOLEAN,	IPP_TAG_JOB },
+  { "fitplot-default",		IPP_TAG_BOOLEAN,	IPP_TAG_PRINTER },
+  { "gamma",			IPP_TAG_INTEGER,	IPP_TAG_JOB },
+  { "gamma-default",		IPP_TAG_INTEGER,	IPP_TAG_PRINTER },
+  { "hue",			IPP_TAG_INTEGER,	IPP_TAG_JOB },
+  { "hue-default",		IPP_TAG_INTEGER,	IPP_TAG_PRINTER },
+  { "job-k-limit",		IPP_TAG_INTEGER,	IPP_TAG_JOB },
+  { "job-page-limit",		IPP_TAG_INTEGER,	IPP_TAG_JOB },
+  { "job-priority",		IPP_TAG_INTEGER,	IPP_TAG_JOB },
+  { "job-quota-period",		IPP_TAG_INTEGER,	IPP_TAG_JOB },
+  { "job-uuid",			IPP_TAG_URI,		IPP_TAG_JOB },
+  { "landscape",		IPP_TAG_BOOLEAN,	IPP_TAG_JOB },
+  { "media",			IPP_TAG_KEYWORD,	IPP_TAG_JOB },
+  { "mirror",			IPP_TAG_BOOLEAN,	IPP_TAG_JOB },
+  { "mirror-default",		IPP_TAG_BOOLEAN,	IPP_TAG_PRINTER },
+  { "natural-scaling",		IPP_TAG_INTEGER,	IPP_TAG_JOB },
+  { "natural-scaling-default",	IPP_TAG_INTEGER,	IPP_TAG_PRINTER },
+  { "notify-charset",		IPP_TAG_CHARSET,	IPP_TAG_SUBSCRIPTION },
+  { "notify-events",		IPP_TAG_KEYWORD,	IPP_TAG_SUBSCRIPTION },
+  { "notify-events-default",	IPP_TAG_KEYWORD,	IPP_TAG_PRINTER },
+  { "notify-lease-duration",	IPP_TAG_INTEGER,	IPP_TAG_SUBSCRIPTION },
+  { "notify-lease-duration-default", IPP_TAG_INTEGER,	IPP_TAG_PRINTER },
+  { "notify-natural-language",	IPP_TAG_LANGUAGE,	IPP_TAG_SUBSCRIPTION },
+  { "notify-pull-method",	IPP_TAG_KEYWORD,	IPP_TAG_SUBSCRIPTION },
+  { "notify-recipient-uri",	IPP_TAG_URI,		IPP_TAG_SUBSCRIPTION },
+  { "notify-time-interval",	IPP_TAG_INTEGER,	IPP_TAG_SUBSCRIPTION },
+  { "notify-user-data",		IPP_TAG_STRING,		IPP_TAG_SUBSCRIPTION },
+  { "number-up",		IPP_TAG_INTEGER,	IPP_TAG_JOB },
+  { "number-up-default",	IPP_TAG_INTEGER,	IPP_TAG_PRINTER },
+  { "orientation-requested",	IPP_TAG_ENUM,		IPP_TAG_JOB },
+  { "orientation-requested-default", IPP_TAG_ENUM,	IPP_TAG_PRINTER },
+  { "page-bottom",		IPP_TAG_INTEGER,	IPP_TAG_JOB },
+  { "page-bottom-default",	IPP_TAG_INTEGER,	IPP_TAG_PRINTER },
+  { "page-left",		IPP_TAG_INTEGER,	IPP_TAG_JOB },
+  { "page-left-default",	IPP_TAG_INTEGER,	IPP_TAG_PRINTER },
+  { "page-ranges",		IPP_TAG_RANGE,		IPP_TAG_JOB },
+  { "page-ranges-default",	IPP_TAG_RANGE,		IPP_TAG_PRINTER },
+  { "page-right",		IPP_TAG_INTEGER,	IPP_TAG_JOB },
+  { "page-right-default",	IPP_TAG_INTEGER,	IPP_TAG_PRINTER },
+  { "page-top",			IPP_TAG_INTEGER,	IPP_TAG_JOB },
+  { "page-top-default",		IPP_TAG_INTEGER,	IPP_TAG_PRINTER },
+  { "penwidth",			IPP_TAG_INTEGER,	IPP_TAG_JOB },
+  { "penwidth-default",		IPP_TAG_INTEGER,	IPP_TAG_PRINTER },
+  { "port-monitor",             IPP_TAG_NAME,           IPP_TAG_PRINTER },
+  { "ppi",			IPP_TAG_INTEGER,	IPP_TAG_JOB },
+  { "ppi-default",		IPP_TAG_INTEGER,	IPP_TAG_PRINTER },
+  { "prettyprint",		IPP_TAG_BOOLEAN,	IPP_TAG_JOB },
+  { "prettyprint-default",	IPP_TAG_BOOLEAN,	IPP_TAG_PRINTER },
+  { "print-quality",		IPP_TAG_ENUM,		IPP_TAG_JOB },
+  { "print-quality-default",	IPP_TAG_ENUM,		IPP_TAG_PRINTER },
+  { "printer-error-policy",	IPP_TAG_NAME,		IPP_TAG_PRINTER },
+  { "printer-info",		IPP_TAG_TEXT,		IPP_TAG_PRINTER },
+  { "printer-is-accepting-jobs",IPP_TAG_BOOLEAN,	IPP_TAG_PRINTER },
+  { "printer-is-shared",	IPP_TAG_BOOLEAN,	IPP_TAG_PRINTER },
+  { "printer-location",		IPP_TAG_TEXT,		IPP_TAG_PRINTER },
+  { "printer-make-and-model",	IPP_TAG_TEXT,		IPP_TAG_PRINTER },
+  { "printer-more-info",	IPP_TAG_URI,		IPP_TAG_PRINTER },
+  { "printer-op-policy",	IPP_TAG_NAME,		IPP_TAG_PRINTER },
+  { "printer-resolution",	IPP_TAG_RESOLUTION,	IPP_TAG_JOB },
+  { "printer-state",		IPP_TAG_ENUM,		IPP_TAG_PRINTER },
+  { "printer-state-change-time",IPP_TAG_INTEGER,	IPP_TAG_PRINTER },
+  { "printer-state-reasons",	IPP_TAG_KEYWORD,	IPP_TAG_PRINTER },
+  { "printer-type",		IPP_TAG_ENUM,		IPP_TAG_PRINTER },
+  { "printer-uri",		IPP_TAG_URI,		IPP_TAG_OPERATION },
+  { "queued-job-count",		IPP_TAG_INTEGER,	IPP_TAG_PRINTER },
+  { "raw",			IPP_TAG_MIMETYPE,	IPP_TAG_OPERATION },
+  { "requesting-user-name-allowed",	IPP_TAG_NAME,	IPP_TAG_PRINTER },
+  { "requesting-user-name-denied",	IPP_TAG_NAME,	IPP_TAG_PRINTER },
+  { "resolution",		IPP_TAG_RESOLUTION,	IPP_TAG_JOB },
+  { "resolution-default",	IPP_TAG_RESOLUTION,	IPP_TAG_PRINTER },
+  { "saturation",		IPP_TAG_INTEGER,	IPP_TAG_JOB },
+  { "saturation-default",	IPP_TAG_INTEGER,	IPP_TAG_PRINTER },
+  { "scaling",			IPP_TAG_INTEGER,	IPP_TAG_JOB },
+  { "scaling-default",		IPP_TAG_INTEGER,	IPP_TAG_PRINTER },
+  { "sides",			IPP_TAG_KEYWORD,	IPP_TAG_JOB },
+  { "sides-default",		IPP_TAG_KEYWORD,	IPP_TAG_PRINTER },
+  { "wrap",			IPP_TAG_BOOLEAN,	IPP_TAG_JOB },
+  { "wrap-default",		IPP_TAG_BOOLEAN,	IPP_TAG_PRINTER }
 };
 
 
@@ -192,8 +192,7 @@ cupsEncodeOptions2(
   char		*s,			/* Pointer into option value */
 		*val,			/* Pointer to option value */
 		*copy,			/* Copy of option value */
-		*sep,			/* Option separator */
-		quote;			/* Quote character */
+		*sep;			/* Option separator */
   ipp_attribute_t *attr;		/* IPP attribute */
   ipp_tag_t	value_tag;		/* IPP value tag */
   cups_option_t	*option;		/* Current option */
@@ -285,28 +284,41 @@ cupsEncodeOptions2(
     * Count the number of values...
     */
 
-    if (match && match->multivalue)
+    for (count = 1, sep = option->value; *sep; sep ++)
     {
-      for (count = 1, sep = option->value, quote = 0; *sep; sep ++)
+      if (*sep == '\'')
       {
-	if (*sep == quote)
-	  quote = 0;
-	else if (!quote && (*sep == '\'' || *sep == '\"'))
-	{
-	 /*
-	  * Skip quoted option value...
-	  */
+       /*
+        * Skip quoted option value...
+	*/
 
-	  quote = *sep++;
-	}
-	else if (*sep == ',' && !quote)
-	  count ++;
-	else if (*sep == '\\' && sep[1])
+        sep ++;
+
+        while (*sep && *sep != '\'')
 	  sep ++;
+
+	if (!*sep)
+	  sep --;
       }
+      else if (*sep == '\"')
+      {
+       /*
+        * Skip quoted option value...
+	*/
+
+        sep ++;
+
+        while (*sep && *sep != '\"')
+	  sep ++;
+
+	if (!*sep)
+	  sep --;
+      }
+      else if (*sep == ',')
+        count ++;
+      else if (*sep == '\\' && sep[1])
+        sep ++;
     }
-    else
-      count = 1;
 
     DEBUG_printf(("cupsEncodeOptions2: option = \'%s\', count = %d\n",
                   option->name, count));
@@ -378,47 +390,16 @@ cupsEncodeOptions2(
     * Scan the value string for values...
     */
 
-    for (j = 0, sep = val; j < count; val = sep, j ++)
+    for (j = 0; j < count; val = sep, j ++)
     {
      /*
       * Find the end of this value and mark it if needed...
       */
 
-      if (count > 1)
-      {
-	for (quote = 0; *sep; sep ++)
-	{
-	  if (*sep == quote)
-	  {
-	   /*
-	    * Finish quoted value...
-	    */
-
-	    quote = 0;
-	  }
-	  else if (!quote && (*sep == '\'' || *sep == '\"'))
-	  {
-	   /*
-	    * Handle quoted option value...
-	    */
-
-	    quote = *sep;
-	  }
-	  else if (*sep == ',' && count > 1)
-	    break;
-	  else if (*sep == '\\' && sep[1])
-	  {
-	   /*
-	    * Skip quoted character...
-	    */
-
-	    sep ++;
-	  }
-	}
-
-	if (*sep == ',')
-	  *sep++ = '\0';
-      }
+      if ((sep = strchr(val, ',')) != NULL)
+	*sep++ = '\0';
+      else
+	sep = val + strlen(val);
 
      /*
       * Copy the option value(s) over as needed by the type...
@@ -432,7 +413,7 @@ cupsEncodeOptions2(
 	    * Integer/enumeration value...
 	    */
 
-            attr->values[j].integer = strtol(val, &s, 10);
+            attr->values[j].integer = strtol(val, &s, 0);
 
             DEBUG_printf(("cupsEncodeOptions2: Added integer option value %d...\n",
 	                  attr->values[j].integer));
@@ -474,12 +455,12 @@ cupsEncodeOptions2(
 	      s = val;
 	    }
 	    else
-	      attr->values[j].range.lower = strtol(val, &s, 10);
+	      attr->values[j].range.lower = strtol(val, &s, 0);
 
 	    if (*s == '-')
 	    {
 	      if (s[1])
-		attr->values[j].range.upper = strtol(s + 1, NULL, 10);
+		attr->values[j].range.upper = strtol(s + 1, NULL, 0);
 	      else
 		attr->values[j].range.upper = 2147483647;
             }
@@ -496,10 +477,10 @@ cupsEncodeOptions2(
 	    * Resolution...
 	    */
 
-	    attr->values[j].resolution.xres = strtol(val, &s, 10);
+	    attr->values[j].resolution.xres = strtol(val, &s, 0);
 
 	    if (*s == 'x')
-	      attr->values[j].resolution.yres = strtol(s + 1, &s, 10);
+	      attr->values[j].resolution.yres = strtol(s + 1, &s, 0);
 	    else
 	      attr->values[j].resolution.yres = attr->values[j].resolution.xres;
 
@@ -518,7 +499,7 @@ cupsEncodeOptions2(
 	    */
 
             attr->values[j].unknown.length = (int)strlen(val);
-	    attr->values[j].unknown.data   = strdup(val);
+	    attr->values[j].unknown.data   = _cupsStrAlloc(val);
 
             DEBUG_printf(("cupsEncodeOptions2: Added octet-string value \"%s\"...\n",
 	                  attr->values[j].unknown.data));

cups/http-addrlist.c

@@ -3,7 +3,7 @@
  *
  *   HTTP address list routines for the Common UNIX Printing System (CUPS).
  *
- *   Copyright 2007-2008 by Apple Inc.
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2007 by Easy Software Products, all rights reserved.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -202,11 +202,9 @@ httpAddrGetList(const char *hostname,	/* I - Hostname, IP address, or NULL for p
     * Domain socket address...
     */
 
-    if ((first = (http_addrlist_t *)calloc(1, sizeof(http_addrlist_t))) != NULL)
-    {
-      first->addr.un.sun_family = AF_LOCAL;
-      strlcpy(first->addr.un.sun_path, hostname, sizeof(first->addr.un.sun_path));
-    }
+    first = (http_addrlist_t *)calloc(1, sizeof(http_addrlist_t));
+    first->addr.un.sun_family = AF_LOCAL;
+    strlcpy(first->addr.un.sun_path, hostname, sizeof(first->addr.un.sun_path));
   }
   else
 #endif /* AF_LOCAL */

cups/http-private.h

@@ -26,6 +26,12 @@
 #  include <config.h>
 
 #  ifdef __sun
+/*
+ * Define FD_SETSIZE to CUPS_MAX_FDS on Solaris to get the correct version of
+ * select() for large numbers of file descriptors.
+ */
+
+#    define FD_SETSIZE	CUPS_MAX_FDS
 #    include <sys/select.h>
 #  endif /* __sun */
 

cups/http-support.c

@@ -1283,7 +1283,7 @@ http_copy_encode(char       *dst,	/* O - Destination buffer */
 		 const char *term,	/* I - Terminating characters */
 		 int        encode)	/* I - %-encode reserved chars? */
 {
-  static const char hex[] = "0123456789ABCDEF";
+  static const char *hex = "0123456789ABCDEF";
 
 
   while (*src && dst < dstend)

cups/http.c

@@ -3,7 +3,7 @@
  *
  *   HTTP routines for the Common UNIX Printing System (CUPS).
  *
- *   Copyright 2007-2008 by Apple Inc.
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2007 by Easy Software Products, all rights reserved.
  *
  *   This file contains Kerberos support code, copyright 2006 by
@@ -402,11 +402,9 @@ httpConnectEncrypt(
   * Allocate memory for the structure...
   */
 
-  if ((http = calloc(sizeof(http_t), 1)) == NULL)
-  {
-    httpAddrFreeList(addrlist);
+  http = calloc(sizeof(http_t), 1);
+  if (http == NULL)
     return (NULL);
-  }
 
   http->version  = HTTP_1_1;
   http->blocking = 1;
@@ -1737,15 +1735,9 @@ httpSetAuthString(http_t     *http,	/* I - HTTP connection */
     */
 
     int len = (int)strlen(scheme) + (data ? (int)strlen(data) + 1 : 0) + 1;
-    char *temp;
 
     if (len > (int)sizeof(http->_authstring))
-    {
-      if ((temp = malloc(len)) == NULL)
-        len = sizeof(http->_authstring);
-      else
-        http->authstring = temp;
-    }
+      http->authstring = malloc(len);
 
     if (data)
       snprintf(http->authstring, len, "%s %s", scheme, data);

cups/i18n.h

@@ -82,10 +82,6 @@ typedef struct _cups_vmap_s		/**** VBCS Charmap Struct ****/
  * Prototypes...
  */
 
-#ifdef __APPLE__
-extern const char	*_cupsAppleLanguage(const char *locale, char *language,
-			                    size_t langsize);
-#endif /* __APPLE__ */
 extern void		_cupsCharmapFlush(void);
 extern void		_cupsCharmapFree(const cups_encoding_t encoding);
 extern void		*_cupsCharmapGet(const cups_encoding_t encoding);

cups/ipp-private.h

@@ -3,7 +3,7 @@
  *
  *   Private IPP definitions for the Common UNIX Printing System (CUPS).
  *
- *   Copyright 2007-2008 by Apple Inc.
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2006 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -40,7 +40,6 @@ extern "C" {
 
 typedef struct				/**** Attribute mapping data ****/
 {
-  int		multivalue;		/* Option has multiple values? */
   const char	*name;			/* Option/attribute name */
   ipp_tag_t	value_tag;		/* Value tag for this attribute */
   ipp_tag_t	group_tag;		/* Group tag for this attribute */

cups/ipp.c

@@ -4,7 +4,7 @@
  *   Internet Printing Protocol support functions for the Common UNIX
  *   Printing System (CUPS).
  *
- *   Copyright 2007-2008 by Apple Inc.
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2007 by Easy Software Products, all rights reserved.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -361,12 +361,7 @@ ippAddOctetString(ipp_t      *ipp,	/* I - IPP message */
 
   if (data)
   {
-    if ((attr->values[0].unknown.data = malloc(datalen)) == NULL)
-    {
-      ippDeleteAttribute(ipp, attr);
-      return (NULL);
-    }
-
+    attr->values[0].unknown.data = malloc(datalen);
     memcpy(attr->values[0].unknown.data, data, datalen);
   }
 
@@ -1019,7 +1014,7 @@ ippReadIO(void       *src,		/* I - Data source */
           ipp_t      *ipp)		/* I - IPP data */
 {
   int			n;		/* Length of data */
-  unsigned char		buffer[IPP_MAX_LENGTH + 1],
+  unsigned char		buffer[IPP_MAX_LENGTH],
 					/* Data buffer */
 			string[IPP_MAX_NAME],
 					/* Small string buffer */
@@ -1187,15 +1182,17 @@ ippReadIO(void       *src,		/* I - Data source */
 
 	      attr->value_tag = tag;
 	    }
-	    else if (value_tag >= IPP_TAG_TEXTLANG &&
-		     value_tag <= IPP_TAG_MIMETYPE)
+	    else if (value_tag == IPP_TAG_STRING ||
+    		     (value_tag >= IPP_TAG_TEXTLANG &&
+		      value_tag <= IPP_TAG_MIMETYPE))
             {
 	     /*
 	      * String values can sometimes come across in different
 	      * forms; accept sets of differing values...
 	      */
 
-	      if (tag < IPP_TAG_TEXTLANG || tag > IPP_TAG_MIMETYPE)
+	      if (tag != IPP_TAG_STRING &&
+    		  (tag < IPP_TAG_TEXTLANG || tag > IPP_TAG_MIMETYPE))
 	        return (IPP_ERROR);
             }
 	    else if (value_tag != tag)
@@ -1280,11 +1277,7 @@ ippReadIO(void       *src,		/* I - Data source */
             if (ipp->current)
 	      ipp->prev = ipp->current;
 
-	    if ((attr = ipp->current = _ippAddAttr(ipp, 1)) == NULL)
-	    {
-	      DEBUG_puts("ippReadIO: unable to allocate attribute!");
-	      return (IPP_ERROR);
-	    }
+	    attr = ipp->current = _ippAddAttr(ipp, 1);
 
 	    DEBUG_printf(("ippReadIO: name=\'%s\', ipp->current=%p, ipp->prev=%p\n",
 	                  buffer, ipp->current, ipp->prev));
@@ -1332,7 +1325,6 @@ ippReadIO(void       *src,		/* I - Data source */
 
                 value->integer = n;
 	        break;
-
 	    case IPP_TAG_BOOLEAN :
 		if (n != 1)
 		{
@@ -1348,10 +1340,10 @@ ippReadIO(void       *src,		/* I - Data source */
 
                 value->boolean = buffer[0];
 	        break;
-
 	    case IPP_TAG_TEXT :
 	    case IPP_TAG_NAME :
 	    case IPP_TAG_KEYWORD :
+	    case IPP_TAG_STRING :
 	    case IPP_TAG_URI :
 	    case IPP_TAG_URISCHEME :
 	    case IPP_TAG_CHARSET :
@@ -1374,7 +1366,6 @@ ippReadIO(void       *src,		/* I - Data source */
 		DEBUG_printf(("ippReadIO: value = \'%s\'\n",
 		              value->string.text));
 	        break;
-
 	    case IPP_TAG_DATE :
 		if (n != 11)
 		{
@@ -1388,7 +1379,6 @@ ippReadIO(void       *src,		/* I - Data source */
 		  return (IPP_ERROR);
 		}
 	        break;
-
 	    case IPP_TAG_RESOLUTION :
 		if (n != 9)
 		{
@@ -1411,7 +1401,6 @@ ippReadIO(void       *src,		/* I - Data source */
                 value->resolution.units =
 		    (ipp_res_t)buffer[8];
 	        break;
-
 	    case IPP_TAG_RANGE :
 		if (n != 8)
 		{
@@ -1432,7 +1421,6 @@ ippReadIO(void       *src,		/* I - Data source */
 		    (((((buffer[4] << 8) | buffer[5]) << 8) | buffer[6]) << 8) |
 		    buffer[7];
 	        break;
-
 	    case IPP_TAG_TEXTLANG :
 	    case IPP_TAG_NAMELANG :
 	        if (n >= sizeof(buffer) || n < 4)
@@ -1550,7 +1538,7 @@ ippReadIO(void       *src,		/* I - Data source */
 		break;
 
             default : /* Other unsupported values */
-		if (n > IPP_MAX_LENGTH)
+		if (n > sizeof(buffer))
 		{
 		  DEBUG_printf(("ippReadIO: bad value length %d!\n", n));
 		  return (IPP_ERROR);
@@ -1559,12 +1547,7 @@ ippReadIO(void       *src,		/* I - Data source */
                 value->unknown.length = n;
 	        if (n > 0)
 		{
-		  if ((value->unknown.data = malloc(n)) == NULL)
-		  {
-		    DEBUG_puts("ippReadIO: Unable to allocate value");
-		    return (IPP_ERROR);
-		  }
-
+		  value->unknown.data = malloc(n);
 	          if ((*cb)(src, value->unknown.data, n) < n)
 		  {
 	            DEBUG_puts("ippReadIO: Unable to read unsupported value!");
@@ -1958,6 +1941,7 @@ ippWriteIO(void       *dst,		/* I - Destination */
 	    case IPP_TAG_TEXT :
 	    case IPP_TAG_NAME :
 	    case IPP_TAG_KEYWORD :
+	    case IPP_TAG_STRING :
 	    case IPP_TAG_URI :
 	    case IPP_TAG_URISCHEME :
 	    case IPP_TAG_CHARSET :
@@ -2415,8 +2399,7 @@ ippWriteIO(void       *dst,		/* I - Destination */
 	    return (IPP_ERROR);
 	  }
 
-          DEBUG_printf(("ippWriteIO: wrote %d bytes\n",
-	                (int)(bufptr - buffer)));
+          DEBUG_printf(("ippWriteIO: wrote %d bytes\n", bufptr - buffer));
 
 	 /*
           * If blocking is disabled, stop here...
@@ -2524,6 +2507,7 @@ _ippFreeAttr(ipp_attribute_t *attr)	/* I - Attribute to free */
     case IPP_TAG_TEXT :
     case IPP_TAG_NAME :
     case IPP_TAG_KEYWORD :
+    case IPP_TAG_STRING :
     case IPP_TAG_URI :
     case IPP_TAG_URISCHEME :
     case IPP_TAG_CHARSET :
@@ -2562,13 +2546,6 @@ _ippFreeAttr(ipp_attribute_t *attr)	/* I - Attribute to free */
           ippDelete(value->collection);
 	break;
 
-    case IPP_TAG_STRING :
-	for (i = 0, value = attr->values;
-	     i < attr->num_values;
-	     i ++, value ++)
-	  free(value->unknown.data);
-        break;
-
     default :
         if (!((int)attr->value_tag & IPP_TAG_COPY))
 	{
@@ -2657,6 +2634,7 @@ ipp_length(ipp_t *ipp,			/* I - IPP message or collection */
       case IPP_TAG_TEXT :
       case IPP_TAG_NAME :
       case IPP_TAG_KEYWORD :
+      case IPP_TAG_STRING :
       case IPP_TAG_URI :
       case IPP_TAG_URISCHEME :
       case IPP_TAG_CHARSET :
@@ -2744,7 +2722,7 @@ ipp_read_http(http_t      *http,	/* I - Client connection */
   
 
   DEBUG_printf(("ipp_read_http(http=%p, buffer=%p, length=%d)\n",
-                http, buffer, (int)length));
+                http, buffer, length));
 
  /*
   * Loop until all bytes are read...

cups/language.c

@@ -3,7 +3,7 @@
  *
  *   I18N/language support for the Common UNIX Printing System (CUPS).
  *
- *   Copyright 2007-2008 by Apple Inc.
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2007 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -16,8 +16,6 @@
  *
  * Contents:
  *
- *   _cupsAppleLanguage()   - Get the Apple language identifier associated
- *                            with a locale ID.
  *   _cupsEncodingName()    - Return the character encoding name string
  *                            for the given encoding enumeration.
  *   cupsLangDefault()      - Return the default language.
@@ -67,6 +65,26 @@ static pthread_mutex_t	lang_mutex = PTHREAD_MUTEX_INITIALIZER;
 #endif /* HAVE_PTHREAD_H */
 static cups_lang_t	*lang_cache = NULL;
 					/* Language string cache */
+
+
+/*
+ * Local functions...
+ */
+
+#ifdef __APPLE__
+static const char	*appleLangDefault(void);
+#endif /* __APPLE__ */
+static cups_lang_t	*cups_cache_lookup(const char *name,
+			                   cups_encoding_t encoding);
+static int		cups_message_compare(_cups_message_t *m1,
+			                     _cups_message_t *m2);
+static void		cups_unquote(char *d, const char *s);
+
+
+/*
+ * Local globals...
+ */
+
 static const char * const lang_encodings[] =
 			{		/* Encoding strings */
 			  "us-ascii",		"iso-8859-1",
@@ -137,123 +155,6 @@ static const char * const lang_encodings[] =
 			  "euc-kr",		"euc-tw"
 			};
 
-#ifdef __APPLE__
-typedef struct
-{
-  const char * const language;		/* Language ID */
-  const char * const locale;		/* Locale ID */
-} _apple_language_locale_t;
-
-static const _apple_language_locale_t apple_language_locale[] =
-{					/* Locale to language ID LUT */
-  { "en"	, "en_US" },
-  { "nb"	, "no"    },
-  { "zh-Hans"	, "zh_CN" },
-  { "zh-Hant"	, "zh_TW" }
-};
-#endif /* __APPLE__ */
-
-
-/*
- * Local functions...
- */
-
-#ifdef __APPLE__
-static const char	*appleLangDefault(void);
-#endif /* __APPLE__ */
-static cups_lang_t	*cups_cache_lookup(const char *name,
-			                   cups_encoding_t encoding);
-static int		cups_message_compare(_cups_message_t *m1,
-			                     _cups_message_t *m2);
-static void		cups_unquote(char *d, const char *s);
-
-
-#ifdef __APPLE__
-/*
- *   _cupsAppleLanguage()   - Get the Apple language identifier associated
- *                            with a locale ID.
- */
-
-const char *				/* O - Language ID */
-_cupsAppleLanguage(const char *locale,	/* I - Locale ID */
-                   char       *language,/* I - Language ID buffer */
-                   size_t     langsize)	/* I - Size of language ID buffer */
-{
-  int		i;			/* Looping var */
-  CFStringRef	localeid,		/* CF locale identifier */
-		langid;			/* CF language identifier */
-
-
- /*
-  * Copy the locale name and convert, as needed, to the Apple-specific
-  * locale identifier...
-  */
-
-  switch (strlen(locale))
-  {
-    default :
-        /*
-	 * Invalid locale...
-	 */
-
-	 strlcpy(language, "en", langsize);
-	 break;
-
-    case 2 :
-        strlcpy(language, locale, langsize);
-        break;
-
-    case 5 :
-        strlcpy(language, locale, langsize);
-
-	if (language[2] == '-')
-	{
-	 /*
-	  * Convert ll-cc to ll_CC...
-	  */
-
-	  language[2] = '_';
-	  language[3] = toupper(language[3] & 255);
-	  language[4] = toupper(language[4] & 255);
-	}
-	break;
-  }
-
-  for (i = 0;
-       i < (int)(sizeof(apple_language_locale) /
-		 sizeof(apple_language_locale[0]));
-       i ++)
-    if (!strcmp(locale, apple_language_locale[i].locale))
-    {
-      strlcpy(language, apple_language_locale[i].language, sizeof(language));
-      break;
-    }
-
- /*
-  * Attempt to map the locale ID to a language ID...
-  */
-
-  if ((localeid = CFStringCreateWithCString(kCFAllocatorDefault, language,
-                                            kCFStringEncodingASCII)) != NULL)
-  {
-    if ((langid = CFLocaleCreateCanonicalLanguageIdentifierFromString(
-                      kCFAllocatorDefault, localeid)) != NULL)
-    {
-      CFStringGetCString(langid, language, langsize, kCFStringEncodingASCII);
-      CFRelease(langid);
-    }
-
-    CFRelease(localeid);
-  }
-
- /*
-  * Return what we got...
-  */
-
-  return (language);
-}
-#endif /* __APPLE__ */
-
 
 /*
  * '_cupsEncodingName()' - Return the character encoding name string
@@ -975,12 +876,7 @@ _cupsMessageLoad(const char *filename)	/* I - Message catalog to load */
 	return (a);
       }
 
-      if ((m->id = strdup(ptr)) == NULL)
-      {
-        free(m);
-        cupsFileClose(fp);
-	return (a);
-      }
+      m->id = strdup(ptr);
     }
     else if (s[0] == '\"' && m)
     {
@@ -1028,11 +924,7 @@ _cupsMessageLoad(const char *filename)	/* I - Message catalog to load */
       * Set the string...
       */
 
-      if ((m->str = strdup(ptr)) == NULL)
-      {
-        cupsFileClose(fp);
-	return (a);
-      }
+      m->str = strdup(ptr);
     }
   }
 
@@ -1081,6 +973,30 @@ _cupsMessageLookup(cups_array_t *a,	/* I - Message array */
 
 
 #ifdef __APPLE__
+/*
+ * Code & data to translate OSX's language names to their ISO 639-1 locale.
+ *
+ * The first version uses the new CoreFoundation API added in 10.3 (Panther),
+ * the second is for 10.2 (Jaguar).
+ */
+
+#  ifdef HAVE_CF_LOCALE_ID
+
+typedef struct
+{
+  const char * const name;		/* Language name */
+  const char * const locale;		/* Locale name */
+} _apple_name_locale_t;
+
+static const _apple_name_locale_t apple_name_locale[] =
+{
+  { "en"	, "en_US" },
+  { "nb"	, "no"    },
+  { "zh-Hans"	, "zh_CN" },
+  { "zh-Hant"	, "zh_TW" }
+};
+
+
 /*
  * 'appleLangDefault()' - Get the default locale string.
  */
@@ -1151,15 +1067,14 @@ appleLangDefault(void)
 	    */
 
 	    for (i = 0;
-		 i < (int)(sizeof(apple_language_locale) /
-		           sizeof(apple_language_locale[0]));
-		 i ++)
+		 i < sizeof(apple_name_locale) / sizeof(apple_name_locale[0]);
+		 i++)
 	    {
-	      if (!strcmp(cg->language, apple_language_locale[i].language))
+	      if (!strcmp(cg->language, apple_name_locale[i].name))
 	      {
 		DEBUG_printf(("appleLangDefault: mapping \"%s\" to \"%s\"...\n",
-			      cg->language, apple_language_locale[i].locale));
-		strlcpy(cg->language, apple_language_locale[i].locale, 
+			      cg->language, apple_name_locale[i].locale));
+		strlcpy(cg->language, apple_name_locale[i].locale, 
 			sizeof(cg->language));
 		break;
 	      }
@@ -1195,6 +1110,166 @@ appleLangDefault(void)
 
   return (cg->language);
 }
+#  else
+/*
+ * Code & data to translate OSX 10.2's language names to their ISO 639-1
+ * locale.
+ */
+
+typedef struct
+{
+  const char * const name;		/* Language name */
+  const char * const locale;		/* Locale name */
+} _apple_name_locale_t;
+
+static const _apple_name_locale_t apple_name_locale[] =
+{
+  { "English"     , "en_US.UTF-8" },	{ "French"     , "fr.UTF-8" },
+  { "German"      , "de.UTF-8" },	{ "Italian"    , "it.UTF-8" },  
+  { "Dutch"       , "nl.UTF-8" },	{ "Swedish"    , "sv.UTF-8" },
+  { "Spanish"     , "es.UTF-8" },	{ "Danish"     , "da.UTF-8" },  
+  { "Portuguese"  , "pt.UTF-8" },	{ "Norwegian"  , "no.UTF-8" },
+  { "Hebrew"      , "he.UTF-8" },	{ "Japanese"   , "ja.UTF-8" },  
+  { "Arabic"      , "ar.UTF-8" },	{ "Finnish"    , "fi.UTF-8" },
+  { "Greek"       , "el.UTF-8" },	{ "Icelandic"  , "is.UTF-8" },  
+  { "Maltese"     , "mt.UTF-8" },	{ "Turkish"    , "tr.UTF-8" },
+  { "Croatian"    , "hr.UTF-8" },	{ "Chinese"    , "zh.UTF-8" },  
+  { "Urdu"        , "ur.UTF-8" },	{ "Hindi"      , "hi.UTF-8" },
+  { "Thai"        , "th.UTF-8" },	{ "Korean"     , "ko.UTF-8" },  
+  { "Lithuanian"  , "lt.UTF-8" },	{ "Polish"     , "pl.UTF-8" },
+  { "Hungarian"   , "hu.UTF-8" },	{ "Estonian"   , "et.UTF-8" },  
+  { "Latvian"     , "lv.UTF-8" },	{ "Sami"       , "se.UTF-8" },
+  { "Faroese"     , "fo.UTF-8" },	{ "Farsi"      , "fa.UTF-8" },  
+  { "Russian"     , "ru.UTF-8" },	{ "Chinese"    , "zh.UTF-8" },
+  { "Dutch"       , "nl.UTF-8" },	{ "Irish"      , "ga.UTF-8" },  
+  { "Albanian"    , "sq.UTF-8" },	{ "Romanian"   , "ro.UTF-8" },
+  { "Czech"       , "cs.UTF-8" },	{ "Slovak"     , "sk.UTF-8" },  
+  { "Slovenian"   , "sl.UTF-8" },	{ "Yiddish"    , "yi.UTF-8" },
+  { "Serbian"     , "sr.UTF-8" },	{ "Macedonian" , "mk.UTF-8" },  
+  { "Bulgarian"   , "bg.UTF-8" },	{ "Ukrainian"  , "uk.UTF-8" },
+  { "Byelorussian", "be.UTF-8" },	{ "Uzbek"      , "uz.UTF-8" },  
+  { "Kazakh"      , "kk.UTF-8" },	{ "Azerbaijani", "az.UTF-8" },
+  { "Azerbaijani" , "az.UTF-8" },	{ "Armenian"   , "hy.UTF-8" },  
+  { "Georgian"    , "ka.UTF-8" },	{ "Moldavian"  , "mo.UTF-8" },
+  { "Kirghiz"     , "ky.UTF-8" },	{ "Tajiki"     , "tg.UTF-8" },  
+  { "Turkmen"     , "tk.UTF-8" },	{ "Mongolian"  , "mn.UTF-8" },
+  { "Mongolian"   , "mn.UTF-8" },	{ "Pashto"     , "ps.UTF-8" },  
+  { "Kurdish"     , "ku.UTF-8" },	{ "Kashmiri"   , "ks.UTF-8" },
+  { "Sindhi"      , "sd.UTF-8" },	{ "Tibetan"    , "bo.UTF-8" },  
+  { "Nepali"      , "ne.UTF-8" },	{ "Sanskrit"   , "sa.UTF-8" },
+  { "Marathi"     , "mr.UTF-8" },	{ "Bengali"    , "bn.UTF-8" },  
+  { "Assamese"    , "as.UTF-8" },	{ "Gujarati"   , "gu.UTF-8" },
+  { "Punjabi"     , "pa.UTF-8" },	{ "Oriya"      , "or.UTF-8" },  
+  { "Malayalam"   , "ml.UTF-8" },	{ "Kannada"    , "kn.UTF-8" },
+  { "Tamil"       , "ta.UTF-8" },	{ "Telugu"     , "te.UTF-8" },  
+  { "Sinhalese"   , "si.UTF-8" },	{ "Burmese"    , "my.UTF-8" },
+  { "Khmer"       , "km.UTF-8" },	{ "Lao"        , "lo.UTF-8" },  
+  { "Vietnamese"  , "vi.UTF-8" },	{ "Indonesian" , "id.UTF-8" },
+  { "Tagalog"     , "tl.UTF-8" },	{ "Malay"      , "ms.UTF-8" },  
+  { "Malay"       , "ms.UTF-8" },	{ "Amharic"    , "am.UTF-8" },
+  { "Tigrinya"    , "ti.UTF-8" },	{ "Oromo"      , "om.UTF-8" },  
+  { "Somali"      , "so.UTF-8" },	{ "Swahili"    , "sw.UTF-8" },
+  { "Kinyarwanda" , "rw.UTF-8" },	{ "Rundi"      , "rn.UTF-8" },  
+  { "Nyanja"      , "" },		{ "Malagasy"   , "mg.UTF-8" },
+  { "Esperanto"   , "eo.UTF-8" },	{ "Welsh"      , "cy.UTF-8" },  
+  { "Basque"      , "eu.UTF-8" },	{ "Catalan"    , "ca.UTF-8" },
+  { "Latin"       , "la.UTF-8" },	{ "Quechua"    , "qu.UTF-8" },  
+  { "Guarani"     , "gn.UTF-8" },	{ "Aymara"     , "ay.UTF-8" },
+  { "Tatar"       , "tt.UTF-8" },	{ "Uighur"     , "ug.UTF-8" },  
+  { "Dzongkha"    , "dz.UTF-8" },	{ "Javanese"   , "jv.UTF-8" },
+  { "Sundanese"   , "su.UTF-8" },	{ "Galician"   , "gl.UTF-8" },  
+  { "Afrikaans"   , "af.UTF-8" },	{ "Breton"     , "br.UTF-8" },
+  { "Inuktitut"   , "iu.UTF-8" },	{ "Scottish"   , "gd.UTF-8" },  
+  { "Manx"        , "gv.UTF-8" },	{ "Irish"      , "ga.UTF-8" },
+  { "Tongan"      , "to.UTF-8" },	{ "Greek"      , "el.UTF-8" },  
+  { "Greenlandic" , "kl.UTF-8" },	{ "Azerbaijani", "az.UTF-8" }
+};
+
+
+/*
+ * 'appleLangDefault()' - Get the default locale string.
+ */
+
+static const char *			/* O - Locale string */
+appleLangDefault(void)
+{
+  int			i;		/* Looping var */
+  CFPropertyListRef 	localizationList;
+					/* List of localization data */
+  CFStringRef		localizationName;
+					/* Current name */
+  char			buff[256];	/* Temporary buffer */
+  _cups_globals_t	*cg = _cupsGlobals();
+  					/* Pointer to library globals */
+  char			*lang;		/* LANG environment variable */
+
+
+ /*
+  * Only do the lookup and translation the first time.
+  */
+
+  if (!cg->language[0])
+  {
+    if ((lang = getenv("LANG")))
+      strlcpy(cg->language, lang, sizeof(cg->language));
+    else
+    {
+      localizationList =
+          CFPreferencesCopyAppValue(CFSTR("AppleLanguages"),
+                                    kCFPreferencesCurrentApplication);
+
+      if (localizationList != NULL)
+      {
+	if (CFGetTypeID(localizationList) == CFArrayGetTypeID() &&
+	    CFArrayGetCount(localizationList) > 0)
+	{
+	  localizationName = CFArrayGetValueAtIndex(localizationList, 0);
+
+	  if (localizationName != NULL &&
+              CFGetTypeID(localizationName) == CFStringGetTypeID())
+	  {
+	    CFIndex length = CFStringGetLength(localizationName);
+
+	    if (length <= sizeof(buff) &&
+		CFStringGetCString(localizationName, buff, sizeof(buff),
+	                           kCFStringEncodingASCII))
+	    {
+	      buff[sizeof(buff) - 1] = '\0';
+
+	      for (i = 0;
+		   i < sizeof(apple_name_locale) / sizeof(apple_name_locale[0]);
+		   i++)
+	      {
+		if (!strcasecmp(buff, apple_name_locale[i].name))
+		{
+		  strlcpy(cg->language, apple_name_locale[i].locale, 
+			  sizeof(cg->language));
+		  break;
+		}
+	      }
+	    }
+	  }
+	}
+
+	CFRelease(localizationList);
+      }
+    }
+  
+   /*
+    * If we didn't find the language, default to en_US...
+    */
+
+    if (!cg->language[0])
+      strlcpy(cg->language, apple_name_locale[0].locale, sizeof(cg->language));
+  }
+
+ /*
+  * Return the cached locale...
+  */
+
+  return (cg->language);
+}
+#  endif /* HAVE_CF_LOCALE_ID */
 #endif /* __APPLE__ */
 
 

cups/libcups.exp

@@ -1,7 +1,6 @@
 __cups_strcpy
 __cupsAdminGetServerSettings
 __cupsAdminSetServerSettings
-__cupsAppleLanguage
 __cupsCharmapFlush
 __cupsCharmapFree
 __cupsCharmapGet

cups/options.c

@@ -3,7 +3,7 @@
  *
  *   Option routines for the Common UNIX Printing System (CUPS).
  *
- *   Copyright 2007-2008 by Apple Inc.
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2007 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -470,28 +470,18 @@ cupsParseOptions(
   char	*copyarg,			/* Copy of input string */
 	*ptr,				/* Pointer into string */
 	*name,				/* Pointer to name */
-	*value,				/* Pointer to value */
-	quote;				/* Quote character */
+	*value;				/* Pointer to value */
 
 
- /*
-  * Range check input...
-  */
-
-  if (!arg)
-    return (num_options);
-
-  if (!options || num_options < 0)
+  if (arg == NULL || options == NULL || num_options < 0)
     return (0);
 
  /*
   * Make a copy of the argument string and then divide it up...
   */
 
-  if ((copyarg = strdup(arg)) == NULL)
-    return (num_options);
-
-  ptr = copyarg;
+  copyarg     = strdup(arg);
+  ptr         = copyarg;
 
  /*
   * Skip leading spaces...
@@ -511,7 +501,7 @@ cupsParseOptions(
     */
 
     name = ptr;
-    while (!isspace(*ptr & 255) && *ptr != '=' && *ptr)
+    while (!isspace(*ptr & 255) && *ptr != '=' && *ptr != '\0')
       ptr ++;
 
    /*
@@ -531,10 +521,10 @@ cupsParseOptions(
     if (*ptr != '=')
     {
      /*
-      * Boolean option...
+      * Start of another option...
       */
 
-      if (!strncasecmp(name, "no", 2))
+      if (strncasecmp(name, "no", 2) == 0)
         num_options = cupsAddOption(name + 2, "false", num_options,
 	                            options);
       else
@@ -549,18 +539,38 @@ cupsParseOptions(
 
     *ptr++ = '\0';
 
-    if (*ptr == '\'' || *ptr == '\"')
+    if (*ptr == '\'')
     {
      /*
       * Quoted string constant...
       */
 
-      quote = *ptr++;
+      ptr ++;
       value = ptr;
 
-      while (*ptr != quote && *ptr)
+      while (*ptr != '\'' && *ptr != '\0')
       {
-        if (*ptr == '\\' && ptr[1])
+        if (*ptr == '\\')
+	  _cups_strcpy(ptr, ptr + 1);
+
+        ptr ++;
+      }
+
+      if (*ptr != '\0')
+        *ptr++ = '\0';
+    }
+    else if (*ptr == '\"')
+    {
+     /*
+      * Double-quoted string constant...
+      */
+
+      ptr ++;
+      value = ptr;
+
+      while (*ptr != '\"' && *ptr != '\0')
+      {
+        if (*ptr == '\\')
 	  _cups_strcpy(ptr, ptr + 1);
 
         ptr ++;
@@ -593,7 +603,7 @@ cupsParseOptions(
 	      break;
 	  }
         }
-        else if (*ptr == '\\' && ptr[1])
+        else if (*ptr == '\\')
 	  _cups_strcpy(ptr, ptr + 1);
 
       if (*ptr != '\0')
@@ -607,9 +617,9 @@ cupsParseOptions(
 
       value = ptr;
 
-      while (!isspace(*ptr & 255) && *ptr)
+      while (!isspace(*ptr & 255) && *ptr != '\0')
       {
-        if (*ptr == '\\' && ptr[1])
+        if (*ptr == '\\')
 	  _cups_strcpy(ptr, ptr + 1);
 
         ptr ++;

cups/ppd.c

@@ -3,7 +3,7 @@
  *
  *   PPD file routines for the Common UNIX Printing System (CUPS).
  *
- *   Copyright 2007-2008 by Apple Inc.
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2007 by Easy Software Products, all rights reserved.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -814,13 +814,6 @@ ppdOpen2(cups_file_t *fp)		/* I - File to read from */
         profile = realloc(ppd->profiles, sizeof(ppd_profile_t) *
 	                                 (ppd->num_profiles + 1));
 
-      if (!profile)
-      {
-        cg->ppd_status = PPD_ALLOC_ERROR;
-
-	goto error;
-      }
-
       ppd->profiles     = profile;
       profile           += ppd->num_profiles;
       ppd->num_profiles ++;
@@ -1109,12 +1102,7 @@ ppdOpen2(cups_file_t *fp)		/* I - File to read from */
 	}
 
       ppd->num_emulations = count;
-      if ((ppd->emulations = calloc(count, sizeof(ppd_emul_t))) == NULL)
-      {
-        cg->ppd_status = PPD_ALLOC_ERROR;
-
-	goto error;
-      }
+      ppd->emulations     = calloc(count, sizeof(ppd_emul_t));
 
       for (i = 0, sptr = string; i < count; i ++)
       {
@@ -1878,12 +1866,7 @@ ppdOpen2(cups_file_t *fp)		/* I - File to read from */
       * Add the option choice...
       */
 
-      if ((choice = ppd_add_choice(option, name)) == NULL)
-      {
-        cg->ppd_status = PPD_ALLOC_ERROR;
-
-	goto error;
-      }
+      choice = ppd_add_choice(option, name);
 
       if (text[0])
         cupsCharsetToUTF8((cups_utf8_t *)choice->text, text,

cups/request.c

@@ -17,7 +17,6 @@
  * Contents:
  *
  *   cupsDoFileRequest() - Do an IPP request with a file.
- *   cupsDoIORequest()   - Do an IPP request with file descriptors.
  *   cupsDoRequest()     - Do an IPP request.
  *   _cupsSetError()     - Set the last IPP status code and status-message.
  *   _cupsSetHTTPError() - Set the last error using the HTTP status.

cups/testcups.c

@@ -106,7 +106,6 @@ main(int  argc,				/* I - Number of command-line arguments */
   {
     status = 1;
     puts("FAIL");
-    return (1);
   }
   else
     puts("PASS");

cups/transcode.c

@@ -3,7 +3,7 @@
  *
  *   Transcoding support for the Common UNIX Printing System (CUPS).
  *
- *   Copyright 2007-2008 by Apple Inc.
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2007 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -132,6 +132,8 @@ _cupsCharmapFlush(void)
     vnext = vmap->next;
 
     free_vbcs_charmap(vmap);
+
+    free(vmap);
   }
 
   vmap_cache = NULL;
@@ -328,8 +330,13 @@ cupsCharsetToUTF8(
 
   if (encoding < CUPS_ENCODING_SBCS_END)
     bytes = conv_sbcs_to_utf8(dest, (cups_sbcs_t *)src, maxout, encoding);
-  else
+  else if (encoding < CUPS_ENCODING_VBCS_END)
     bytes = conv_vbcs_to_utf8(dest, (cups_sbcs_t *)src, maxout, encoding);
+  else
+  {
+    DEBUG_puts("    Bad encoding, returning -1");
+    bytes = -1;
+  }
 
 #ifdef HAVE_PTHREAD_H
   pthread_mutex_unlock(&map_mutex);
@@ -430,8 +437,10 @@ cupsUTF8ToCharset(
 
   if (encoding < CUPS_ENCODING_SBCS_END)
     bytes = conv_utf8_to_sbcs((cups_sbcs_t *)dest, src, maxout, encoding);
-  else
+  else if (encoding < CUPS_ENCODING_VBCS_END)
     bytes = conv_utf8_to_vbcs((cups_sbcs_t *)dest, src, maxout, encoding);
+  else
+    bytes = -1;
 
 #ifdef HAVE_PTHREAD_H
   pthread_mutex_unlock(&map_mutex);
@@ -1459,8 +1468,6 @@ get_vbcs_charmap(
   {
     DEBUG_puts("    Unable to get charmap count!");
 
-    cupsFileClose(fp);
-
     return (NULL);
   }
 
@@ -1472,9 +1479,8 @@ get_vbcs_charmap(
 
   if ((vmap = (_cups_vmap_t *)calloc(1, sizeof(_cups_vmap_t))) == NULL)
   {
-    DEBUG_puts("    Unable to allocate memory!");
-
     cupsFileClose(fp);
+    DEBUG_puts("    Unable to allocate memory!");
 
     return (NULL);
   }

cups/util.c

@@ -846,6 +846,9 @@ cupsGetPPD2(http_t     *http,		/* I - HTTP connection */
 
   close(fd);
 
+  if (http2 != http)
+    httpClose(http2);
+
  /*
   * See if we actually got the file or an error...
   */
@@ -874,9 +877,6 @@ cupsGetPPD2(http_t     *http,		/* I - HTTP connection */
     return (NULL);
   }
 
-  if (http2 != http)
-    httpClose(http2);
-
  /*
   * Return the PPD file...
   */

data/testprint.ps

@@ -14,7 +14,7 @@
 %
 %   PostScript test page for the Common UNIX Printing System ("CUPS").
 %
-%   Copyright 2007-2008 Apple Inc.
+%   Copyright 2007 Apple Inc.
 %   Copyright 1993-2007 Easy Software Products
 %
 %   These coded instructions, statements, and computer programs are the
@@ -573,10 +573,10 @@ gsave
   pageHeight 8 mul			% Move down...
   2 copy moveto				% Position text
   smallFont setfont			% Font
-  (Copyright 2007-2008 Apple Inc., All Rights Reserved. CUPS and the CUPS logo are the) show
+  (Copyright 2007 Apple Inc., All Rights Reserved. CUPS and the CUPS logo are the trademark) show
   pageHeight 2 add sub			% Move down...
   2 copy moveto				% Position text
-  (trademark property of Apple Inc., 1 Infinite Loop, Cupertino, CA 95014, USA.) show
+  (property of Apple Inc., 1 Infinite Loop, Cupertino, CA 95014, USA.) show
   pageHeight 2 mul 4 add sub		% Move down...
   moveto				% Position text
   (Need help? Contact your operating system vendor or visit "http://www.cups.org/".) show
@@ -593,6 +593,6 @@ gsave
 grestore
 showpage
 %
-% End of "$Id: testprint.ps 7158 2008-01-02 21:23:11Z mike $".
+% End of "$Id: testprint.ps 6649 2007-07-11 21:46:42Z mike $".
 %
 %%EOF

doc/help/ref-cupsd-conf.html.in

@@ -31,8 +31,7 @@ process using the startup script for your operating system:</P>
 
 	<LI>MacOS X:
 	<PRE CLASS="command">
-sudo launchctl unload /System/Library/LaunchDaemons/org.cups.cupsd.plist
-sudo launchctl load /System/Library/LaunchDaemons/org.cups.cupsd.plist
+/System/Library/StartupItems/PrintingServices/PrintingServices restart
 	</PRE></LI>
 
 </UL>

doc/help/spec-ipp.html

@@ -11,7 +11,7 @@
 
   CUPS IPP specification for the Common UNIX Printing System (CUPS).
 
-  Copyright 2007-2008 by Apple Inc.
+  Copyright 2007 by Apple Inc.
   Copyright 1997-2007 by Easy Software Products.
 
   These coded instructions, statements, and computer programs are the
@@ -2251,101 +2251,6 @@ the system.
 <p>The job-sheets-supported attribute specifies the available banner files.
 There will always be at least one banner file available called "none".
 
-<h4><a name="marker-change-time">marker-change-time (integer)</a></h4>
-
-<p>The marker-change-time attribute specifies the printer-up-time value when
-the last change to the marker-colors, marker-levels, marker-names, or
-marker-types attributes was made.</p>
-
-<h4><a name="marker-colors">marker-colors (1setof name(MAX))</a></h4>
-
-<p>The marker-colors attribute specifies the color(s) for each supply in the
-printer. It is only available when the driver provides supply levels. The
-color is either "none" or one or more hex-encoded sRGB colors of the form
-"#RRGGBB".</p>
-
-<h4><a name="marker-levels">marker-levels (1setof integer(-1:100))</a></h4>
-
-<p>The marker-levels attribute specifies the current supply levels for the
-printer. It is only available when the driver provides supply levels. A
-value of -1 indicates the level is unknown, while values from 0 to 100
-indicate the corresponding percentage.</p>
-
-<h4><a name="marker-names">marker-names (1setof name(MAX))</a></h4>
-
-<p>The marker-names attribute specifies the name(s) for each supply in the
-printer. It is only available when the driver provides supply levels.</p>
-
-<h4><a name="marker-types">marker-types (1setof type3 keyword)</a></h4>
-
-<p>The marker-types attribute specifies the type(s) of each supply in the
-printer. It is only available when the driver provides supply levels. The
-following (RFC 3805) types are currently supported:</p>
-
-<ul>
-
-	<li><tt>toner</tt></li>
-
-	<li><tt>wasteToner</tt></li>
-
-	<li><tt>ink</tt></li>
-
-	<li><tt>inkCartridge</tt></li>
-
-	<li><tt>inkRibbon</tt></li>
-
-	<li><tt>wasteInk</tt></li>
-
-	<li><tt>opc</tt></li>
-
-	<li><tt>developer</tt></li>
-
-	<li><tt>fuserOil</tt></li>
-
-	<li><tt>solidWax</tt></li>
-
-	<li><tt>ribbonWax</tt></li>
-
-	<li><tt>wasteWax</tt></li>
-
-	<li><tt>fuser</tt></li>
-
-	<li><tt>coronaWire</tt></li>
-
-	<li><tt>fuserOilWick</tt></li>
-
-	<li><tt>cleanerUnit</tt></li>
-
-	<li><tt>fuserCleaningPad</tt></li>
-
-	<li><tt>transferUnit</tt></li>
-
-	<li><tt>tonerCartridge</tt></li>
-
-	<li><tt>fuserOiler</tt></li>
-
-	<li><tt>water</tt></li>
-
-	<li><tt>wasteWater</tt></li>
-
-	<li><tt>bindingSupply</tt></li>
-
-	<li><tt>bandingSupply</tt></li>
-
-	<li><tt>stichingWire</tt></li>
-
-	<li><tt>shrinkWrap</tt></li>
-
-	<li><tt>paperWrap</tt></li>
-
-	<li><tt>staples</tt></li>
-
-	<li><tt>inserts</tt></li>
-
-	<li><tt>covers</tt></li>
-
-</ul>
-
 <h4><a name="port-monitor">port-monitor" (name(127))</a></h4>
 
 <p>The port-monitor attribute specifies the port monitor to use when printing

doc/help/spec-ppd.html

@@ -8,7 +8,7 @@
 </head>
 <body>
 <!--
-  "$Id: spec-ppd.html 7273 2008-01-30 19:21:55Z mike $"
+  "$Id: spec-ppd.html 7050 2007-10-31 18:35:56Z mike $"
 
   CUPS PPD extensions specification for the Common UNIX Printing System (CUPS).
 
@@ -1204,7 +1204,7 @@ list of locale names ("en", "en_US", "fr_CA", etc.)</p>
 
 <pre class='command'>
 <em>*% Specify Canadian, UK, and US English, and Candian and French French</em> 
-*cupsLanguages: "en_CA en_UK en_US fr_CA fr_FR"
+*cupsLanguages: "en_CA en_UK en_US fr_CA fr_CA"
 </pre>
 
 <h3><a name='cupsManualCopies'>cupsManualCopies</a></h3>

doc/index.html.in

@@ -112,9 +112,9 @@ assistance:</P>
 WIDTH="15" HEIGHT="15" ALT=""></TD>
 <TD COLSPAN="2" WIDTH="100%" STYLE="padding: 5;">
 
-<P><SMALL>The Common UNIX Printing System, CUPS, and the CUPS logo are
-trademarks of <A HREF="http://www.apple.com">Apple Inc.</A> CUPS is
-copyright 2007-2008 Apple Inc. All rights reserved.</SMALL></P>
+<P><SMALL>The Common UNIX Printing System, CUPS, and the CUPS logo are the
+trademark property of <A HREF="http://www.apple.com">Apple Inc.</A>
+CUPS is copyright 2007 by Apple Inc., All Rights Reserved.</SMALL></P>
 
 </TD>
 

filter/hpgl-input.c

@@ -3,7 +3,7 @@
  *
  *   HP-GL/2 input processing for the Common UNIX Printing System (CUPS).
  *
- *   Copyright 2007-2008 by Apple Inc.
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1993-2006 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -48,7 +48,6 @@ ParseCommand(FILE    *fp,	/* I - File to read from */
 		i;		/* Looping var */
   char		buf[262144],	/* String buffer */
 		*bufptr;	/* Pointer into buffer */
-  float		temp;		/* Temporary parameter value */
   static param_t p[MAX_PARAMS];	/* Parameter buffer */
 
 
@@ -213,10 +212,10 @@ ParseCommand(FILE    *fp,	/* I - File to read from */
       case '-' :
       case '+' :
           ungetc(ch, fp);
-          if (fscanf(fp, "%f", &temp) == 1 && num_params < MAX_PARAMS)
+          fscanf(fp, "%f", &(p[num_params].value.number));
+          if (num_params < MAX_PARAMS)
           {
-            p[num_params].type         = PARAM_RELATIVE;
-            p[num_params].value.number = temp;
+            p[num_params].type = PARAM_RELATIVE;
             num_params ++;
           }
           break;
@@ -232,10 +231,10 @@ ParseCommand(FILE    *fp,	/* I - File to read from */
       case '9' :
       case '.' :
           ungetc(ch, fp);
-          if (fscanf(fp, "%f", &temp) == 1 && num_params < MAX_PARAMS)
+          fscanf(fp, "%f", &(p[num_params].value.number));
+          if (num_params < MAX_PARAMS)
           {
-            p[num_params].type         = PARAM_ABSOLUTE;
-            p[num_params].value.number = temp;
+            p[num_params].type = PARAM_ABSOLUTE;
             num_params ++;
           }
           break;

filter/image-bmp.c

@@ -3,7 +3,7 @@
  *
  *   BMP image routines for the Common UNIX Printing System (CUPS).
  *
- *   Copyright 2007-2008 by Apple Inc.
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1993-2007 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -179,22 +179,9 @@ _cupsImageReadBMP(
 
   cupsImageSetMaxTiles(img, 0);
 
+  in  = malloc(img->xsize * 3);
   bpp = cupsImageGetDepth(img);
-
-  if ((in = malloc(img->xsize * 3)) == NULL)
-  {
-    fputs("DEBUG: Unable to allocate memory!\n", stderr);
-    fclose(fp);
-    return (1);
-  }
-
-  if ((out = malloc(img->xsize * bpp)) == NULL)
-  {
-    fputs("DEBUG: Unable to allocate memory!\n", stderr);
-    free(in);
-    fclose(fp);
-    return (1);
-  }
+  out = malloc(img->xsize * bpp);
 
  /*
   * Read the image data...

filter/image-gif.c

@@ -3,7 +3,7 @@
  *
  *   GIF image routines for the Common UNIX Printing System (CUPS).
  *
- *   Copyright 2007-2008 by Apple Inc.
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1993-2007 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -462,14 +462,8 @@ gif_read_image(FILE         *fp,	/* I - Input file */
   pass      = 0;
   code_size = getc(fp);
 
-  if (!pixels)
-    return (-1);
-
   if (gif_read_lzw(fp, 1, code_size) < 0)
-  {
-    free(pixels);
     return (-1);
-  }
 
   temp = pixels;
   while ((pixel = gif_read_lzw(fp, 0, code_size)) >= 0)

filter/image-photocd.c

@@ -7,7 +7,7 @@
  *   is only YCC encoded.  Support for the higher resolution images will
  *   require a lot of extra code...
  *
- *   Copyright 2007-2008 by Apple Inc.
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1993-2006 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -99,33 +99,11 @@ _cupsImageReadPhotoCD(
   cupsImageSetMaxTiles(img, 0);
 
   bpp = cupsImageGetDepth(img);
-
-  if ((in = malloc(768 * 3)) == NULL)
-  {
-    fputs("DEBUG: Unable to allocate memory!\n", stderr);
-    fclose(fp);
-    return (1);
-  }
-
-  if ((out = malloc(768 * bpp)) == NULL)
-  {
-    fputs("DEBUG: Unable to allocate memory!\n", stderr);
-    fclose(fp);
-    free(in);
-    return (1);
-  }
+  in  = malloc(768 * 3);
+  out = malloc(768 * bpp);
 
   if (bpp > 1)
-  {
-    if ((rgb = malloc(768 * 3)) == NULL)
-    {
-      fputs("DEBUG: Unable to allocate memory!\n", stderr);
-      fclose(fp);
-      free(in);
-      free(out);
-      return (1);
-    }
-  }
+    rgb = malloc(768 * 3);
   else
     rgb = NULL;
 
@@ -163,9 +141,6 @@ _cupsImageReadPhotoCD(
       free(in);
       free(out);
 
-      if (bpp > 1)
-        free(rgb);
-
       return (-1);
     }
 

filter/image-pix.c

@@ -3,7 +3,7 @@
  *
  *   Alias PIX image routines for the Common UNIX Printing System (CUPS).
  *
- *   Copyright 2007-2008 by Apple Inc.
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1993-2007 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -95,22 +95,9 @@ _cupsImageReadPIX(
 
   cupsImageSetMaxTiles(img, 0);
 
+  in  = malloc(img->xsize * (depth / 8));
   bpp = cupsImageGetDepth(img);
-
-  if ((in = malloc(img->xsize * (depth / 8))) == NULL)
-  {
-    fputs("DEBUG: Unable to allocate memory!\n", stderr);
-    fclose(fp);
-    return (1);
-  }
-
-  if ((out = malloc(img->xsize * bpp)) == NULL)
-  {
-    fputs("DEBUG: Unable to allocate memory!\n", stderr);
-    fclose(fp);
-    free(in);
-    return (1);
-  }
+  out = malloc(img->xsize * bpp);
 
  /*
   * Read the image data...

filter/image-pnm.c

@@ -3,7 +3,7 @@
  *
  *   Portable Any Map file routines for the Common UNIX Printing System (CUPS).
  *
- *   Copyright 2007-2008 by Apple Inc.
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1993-2007 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -67,13 +67,7 @@ _cupsImageReadPNM(
   *   max sample
   */
 
-  if ((lineptr = fgets(line, sizeof(line), fp)) == NULL)
-  {
-    fputs("DEBUG: Bad PNM header!\n", stderr);
-    fclose(fp);
-    return (1);
-  }
-
+  lineptr = fgets(line, sizeof(line), fp);
   lineptr ++;
 
   format = atoi(lineptr);
@@ -153,21 +147,8 @@ _cupsImageReadPNM(
   cupsImageSetMaxTiles(img, 0);
 
   bpp = cupsImageGetDepth(img);
-
-  if ((in = malloc(img->xsize * 3)) == NULL)
-  {
-    fputs("DEBUG: Unable to allocate memory!\n", stderr);
-    fclose(fp);
-    return (1);
-  }
-
-  if ((out = malloc(img->xsize * bpp)) == NULL)
-  {
-    fputs("DEBUG: Unable to allocate memory!\n", stderr);
-    fclose(fp);
-    free(in);
-    return (1);
-  }
+  in  = malloc(img->xsize * 3);
+  out = malloc(img->xsize * bpp);
 
  /*
   * Read the image file...

filter/image-sgi.c

@@ -3,7 +3,7 @@
  *
  *   SGI image file routines for the Common UNIX Printing System (CUPS).
  *
- *   Copyright 2007-2008 by Apple Inc.
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1993-2007 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -77,6 +77,7 @@ _cupsImageReadSGI(
     fprintf(stderr, "DEBUG: Bad SGI image dimensions %ux%ux%u!\n",
             sgip->xsize, sgip->ysize, sgip->zsize);
     sgiClose(sgip);
+    fclose(fp);
     return (1);
   }
 
@@ -91,32 +92,10 @@ _cupsImageReadSGI(
   cupsImageSetMaxTiles(img, 0);
 
   bpp = cupsImageGetDepth(img);
+  in  = malloc(img->xsize * sgip->zsize);
+  out = malloc(img->xsize * bpp);
 
-  if ((in = malloc(img->xsize * sgip->zsize)) == NULL)
-  {
-    fputs("DEBUG: Unable to allocate memory!\n", stderr);
-    sgiClose(sgip);
-    return (1);
-  }
-
-  if ((out = malloc(img->xsize * bpp)) == NULL)
-  {
-    fputs("DEBUG: Unable to allocate memory!\n", stderr);
-    sgiClose(sgip);
-    free(in);
-    return (1);
-  }
-
-  if ((rows[0] = calloc(img->xsize * sgip->zsize,
-                        sizeof(unsigned short))) == NULL)
-  {
-    fputs("DEBUG: Unable to allocate memory!\n", stderr);
-    sgiClose(sgip);
-    free(in);
-    free(out);
-    return (1);
-  }
-
+  rows[0] = calloc(img->xsize * sgip->zsize, sizeof(unsigned short));
   for (i = 1; i < sgip->zsize; i ++)
     rows[i] = rows[0] + i * img->xsize;
 

filter/image-sgilib.c

@@ -4,7 +4,7 @@
  *   SGI image file format library routines for the Common UNIX Printing
  *   System (CUPS).
  *
- *   Copyright 2007-2008 by Apple Inc.
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1993-2005 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -250,20 +250,8 @@ sgiOpenFile(FILE *file,			/* I - File to open */
 
           fseek(sgip->file, 512, SEEK_SET);
 
-          if ((sgip->table = calloc(sgip->zsize, sizeof(long *))) == NULL)
-	  {
-	    free(sgip);
-	    return (NULL);
-	  }
-
-          if ((sgip->table[0] = calloc(sgip->ysize * sgip->zsize,
-	                               sizeof(long))) == NULL)
-          {
-	    free(sgip->table);
-	    free(sgip);
-	    return (NULL);
-	  }
-
+          sgip->table    = calloc(sgip->zsize, sizeof(long *));
+          sgip->table[0] = calloc(sgip->ysize * sgip->zsize, sizeof(long));
           for (i = 1; i < sgip->zsize; i ++)
             sgip->table[i] = sgip->table[0] + i * sgip->ysize;
 
@@ -345,39 +333,12 @@ sgiOpenFile(FILE *file,			/* I - File to open */
 
               sgip->firstrow = ftell(sgip->file);
               sgip->nextrow  = ftell(sgip->file);
-              if ((sgip->table = calloc(sgip->zsize, sizeof(long *))) == NULL)
-	      {
-	        free(sgip);
-		return (NULL);
-	      }
-
-              if ((sgip->table[0] = calloc(sgip->ysize * sgip->zsize,
-	                                   sizeof(long))) == NULL)
-              {
-	        free(sgip->table);
-		free(sgip);
-		return (NULL);
-	      }
-
+              sgip->table    = calloc(sgip->zsize, sizeof(long *));
+              sgip->table[0] = calloc(sgip->ysize * sgip->zsize, sizeof(long));
               for (i = 1; i < sgip->zsize; i ++)
         	sgip->table[i] = sgip->table[0] + i * sgip->ysize;
-
-              if ((sgip->length = calloc(sgip->zsize, sizeof(long *))) == NULL)
-	      {
-	        free(sgip->table);
-		free(sgip);
-		return (NULL);
-	      }
-
-              if ((sgip->length[0] = calloc(sgip->ysize * sgip->zsize,
-	                                    sizeof(long))) == NULL)
-              {
-	        free(sgip->length);
-		free(sgip->table);
-		free(sgip);
-		return (NULL);
-	      }
-
+              sgip->length    = calloc(sgip->zsize, sizeof(long *));
+              sgip->length[0] = calloc(sgip->ysize * sgip->zsize, sizeof(long));
               for (i = 1; i < sgip->zsize; i ++)
         	sgip->length[i] = sgip->length[0] + i * sgip->ysize;
               break;

filter/image-sun.c

@@ -3,7 +3,7 @@
  *
  *   Sun Raster image file routines for the Common UNIX Printing System (CUPS).
  *
- *   Copyright 2007-2008 by Apple Inc.
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1993-2007 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -152,32 +152,9 @@ _cupsImageReadSunRaster(
     in = malloc(img->xsize * 3 + 1);
   }
 
-  if (!in)
-  {
-    fputs("DEBUG: Unable to allocate memory!\n", stderr);
-    fclose(fp);
-    return (1);
-  }
-
-  bpp = cupsImageGetDepth(img);
-
-  if ((out = malloc(img->xsize * bpp)) == NULL)
-  {
-    fputs("DEBUG: Unable to allocate memory!\n", stderr);
-    fclose(fp);
-    free(in);
-    return (1);
-  }
-
-  if ((scanline = malloc(scanwidth)) == NULL)
-  {
-    fputs("DEBUG: Unable to allocate memory!\n", stderr);
-    fclose(fp);
-    free(in);
-    free(out);
-    return (1);
-  }
-
+  bpp       = cupsImageGetDepth(img);
+  out       = malloc(img->xsize * bpp);
+  scanline  = malloc(scanwidth);
   run_count = 0;
   run_value = 0;
 

filter/image.c

@@ -3,7 +3,7 @@
  *
  *   Base image support for the Common UNIX Printing System (CUPS).
  *
- *   Copyright 2007-2008 by Apple Inc.
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1993-2005 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -320,10 +320,15 @@ cupsImageOpen(
   */
 
   if ((fp = fopen(filename, "r")) == NULL)
-    return (NULL);
+  {
+/*    perror("ERROR: Unable to open image file");
+*/    return (NULL);
+  }
 
   if (fread(header, 1, sizeof(header), fp) == 0)
   {
+/*    perror("ERROR: Unable to read image file header");
+*/
     fclose(fp);
     return (NULL);
   }
@@ -341,7 +346,8 @@ cupsImageOpen(
 
   if (img == NULL)
   {
-    fclose(fp);
+/*    perror("ERROR: Unable to allocate memory for image file");
+*/    fclose(fp);
     return (NULL);
   }
 
@@ -395,7 +401,8 @@ cupsImageOpen(
 #endif /* HAVE_LIBTIFF */
   else
   {
-    fclose(fp);
+/*    fputs("ERROR: Unknown image file format!");
+*/    fclose(fp);
     status = -1;
   }
 
@@ -722,11 +729,8 @@ get_tile(cups_image_t *img,		/* I - Image */
 
     DEBUG_printf(("Creating tile array (%dx%d)\n", xtiles, ytiles));
 
-    if ((img->tiles = calloc(sizeof(cups_itile_t *), ytiles)) == NULL)
-      return (NULL);
-
-    if ((tile = calloc(sizeof(cups_itile_t), xtiles * ytiles)) == NULL)
-      return (NULL);
+    img->tiles = calloc(sizeof(cups_itile_t *), ytiles);
+    tile       = calloc(sizeof(cups_itile_t), xtiles * ytiles);
 
     for (tiley = 0; tiley < ytiles; tiley ++)
     {
@@ -747,23 +751,13 @@ get_tile(cups_image_t *img,		/* I - Image */
   {
     if (img->num_ics < img->max_ics)
     {
-      if ((ic = calloc(sizeof(cups_ic_t) +
-                       bpp * CUPS_TILE_SIZE * CUPS_TILE_SIZE, 1)) == NULL)
-      {
-        if (img->num_ics == 0)
-	  return (NULL);
+      ic         = calloc(sizeof(cups_ic_t) + bpp * CUPS_TILE_SIZE *
+                                              CUPS_TILE_SIZE, 1);
+      ic->pixels = ((cups_ib_t *)ic) + sizeof(cups_ic_t);
 
-        flush_tile(img);
-	ic = img->first;
-      }
-      else
-      {
-	ic->pixels = ((cups_ib_t *)ic) + sizeof(cups_ic_t);
+      img->num_ics ++;
 
-	img->num_ics ++;
-
-	DEBUG_printf(("Allocated cache tile %d (%p)...\n", img->num_ics, ic));
-      }
+      DEBUG_printf(("Allocated cache tile %d (%p)...\n", img->num_ics, ic));
     }
     else
     {

filter/interpret.c

@@ -3,7 +3,7 @@
  *
  *   PPD command interpreter for the Common UNIX Printing System (CUPS).
  *
- *   Copyright 2007-2008 by Apple Inc.
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1993-2007 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -571,7 +571,7 @@ _cupsRasterExecPS(
           break;
     }
 
-    if (obj && obj->type == CUPS_PS_OTHER)
+    if (obj->type == CUPS_PS_OTHER)
       break;
   }
 

filter/pstops.c

@@ -3,7 +3,7 @@
  *
  *   PostScript filter for the Common UNIX Printing System (CUPS).
  *
- *   Copyright 2007-2008 by Apple Inc.
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1993-2007 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -164,27 +164,27 @@ static void		cancel_job(int sig);
 static int		check_range(pstops_doc_t *doc, int page);
 static void		copy_bytes(cups_file_t *fp, off_t offset,
 			           size_t length);
-static ssize_t		copy_comments(cups_file_t *fp, pstops_doc_t *doc,
+static size_t		copy_comments(cups_file_t *fp, pstops_doc_t *doc,
 			              ppd_file_t *ppd, char *line,
-				      ssize_t linelen, size_t linesize);
+				      size_t linelen, size_t linesize);
 static void		copy_dsc(cups_file_t *fp, pstops_doc_t *doc,
-			         ppd_file_t *ppd, char *line, ssize_t linelen,
+			         ppd_file_t *ppd, char *line, size_t linelen,
 				 size_t linesize);
 static void		copy_non_dsc(cups_file_t *fp, pstops_doc_t *doc,
 			             ppd_file_t *ppd, char *line,
-				     ssize_t linelen, size_t linesize);
-static ssize_t		copy_page(cups_file_t *fp, pstops_doc_t *doc,
+				     size_t linelen, size_t linesize);
+static size_t		copy_page(cups_file_t *fp, pstops_doc_t *doc,
 			          ppd_file_t *ppd, int number, char *line,
-				  ssize_t linelen, size_t linesize);
-static ssize_t		copy_prolog(cups_file_t *fp, pstops_doc_t *doc,
+				  size_t linelen, size_t linesize);
+static size_t		copy_prolog(cups_file_t *fp, pstops_doc_t *doc,
 			            ppd_file_t *ppd, char *line,
-				    ssize_t linelen, size_t linesize);
-static ssize_t		copy_setup(cups_file_t *fp, pstops_doc_t *doc,
+				    size_t linelen, size_t linesize);
+static size_t		copy_setup(cups_file_t *fp, pstops_doc_t *doc,
 			           ppd_file_t *ppd, char *line,
-				   ssize_t linelen, size_t linesize);
-static ssize_t		copy_trailer(cups_file_t *fp, pstops_doc_t *doc,
+				   size_t linelen, size_t linesize);
+static size_t		copy_trailer(cups_file_t *fp, pstops_doc_t *doc,
 			             ppd_file_t *ppd, int number, char *line,
-				     ssize_t linelen, size_t linesize);
+				     size_t linelen, size_t linesize);
 static void		do_prolog(pstops_doc_t *doc, ppd_file_t *ppd);
 static void 		do_setup(pstops_doc_t *doc, ppd_file_t *ppd);
 static void		doc_printf(pstops_doc_t *doc, const char *format, ...)
@@ -203,7 +203,7 @@ static char		*parse_text(const char *start, char **end, char *buffer,
 static void		set_pstops_options(pstops_doc_t *doc, ppd_file_t *ppd,
 			                   char *argv[], int num_options,
 			                   cups_option_t *options);
-static ssize_t		skip_page(cups_file_t *fp, char *line, ssize_t linelen,
+static size_t		skip_page(cups_file_t *fp, char *line, size_t linelen,
 				  size_t linesize);
 static void		start_nup(pstops_doc_t *doc, int number,
 				  int show_border, const int *bounding_box);
@@ -581,12 +581,12 @@ copy_bytes(cups_file_t *fp,		/* I - File to read from */
  * On return, "line" will contain the next line in the file, if any.
  */
 
-static ssize_t				/* O - Length of next line */
+static size_t				/* O - Length of next line */
 copy_comments(cups_file_t  *fp,		/* I - File to read from */
               pstops_doc_t *doc,	/* I - Document info */
 	      ppd_file_t   *ppd,	/* I - PPD file */
               char         *line,	/* I - Line buffer */
-	      ssize_t      linelen,	/* I - Length of initial line */
+	      size_t       linelen,	/* I - Length of initial line */
 	      size_t       linesize)	/* I - Size of line buffer */
 {
   int	saw_bounding_box,		/* Saw %%BoundingBox: comment? */
@@ -809,7 +809,7 @@ copy_dsc(cups_file_t  *fp,		/* I - File to read from */
          pstops_doc_t *doc,		/* I - Document info */
          ppd_file_t   *ppd,		/* I - PPD file */
 	 char         *line,		/* I - Line buffer */
-	 ssize_t      linelen,		/* I - Length of initial line */
+	 size_t       linelen,		/* I - Length of initial line */
 	 size_t       linesize)		/* I - Size of line buffer */
 {
   int		number;			/* Page number */
@@ -889,8 +889,7 @@ copy_dsc(cups_file_t  *fp,		/* I - File to read from */
   * Finish up the last page(s)...
   */
 
-  if (number && is_not_last_page(number) && cupsArrayLast(doc->pages) &&
-      check_range(doc, (number - 1) / doc->number_up + 1))
+  if (number && !is_first_page(number) && cupsArrayLast(doc->pages))
   {
     pageinfo = (pstops_page_t *)cupsArrayLast(doc->pages);
 
@@ -931,7 +930,7 @@ copy_dsc(cups_file_t  *fp,		/* I - File to read from */
 
   number = doc->slow_order ? 0 : doc->page;
 
-  if (doc->temp && !JobCanceled && cupsArrayCount(doc->pages) > 0)
+  if (doc->temp && !JobCanceled)
   {
     int	copy;				/* Current copy */
 
@@ -1069,7 +1068,7 @@ copy_non_dsc(cups_file_t  *fp,		/* I - File to read from */
              pstops_doc_t *doc,		/* I - Document info */
              ppd_file_t   *ppd,		/* I - PPD file */
 	     char         *line,	/* I - Line buffer */
-	     ssize_t      linelen,	/* I - Length of initial line */
+	     size_t       linelen,	/* I - Length of initial line */
 	     size_t       linesize)	/* I - Size of line buffer */
 {
   int	copy;				/* Current copy */
@@ -1245,13 +1244,13 @@ copy_non_dsc(cups_file_t  *fp,		/* I - File to read from */
  * On return, "line" will contain the next line in the file, if any.
  */
 
-static ssize_t				/* O - Length of next line */
+static size_t				/* O - Length of next line */
 copy_page(cups_file_t  *fp,		/* I - File to read from */
           pstops_doc_t *doc,		/* I - Document info */
           ppd_file_t   *ppd,		/* I - PPD file */
 	  int          number,		/* I - Current page number */
 	  char         *line,		/* I - Line buffer */
-	  ssize_t      linelen,		/* I - Length of initial line */
+	  size_t       linelen,		/* I - Length of initial line */
 	  size_t       linesize)	/* I - Size of line buffer */
 {
   char		label[256],		/* Page label string */
@@ -1714,12 +1713,12 @@ copy_page(cups_file_t  *fp,		/* I - File to read from */
  * On return, "line" will contain the next line in the file, if any.
  */
 
-static ssize_t				/* O - Length of next line */
+static size_t				/* O - Length of next line */
 copy_prolog(cups_file_t  *fp,		/* I - File to read from */
             pstops_doc_t *doc,		/* I - Document info */
             ppd_file_t   *ppd,		/* I - PPD file */
 	    char         *line,		/* I - Line buffer */
-	    ssize_t      linelen,	/* I - Length of initial line */
+	    size_t       linelen,	/* I - Length of initial line */
 	    size_t       linesize)	/* I - Size of line buffer */
 {
   while (strncmp(line, "%%BeginProlog", 13))
@@ -1768,12 +1767,12 @@ copy_prolog(cups_file_t  *fp,		/* I - File to read from */
  * On return, "line" will contain the next line in the file, if any.
  */
 
-static ssize_t				/* O - Length of next line */
+static size_t				/* O - Length of next line */
 copy_setup(cups_file_t  *fp,		/* I - File to read from */
            pstops_doc_t *doc,		/* I - Document info */
            ppd_file_t   *ppd,		/* I - PPD file */
 	   char         *line,		/* I - Line buffer */
-	   ssize_t      linelen,	/* I - Length of initial line */
+	   size_t       linelen,	/* I - Length of initial line */
 	   size_t       linesize)	/* I - Size of line buffer */
 {
   while (strncmp(line, "%%BeginSetup", 12))
@@ -1833,13 +1832,13 @@ copy_setup(cups_file_t  *fp,		/* I - File to read from */
  * On return, "line" will contain the next line in the file, if any.
  */
 
-static ssize_t				/* O - Length of next line */
+static size_t				/* O - Length of next line */
 copy_trailer(cups_file_t  *fp,		/* I - File to read from */
              pstops_doc_t *doc,		/* I - Document info */
              ppd_file_t   *ppd,		/* I - PPD file */
 	     int          number,	/* I - Number of pages */
 	     char         *line,	/* I - Line buffer */
-	     ssize_t      linelen,	/* I - Length of initial line */
+	     size_t       linelen,	/* I - Length of initial line */
 	     size_t       linesize)	/* I - Size of line buffer */
 {
  /*
@@ -2712,10 +2711,10 @@ set_pstops_options(
  * 'skip_page()' - Skip past a page that won't be printed...
  */
 
-static ssize_t				/* O - Length of next line */
+static size_t				/* O - Length of next line */
 skip_page(cups_file_t *fp,		/* I - File to read from */
           char        *line,		/* I - Line buffer */
-	  ssize_t     linelen,		/* I - Length of initial line */
+	  size_t      linelen,		/* I - Length of initial line */
           size_t      linesize)		/* I - Size of line buffer */
 {
   int	level;				/* Embedded document level */

filter/rastertoepson.c

@@ -4,7 +4,7 @@
  *   EPSON ESC/P and ESC/P2 filter for the Common UNIX Printing System
  *   (CUPS).
  *
- *   Copyright 2007-2008 by Apple Inc.
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1993-2007 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -153,7 +153,7 @@ StartPage(const ppd_file_t         *ppd,	/* I - PPD file */
   * Send a reset sequence.
   */
 
-  if (ppd && ppd->nickname && strstr(ppd->nickname, "OKIDATA") != NULL)
+  if (ppd->nickname && strstr(ppd->nickname, "OKIDATA") != NULL)
     printf("\033{A");	/* Set EPSON emulation mode */
 
   printf("\033@");
@@ -164,7 +164,7 @@ StartPage(const ppd_file_t         *ppd,	/* I - PPD file */
 
   EjectPage = header->Margins[0] || header->Margins[1];
     
-  switch (Model)
+  switch (ppd->model_number)
   {
     case EPSON_9PIN :
     case EPSON_24PIN :
@@ -196,7 +196,7 @@ StartPage(const ppd_file_t         *ppd,	/* I - PPD file */
 	DotColumns = header->HWResolution[0] / 60;
         Shingling  = 0;
 
-        if (Model == EPSON_9PIN)
+        if (ppd->model_number == EPSON_9PIN)
 	  printf("\033\063\030");	/* Set line feed */
 	else
 	  switch (header->HWResolution[0])
@@ -251,11 +251,8 @@ StartPage(const ppd_file_t         *ppd,	/* I - PPD file */
 	putchar(n);
 	putchar(n >> 8);
 
-        if (ppd)
-	  t = (ppd->sizes[1].length - ppd->sizes[1].top) *
-	      header->HWResolution[1] / 72.0;
-        else
-	  t = 0;
+	t = (ppd->sizes[1].length - ppd->sizes[1].top) *
+	    header->HWResolution[1] / 72.0;
 
 	pwrite("\033(c\004\000", 5);		/* Top & bottom margins */
 	putchar(t);
@@ -296,35 +293,18 @@ StartPage(const ppd_file_t         *ppd,	/* I - PPD file */
   * Allocate memory for a line/row of graphics...
   */
 
-  if ((Planes[0] = malloc(header->cupsBytesPerLine)) == NULL)
-  {
-    fputs("ERROR: Unable to allocate memory!\n", stderr);
-    exit(1);
-  }
-
+  Planes[0] = malloc(header->cupsBytesPerLine);
   for (plane = 1; plane < NumPlanes; plane ++)
     Planes[plane] = Planes[0] + plane * header->cupsBytesPerLine / NumPlanes;
 
   if (header->cupsCompression || DotBytes)
-  {
-    if ((CompBuffer = calloc(2, header->cupsWidth)) == NULL)
-    {
-      fputs("ERROR: Unable to allocate memory!\n", stderr);
-      exit(1);
-    }
-  }
+    CompBuffer = calloc(2, header->cupsWidth);
   else
     CompBuffer = NULL;
 
   if (DotBytes)
   {
-    if ((LineBuffers[0] = calloc(DotBytes,
-                                 header->cupsWidth * (Shingling + 1))) == NULL)
-    {
-      fputs("ERROR: Unable to allocate memory!\n", stderr);
-      exit(1);
-    }
-
+    LineBuffers[0] = calloc(DotBytes, header->cupsWidth * (Shingling + 1));
     LineBuffers[1] = LineBuffers[0] + DotBytes * header->cupsWidth;
     DotBit         = 128;
     LineCount      = 0;

filter/rastertohp.c

@@ -4,7 +4,7 @@
  *   Hewlett-Packard Page Control Language filter for the Common UNIX
  *   Printing System (CUPS).
  *
- *   Copyright 2007-2008 by Apple Inc.
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1993-2007 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -277,7 +277,7 @@ StartPage(ppd_file_t         *ppd,	/* I - PPD file */
   * Set graphics mode...
   */
 
-  if (ppd && ppd->model_number == 2)
+  if (ppd->model_number == 2)
   {
    /*
     * Figure out the number of color planes...
@@ -382,12 +382,7 @@ StartPage(ppd_file_t         *ppd,	/* I - PPD file */
   * Allocate memory for a line of graphics...
   */
 
-  if ((Planes[0] = malloc(header->cupsBytesPerLine)) == NULL)
-  {
-    fputs("ERROR: Unable to allocate memory!\n", stderr);
-    exit(1);
-  }
-
+  Planes[0] = malloc(header->cupsBytesPerLine);
   for (plane = 1; plane < NumPlanes; plane ++)
     Planes[plane] = Planes[0] + plane * header->cupsBytesPerLine / NumPlanes;
 

locale/checkpo.c

@@ -50,7 +50,8 @@ main(int  argc,				/* I - Number of command-line args */
 			*strfmts;	/* Format strings in msgstr */
   char			*idfmt,		/* Current msgid format string */
 			*strfmt;	/* Current msgstr format string */
-  int			fmtidx;		/* Format index */
+  int			fmtidx,		/* Format index */
+			fmtcount;	/* Format count */
   int			status,		/* Exit status */
 			pass,		/* Pass/fail status */
 			untranslated;	/* Untranslated messages */
@@ -134,6 +135,8 @@ main(int  argc,				/* I - Number of command-line args */
 
 	  if (!idfmt || strcmp(strfmt, idfmt))
 	    break;
+
+	  fmtcount ++;
 	}
 
         if (cupsArrayCount(strfmts) != cupsArrayCount(idfmts) || strfmt)

man/cupsd.conf.man.in

@@ -3,7 +3,7 @@
 .\"
 .\"   cupsd.conf man page for the Common UNIX Printing System (CUPS).
 .\"
-.\"   Copyright 2007-2008 by Apple Inc.
+.\"   Copyright 2007 by Apple Inc.
 .\"   Copyright 1997-2006 by Easy Software Products.
 .\"
 .\"   These coded instructions, statements, and computer programs are the
@@ -12,7 +12,7 @@
 .\"   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 cupsd.conf 5 "Common UNIX Printing System" "2 January 2008" "Apple Inc."
+.TH cupsd.conf 5 "Common UNIX Printing System" "6 June 2006" "Apple Inc."
 .SH NAME
 cupsd.conf \- server configuration file for cups
 .SH DESCRIPTION
@@ -230,12 +230,6 @@ DefaultPolicy policy-name
 .br
 Specifies the default access policy to use.
 .TP 5
-DefaultShared Yes
-.TP 5
-DefaultShared No
-.br
-Specifies whether local printers are shared by default.
-.TP 5
 Deny all
 .TP 5
 Deny none
@@ -612,7 +606,7 @@ Specifies the user name or ID that is used when running external programs.
 .br
 http://localhost:631/help
 .SH COPYRIGHT
-Copyright 2007-2008 by Apple Inc.
+Copyright 2007 by Apple Inc.
 .\"
 .\" End of "$Id$".
 .\"

man/lpadmin.man

@@ -1,9 +1,9 @@
 .\"
-.\" "$Id: lpadmin.man 7163 2008-01-02 23:08:19Z mike $"
+.\" "$Id: lpadmin.man 6649 2007-07-11 21:46:42Z mike $"
 .\"
 .\"   lpadmin man page for the Common UNIX Printing System (CUPS).
 .\"
-.\"   Copyright 2007-2008 by Apple Inc.
+.\"   Copyright 2007 by Apple Inc.
 .\"   Copyright 1997-2006 by Easy Software Products.
 .\"
 .\"   These coded instructions, statements, and computer programs are the
@@ -12,7 +12,7 @@
 .\"   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 lpadmin 8 "Common UNIX Printing System" "2 January 2008" "Apple Inc."
+.TH lpadmin 8 "Common UNIX Printing System" "13 July 2006" "Apple Inc."
 .SH NAME
 lpadmin \- configure cups printers and classes
 .SH SYNOPSIS
@@ -81,6 +81,12 @@ and is intended for providing support for legacy printer drivers.
 Sets a standard System V interface script or PPD file from the
 \fImodel\fR directory.
 .TP 5
+-o name=value
+.br
+Sets a PPD or server option for the printer. PPD options can be
+listed using the \fI-l\fR option with the \fIlpoptions(1)\fR
+command.
+.TP 5
 -o job-k-limit=value
 .br
 Sets the kilobyte limit for per-user quotas. The value is an
@@ -103,23 +109,10 @@ integer number of seconds; 86,400 seconds are in one day.
 .br
 Sets the default banner page(s) to use for print jobs.
 .TP 5
--o name=value
-.br
-Sets a PPD option for the printer. PPD options can be
-listed using the \fI-l\fR option with the \fIlpoptions(1)\fR
-command.
-.TP 5
--o name-default=value
-.br
-Sets a default server-side option for the printer. Any print-time
-option can be defaulted, e.g. "-o cpi-default=17" to set the default
-"cpi" option value to 17.
-.TP 5
 -o port-monitor=name
 .br
 Sets the binary communications program to use when printing,
-"none", "bcp", or "tbcp". The default program is "none". The
-specified port monitor must be listed in the printer's PPD file.
+"none", "bcp", or "tbcp". The default program is "none".
 .TP 5
 -o printer-error-policy=name
 .br
@@ -201,7 +194,7 @@ System V or Solaris printing system configuration options.
 .br
 http://localhost:631/help
 .SH COPYRIGHT
-Copyright 2007-2008 by Apple Inc.
+Copyright 2007 by Apple Inc.
 .\"
-.\" End of "$Id: lpadmin.man 7163 2008-01-02 23:08:19Z mike $".
+.\" End of "$Id: lpadmin.man 6649 2007-07-11 21:46:42Z mike $".
 .\"

man/lpq.man

@@ -1,9 +1,9 @@
 .\"
-.\" "$Id: lpq.man 7163 2008-01-02 23:08:19Z mike $"
+.\" "$Id: lpq.man 6649 2007-07-11 21:46:42Z mike $"
 .\"
 .\"   lpq man page for the Common UNIX Printing System (CUPS).
 .\"
-.\"   Copyright 2007-2008 by Apple Inc.
+.\"   Copyright 2007 by Apple Inc.
 .\"   Copyright 1997-2006 by Easy Software Products.
 .\"
 .\"   These coded instructions, statements, and computer programs are the
@@ -12,7 +12,7 @@
 .\"   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 lpq 1 "Common UNIX Printing System" "2 January 2008" "Apple Inc."
+.TH lpq 1 "Common UNIX Printing System" "12 February 2006" "Apple Inc."
 .SH NAME
 lpq \- show printer queue status
 .SH SYNOPSIS
@@ -33,7 +33,7 @@ no printer or class is specified on the command-line.
 .LP
 The \fI+interval\fR option allows you to continuously report the
 jobs in the queue until the queue is empty; the list of jobs is
-show once every \fIinterval\fR seconds.
+show one every \fIinterval\fR seconds.
 .SH OPTIONS
 \fIlpq\fR supports the following options:
 .TP 5
@@ -66,7 +66,7 @@ Requests a more verbose (long) reporting format.
 .br
 http://localhost:631/help
 .SH COPYRIGHT
-Copyright 2007-2008 by Apple Inc.
+Copyright 2007 by Apple Inc.
 .\"
-.\" End of "$Id: lpq.man 7163 2008-01-02 23:08:19Z mike $".
+.\" End of "$Id: lpq.man 6649 2007-07-11 21:46:42Z mike $".
 .\"

notifier/Makefile

@@ -3,7 +3,7 @@
 #
 #   Notifier makefile for the Common UNIX Printing System (CUPS).
 #
-#   Copyright 2007-2008 by Apple Inc.
+#   Copyright 2007 by Apple Inc.
 #   Copyright 1997-2007 by Easy Software Products, all rights reserved.
 #
 #   These coded instructions, statements, and computer programs are the
@@ -44,7 +44,7 @@ install:	all
 	for file in $(TARGETS); do \
 		$(INSTALL_BIN) $$file $(SERVERBIN)/notifier; \
 	done
-	$(INSTALL_DIR) -m 775 $(CACHEDIR)/rss
+	$(INSTALL_DIR) -m 755 $(CACHEDIR)/rss
 	-chgrp $(CUPS_GROUP) $(CACHEDIR)/rss
 	if test "x$(SYMROOT)" != "x"; then \
 		$(INSTALL_DIR) $(SYMROOT); \

packaging/cups.list.in

@@ -4,7 +4,7 @@
 #   ESP Package Manager (EPM) file list for the Common UNIX Printing
 #   System (CUPS).
 #
-#   Copyright 2007-2008 by Apple Inc.
+#   Copyright 2007 by Apple Inc.
 #   Copyright 1997-2007 by Easy Software Products, all rights reserved.
 #
 #   These coded instructions, statements, and computer programs are the
@@ -16,7 +16,7 @@
 
 # Product information
 %product Common UNIX Printing System
-%copyright 2007-2008 by Apple Inc.
+%copyright 2007 by Apple Inc.
 %vendor Apple Inc.
 #%license LICENSE.txt
 %readme LICENSE.txt

packaging/cups.spec.in

@@ -5,7 +5,7 @@
 #
 #   Original version by Jason McMullan <jmcc@ontv.com>.
 #
-#   Copyright 2007-2008 by Apple Inc.
+#   Copyright 2007 by Apple Inc.
 #   Copyright 1999-2007 by Easy Software Products, all rights reserved.
 #
 #   These coded instructions, statements, and computer programs are the

pdftops/pdftops.cxx

@@ -308,7 +308,8 @@ main(int  argc,				// I - Number of command-line args
     // write PostScript file
     psOut = new PSOutputDev(psFileName->getCString(), doc->getXRef(),
                             doc->getCatalog(), 1, doc->getNumPages(),
-			    psModePS, 0, 0, 0, 0, gFalse, NULL);
+			    psModePS, 0, 0, 0, 0, gFalse,
+			    cupsGetOption("page-ranges", num_options, options));
     if (psOut->isOk())
       doc->displayPages(psOut, 1, doc->getNumPages(), 72.0, 72.0, 0,
                         gTrue, gFalse, gFalse);

scheduler/auth.c

@@ -3,7 +3,7 @@
  *
  *   Authorization routines for the Common UNIX Printing System (CUPS).
  *
- *   Copyright 2007-2008 by Apple Inc.
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2007 by Easy Software Products, all rights reserved.
  *
  *   This file contains Kerberos support code, copyright 2006 by
@@ -176,13 +176,8 @@ cupsdAddLocation(const char *location)	/* I - Location path */
   * Initialize the record and copy the name over...
   */
 
-  if ((temp->location = strdup(location)) == NULL)
-  {
-    free(temp);
-    return (NULL);
-  }
-
-  temp->length = strlen(temp->location);
+  temp->location = strdup(location);
+  temp->length   = strlen(temp->location);
 
   cupsArrayAdd(Locations, temp);
 
@@ -262,7 +257,7 @@ cupsdAllowHost(cupsd_location_t *loc,	/* I - Location to add to */
     * Allow *interface*...
     */
 
-    temp->type             = CUPSD_AUTH_INTERFACE;
+    temp->type             = AUTH_INTERFACE;
     temp->mask.name.name   = strdup("*");
     temp->mask.name.length = 1;
   }
@@ -282,7 +277,7 @@ cupsdAllowHost(cupsd_location_t *loc,	/* I - Location to add to */
       *ifptr = '\0';
     }
 
-    temp->type             = CUPSD_AUTH_INTERFACE;
+    temp->type             = AUTH_INTERFACE;
     temp->mask.name.name   = strdup(ifname);
     temp->mask.name.length = ifptr - ifname;
   }
@@ -292,7 +287,7 @@ cupsdAllowHost(cupsd_location_t *loc,	/* I - Location to add to */
     * Allow name...
     */
 
-    temp->type             = CUPSD_AUTH_NAME;
+    temp->type             = AUTH_NAME;
     temp->mask.name.name   = strdup(name);
     temp->mask.name.length = strlen(name);
   }
@@ -305,10 +300,9 @@ cupsdAllowHost(cupsd_location_t *loc,	/* I - Location to add to */
  */
 
 void
-cupsdAllowIP(
-    cupsd_location_t *loc,		/* I - Location to add to */
-    const unsigned   address[4],	/* I - IP address to add */
-    const unsigned   netmask[4])	/* I - Netmask of address */
+cupsdAllowIP(cupsd_location_t *loc,	/* I - Location to add to */
+             unsigned   address[4],	/* I - IP address to add */
+             unsigned   netmask[4])	/* I - Netmask of address */
 {
   cupsd_authmask_t	*temp;		/* New host/domain mask */
 
@@ -322,7 +316,7 @@ cupsdAllowIP(
   if ((temp = add_allow(loc)) == NULL)
     return;
 
-  temp->type = CUPSD_AUTH_IP;
+  temp->type = AUTH_IP;
   memcpy(temp->mask.ip.address, address, sizeof(temp->mask.ip.address));
   memcpy(temp->mask.ip.netmask, netmask, sizeof(temp->mask.ip.netmask));
 }
@@ -369,15 +363,15 @@ cupsdAuthorize(cupsd_client_t *con)	/* I - Client connection */
   */
 
   con->best = cupsdFindBest(con->uri, con->http.state);
-  con->type = CUPSD_AUTH_NONE;
+  con->type = AUTH_NONE;
 
   cupsdLogMessage(CUPSD_LOG_DEBUG2,
                   "cupsdAuthorize: con->uri=\"%s\", con->best=%p(%s)",
                   con->uri, con->best, con->best ? con->best->location : "");
 
-  if (con->best && con->best->type != CUPSD_AUTH_NONE)
+  if (con->best && con->best->type != AUTH_NONE)
   {
-    if (con->best->type == CUPSD_AUTH_DEFAULT)
+    if (con->best->type == AUTH_DEFAULT)
       type = DefaultAuthType;
     else
       type = con->best->type;
@@ -469,7 +463,7 @@ cupsdAuthorize(cupsd_client_t *con)	/* I - Client connection */
 
     AuthorizationFreeItemSet(authinfo);
 
-    con->type = CUPSD_AUTH_BASIC;
+    con->type = AUTH_BASIC;
   }
 #endif /* HAVE_AUTHORIZATION_H */
 #if defined(SO_PEERCRED) && defined(AF_LOCAL)
@@ -526,7 +520,7 @@ cupsdAuthorize(cupsd_client_t *con)	/* I - Client connection */
                     "cupsdAuthorize: Authorized as %s using PeerCred",
 		    username);
 
-    con->type = CUPSD_AUTH_BASIC;
+    con->type = AUTH_BASIC;
   }
 #endif /* SO_PEERCRED && AF_LOCAL */
   else if (!strncmp(authorization, "Local", 5) &&
@@ -556,7 +550,7 @@ cupsdAuthorize(cupsd_client_t *con)	/* I - Client connection */
       return;
     }
 
-    con->type = CUPSD_AUTH_BASIC;
+    con->type = AUTH_BASIC;
   }
   else if (!strncmp(authorization, "Basic", 5))
   {
@@ -618,7 +612,7 @@ cupsdAuthorize(cupsd_client_t *con)	/* I - Client connection */
     switch (type)
     {
       default :
-      case CUPSD_AUTH_BASIC :
+      case AUTH_BASIC :
           {
 #if HAVE_LIBPAM
 	   /*
@@ -817,7 +811,7 @@ cupsdAuthorize(cupsd_client_t *con)	/* I - Client connection */
 			  username);
           break;
 
-      case CUPSD_AUTH_BASICDIGEST :
+      case AUTH_BASICDIGEST :
          /*
 	  * Do Basic authentication with the Digest password file...
 	  */
@@ -921,7 +915,7 @@ cupsdAuthorize(cupsd_client_t *con)	/* I - Client connection */
                     "cupsdAuthorize: Authorized as %s using Digest",
 		    username);
 
-    con->type = CUPSD_AUTH_DIGEST;
+    con->type = AUTH_DIGEST;
   }
 #ifdef HAVE_GSSAPI
   else if (!strncmp(authorization, "Negotiate", 9)) 
@@ -1062,7 +1056,7 @@ cupsdAuthorize(cupsd_client_t *con)	/* I - Client connection */
 
       con->gss_have_creds = 1;
 
-      con->type = CUPSD_AUTH_NEGOTIATE;
+      con->type = AUTH_NEGOTIATE;
     }
     else
       gss_release_name(&minor_status, &client_name);
@@ -1115,7 +1109,7 @@ cupsdCheckAuth(
   {
     switch (masks->type)
     {
-      case CUPSD_AUTH_INTERFACE :
+      case AUTH_INTERFACE :
          /*
 	  * Check for a match with a network interface...
 	  */
@@ -1223,7 +1217,7 @@ cupsdCheckAuth(
 	  }
 	  break;
 
-      case CUPSD_AUTH_NAME :
+      case AUTH_NAME :
          /*
 	  * Check for exact name match...
 	  */
@@ -1242,7 +1236,7 @@ cupsdCheckAuth(
 	    return (1);
           break;
 
-      case CUPSD_AUTH_IP :
+      case AUTH_IP :
          /*
 	  * Check for IP/network address match...
 	  */
@@ -1433,7 +1427,7 @@ cupsdCopyLocation(
     for (i = 0; i < temp->num_allow; i ++)
       switch (temp->allow[i].type = (*loc)->allow[i].type)
       {
-        case CUPSD_AUTH_NAME :
+        case AUTH_NAME :
 	    temp->allow[i].mask.name.length = (*loc)->allow[i].mask.name.length;
 	    temp->allow[i].mask.name.name   = strdup((*loc)->allow[i].mask.name.name);
 
@@ -1446,7 +1440,7 @@ cupsdCopyLocation(
 	      return (NULL);
 	    }
 	    break;
-	case CUPSD_AUTH_IP :
+	case AUTH_IP :
 	    memcpy(&(temp->allow[i].mask.ip), &((*loc)->allow[i].mask.ip),
 	           sizeof(cupsd_ipmask_t));
 	    break;
@@ -1471,7 +1465,7 @@ cupsdCopyLocation(
     for (i = 0; i < temp->num_deny; i ++)
       switch (temp->deny[i].type = (*loc)->deny[i].type)
       {
-        case CUPSD_AUTH_NAME :
+        case AUTH_NAME :
 	    temp->deny[i].mask.name.length = (*loc)->deny[i].mask.name.length;
 	    temp->deny[i].mask.name.name   = strdup((*loc)->deny[i].mask.name.name);
 
@@ -1484,7 +1478,7 @@ cupsdCopyLocation(
 	      return (NULL);
 	    }
 	    break;
-	case CUPSD_AUTH_IP :
+	case AUTH_IP :
 	    memcpy(&(temp->deny[i].mask.ip), &((*loc)->deny[i].mask.ip),
 	           sizeof(cupsd_ipmask_t));
 	    break;
@@ -1544,14 +1538,14 @@ cupsdDeleteLocation(
     free(loc->names);
 
   for (i = loc->num_allow, mask = loc->allow; i > 0; i --, mask ++)
-    if (mask->type == CUPSD_AUTH_NAME || mask->type == CUPSD_AUTH_INTERFACE)
+    if (mask->type == AUTH_NAME || mask->type == AUTH_INTERFACE)
       free(mask->mask.name.name);
 
   if (loc->num_allow > 0)
     free(loc->allow);
 
   for (i = loc->num_deny, mask = loc->deny; i > 0; i --, mask ++)
-    if (mask->type == CUPSD_AUTH_NAME || mask->type == CUPSD_AUTH_INTERFACE)
+    if (mask->type == AUTH_NAME || mask->type == AUTH_INTERFACE)
       free(mask->mask.name.name);
 
   if (loc->num_deny > 0)
@@ -1588,7 +1582,7 @@ cupsdDenyHost(cupsd_location_t *loc,	/* I - Location to add to */
     * Deny *interface*...
     */
 
-    temp->type             = CUPSD_AUTH_INTERFACE;
+    temp->type             = AUTH_INTERFACE;
     temp->mask.name.name   = strdup("*");
     temp->mask.name.length = 1;
   }
@@ -1608,7 +1602,7 @@ cupsdDenyHost(cupsd_location_t *loc,	/* I - Location to add to */
       *ifptr = '\0';
     }
 
-    temp->type             = CUPSD_AUTH_INTERFACE;
+    temp->type             = AUTH_INTERFACE;
     temp->mask.name.name   = strdup(ifname);
     temp->mask.name.length = ifptr - ifname;
   }
@@ -1618,7 +1612,7 @@ cupsdDenyHost(cupsd_location_t *loc,	/* I - Location to add to */
     * Deny name...
     */
 
-    temp->type             = CUPSD_AUTH_NAME;
+    temp->type             = AUTH_NAME;
     temp->mask.name.name   = strdup(name);
     temp->mask.name.length = strlen(name);
   }
@@ -1632,8 +1626,8 @@ cupsdDenyHost(cupsd_location_t *loc,	/* I - Location to add to */
 
 void
 cupsdDenyIP(cupsd_location_t *loc,	/* I - Location to add to */
-	    const unsigned   address[4],/* I - IP address to add */
-	    const unsigned   netmask[4])/* I - Netmask of address */
+	    unsigned         address[4],/* I - IP address to add */
+	    unsigned         netmask[4])/* I - Netmask of address */
 {
   cupsd_authmask_t	*temp;		/* New host/domain mask */
 
@@ -1647,7 +1641,7 @@ cupsdDenyIP(cupsd_location_t *loc,	/* I - Location to add to */
   if ((temp = add_deny(loc)) == NULL)
     return;
 
-  temp->type = CUPSD_AUTH_IP;
+  temp->type = AUTH_IP;
   memcpy(temp->mask.ip.address, address, sizeof(temp->mask.ip.address));
   memcpy(temp->mask.ip.netmask, netmask, sizeof(temp->mask.ip.netmask));
 }
@@ -1668,22 +1662,22 @@ cupsdFindBest(const char   *path,	/* I - Resource path */
 			*best;		/* Best match for location so far */
   int			bestlen;	/* Length of best match */
   int			limit;		/* Limit field */
-  static const int	limits[] =	/* Map http_status_t to CUPSD_AUTH_LIMIT_xyz */
+  static const int	limits[] =	/* Map http_status_t to AUTH_LIMIT_xyz */
 		{
-		  CUPSD_AUTH_LIMIT_ALL,
-		  CUPSD_AUTH_LIMIT_OPTIONS,
-		  CUPSD_AUTH_LIMIT_GET,
-		  CUPSD_AUTH_LIMIT_GET,
-		  CUPSD_AUTH_LIMIT_HEAD,
-		  CUPSD_AUTH_LIMIT_POST,
-		  CUPSD_AUTH_LIMIT_POST,
-		  CUPSD_AUTH_LIMIT_POST,
-		  CUPSD_AUTH_LIMIT_PUT,
-		  CUPSD_AUTH_LIMIT_PUT,
-		  CUPSD_AUTH_LIMIT_DELETE,
-		  CUPSD_AUTH_LIMIT_TRACE,
-		  CUPSD_AUTH_LIMIT_ALL,
-		  CUPSD_AUTH_LIMIT_ALL
+		  AUTH_LIMIT_ALL,
+		  AUTH_LIMIT_OPTIONS,
+		  AUTH_LIMIT_GET,
+		  AUTH_LIMIT_GET,
+		  AUTH_LIMIT_HEAD,
+		  AUTH_LIMIT_POST,
+		  AUTH_LIMIT_POST,
+		  AUTH_LIMIT_POST,
+		  AUTH_LIMIT_PUT,
+		  AUTH_LIMIT_PUT,
+		  AUTH_LIMIT_DELETE,
+		  AUTH_LIMIT_TRACE,
+		  AUTH_LIMIT_ALL,
+		  AUTH_LIMIT_ALL
 		};
 
 
@@ -1843,16 +1837,16 @@ cupsdIsAuthorized(cupsd_client_t *con,	/* I - Connection */
 
   best = con->best;
 
-  if ((type = best->type) == CUPSD_AUTH_DEFAULT)
+  if ((type = best->type) == AUTH_DEFAULT)
     type = DefaultAuthType;
 
   cupsdLogMessage(CUPSD_LOG_DEBUG2,
-                  "cupsdIsAuthorized: level=CUPSD_AUTH_%s, type=%s, "
-		  "satisfy=CUPSD_AUTH_SATISFY_%s, num_names=%d",
+                  "cupsdIsAuthorized: level=AUTH_%s, type=%s, "
+		  "satisfy=AUTH_SATISFY_%s, num_names=%d",
                   levels[best->level], types[type],
 	          best->satisfy ? "ANY" : "ALL", best->num_names);
 
-  if (best->limit == CUPSD_AUTH_LIMIT_IPP)
+  if (best->limit == AUTH_LIMIT_IPP)
     cupsdLogMessage(CUPSD_LOG_DEBUG2, "cupsdIsAuthorized: op=%x(%s)",
                     best->op, ippOpString(best->op));
 
@@ -1896,7 +1890,7 @@ cupsdIsAuthorized(cupsd_client_t *con,	/* I - Connection */
     * Access from localhost (127.0.0.1 or ::1) is always allowed...
     */
 
-    auth = CUPSD_AUTH_ALLOW;
+    auth = AUTH_ALLOW;
   }
   else
   {
@@ -1907,39 +1901,39 @@ cupsdIsAuthorized(cupsd_client_t *con,	/* I - Connection */
     switch (best->order_type)
     {
       default :
-	  auth = CUPSD_AUTH_DENY;	/* anti-compiler-warning-code */
+	  auth = AUTH_DENY;	/* anti-compiler-warning-code */
 	  break;
 
-      case CUPSD_AUTH_ALLOW : /* Order Deny,Allow */
-          auth = CUPSD_AUTH_ALLOW;
+      case AUTH_ALLOW : /* Order Deny,Allow */
+          auth = AUTH_ALLOW;
 
           if (cupsdCheckAuth(address, con->http.hostname, hostlen,
 	          	best->num_deny, best->deny))
-	    auth = CUPSD_AUTH_DENY;
+	    auth = AUTH_DENY;
 
           if (cupsdCheckAuth(address, con->http.hostname, hostlen,
 	        	best->num_allow, best->allow))
-	    auth = CUPSD_AUTH_ALLOW;
+	    auth = AUTH_ALLOW;
 	  break;
 
-      case CUPSD_AUTH_DENY : /* Order Allow,Deny */
-          auth = CUPSD_AUTH_DENY;
+      case AUTH_DENY : /* Order Allow,Deny */
+          auth = AUTH_DENY;
 
           if (cupsdCheckAuth(address, con->http.hostname, hostlen,
 	        	best->num_allow, best->allow))
-	    auth = CUPSD_AUTH_ALLOW;
+	    auth = AUTH_ALLOW;
 
           if (cupsdCheckAuth(address, con->http.hostname, hostlen,
 	        	best->num_deny, best->deny))
-	    auth = CUPSD_AUTH_DENY;
+	    auth = AUTH_DENY;
 	  break;
     }
   }
 
-  cupsdLogMessage(CUPSD_LOG_DEBUG2, "cupsdIsAuthorized: auth=CUPSD_AUTH_%s...",
+  cupsdLogMessage(CUPSD_LOG_DEBUG2, "cupsdIsAuthorized: auth=AUTH_%s...",
                   auth ? "DENY" : "ALLOW");
 
-  if (auth == CUPSD_AUTH_DENY && best->satisfy == CUPSD_AUTH_SATISFY_ALL)
+  if (auth == AUTH_DENY && best->satisfy == AUTH_SATISFY_ALL)
     return (HTTP_FORBIDDEN);
 
 #ifdef HAVE_SSL
@@ -1949,9 +1943,9 @@ cupsdIsAuthorized(cupsd_client_t *con,	/* I - Connection */
 
   if ((best->encryption >= HTTP_ENCRYPT_REQUIRED && !con->http.tls &&
       strcasecmp(con->http.hostname, "localhost") &&
-      best->satisfy == CUPSD_AUTH_SATISFY_ALL) &&
-      !(type == CUPSD_AUTH_NEGOTIATE || 
-        (type == CUPSD_AUTH_NONE && DefaultAuthType == CUPSD_AUTH_NEGOTIATE)))
+      best->satisfy == AUTH_SATISFY_ALL) &&
+      !(type == AUTH_NEGOTIATE || 
+        (type == AUTH_NONE && DefaultAuthType == AUTH_NEGOTIATE)))
   {
     cupsdLogMessage(CUPSD_LOG_DEBUG,
                     "cupsdIsAuthorized: Need upgrade to TLS...");
@@ -1963,12 +1957,12 @@ cupsdIsAuthorized(cupsd_client_t *con,	/* I - Connection */
   * Now see what access level is required...
   */
 
-  if (best->level == CUPSD_AUTH_ANON ||	/* Anonymous access - allow it */
-      (type == CUPSD_AUTH_NONE && best->num_names == 0))
+  if (best->level == AUTH_ANON ||	/* Anonymous access - allow it */
+      (type == AUTH_NONE && best->num_names == 0))
     return (HTTP_OK);
 
-  if (!con->username[0] && type == CUPSD_AUTH_NONE &&
-      best->limit == CUPSD_AUTH_LIMIT_IPP)
+  if (!con->username[0] && type == AUTH_NONE &&
+      best->limit == AUTH_LIMIT_IPP)
   {
    /*
     * Check for unauthenticated username...
@@ -1985,7 +1979,7 @@ cupsdIsAuthorized(cupsd_client_t *con,	/* I - Connection */
                       attr->values[0].string.text);
       strlcpy(username, attr->values[0].string.text, sizeof(username));
     }
-    else if (best->satisfy == CUPSD_AUTH_SATISFY_ALL || auth == CUPSD_AUTH_DENY)
+    else if (best->satisfy == AUTH_SATISFY_ALL || auth == AUTH_DENY)
       return (HTTP_UNAUTHORIZED);	/* Non-anonymous needs user/pass */
     else
       return (HTTP_OK);			/* unless overridden with Satisfy */
@@ -2001,14 +1995,14 @@ cupsdIsAuthorized(cupsd_client_t *con,	/* I - Connection */
     if (!con->username[0])
 #endif /* HAVE_AUTHORIZATION_H */
     {
-      if (best->satisfy == CUPSD_AUTH_SATISFY_ALL || auth == CUPSD_AUTH_DENY)
+      if (best->satisfy == AUTH_SATISFY_ALL || auth == AUTH_DENY)
 	return (HTTP_UNAUTHORIZED);	/* Non-anonymous needs user/pass */
       else
 	return (HTTP_OK);		/* unless overridden with Satisfy */
     }
 
-    if (con->type != type && type != CUPSD_AUTH_NONE &&
-        (con->type != CUPSD_AUTH_BASIC || type != CUPSD_AUTH_BASICDIGEST))
+    if (con->type != type && type != AUTH_NONE &&
+        (con->type != AUTH_BASIC || type != AUTH_BASICDIGEST))
     {
       cupsdLogMessage(CUPSD_LOG_ERROR, "Authorized using %s, expected %s!",
                       types[con->type], types[type]);
@@ -2056,7 +2050,7 @@ cupsdIsAuthorized(cupsd_client_t *con,	/* I - Connection */
   else
     pw = NULL;
 
-  if (best->level == CUPSD_AUTH_USER)
+  if (best->level == AUTH_USER)
   {
    /*
     * If there are no names associated with this location, then

scheduler/auth.h

@@ -4,7 +4,7 @@
  *   Authorization definitions for the Common UNIX Printing System (CUPS)
  *   scheduler.
  *
- *   Copyright 2007-2008 by Apple Inc.
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2006 by Easy Software Products, all rights reserved.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -25,36 +25,36 @@
  * HTTP authorization types and levels...
  */
 
-#define CUPSD_AUTH_DEFAULT	-1	/* Use DefaultAuthType */
-#define CUPSD_AUTH_NONE		0	/* No authentication */
-#define CUPSD_AUTH_BASIC	1	/* Basic authentication */
-#define CUPSD_AUTH_DIGEST	2	/* Digest authentication */
-#define CUPSD_AUTH_BASICDIGEST	3	/* Basic authentication w/passwd.md5 */
-#define CUPSD_AUTH_NEGOTIATE	4	/* Kerberos authentication */
+#define AUTH_DEFAULT		-1	/* Use DefaultAuthType */
+#define AUTH_NONE		0	/* No authentication */
+#define AUTH_BASIC		1	/* Basic authentication */
+#define AUTH_DIGEST		2	/* Digest authentication */
+#define AUTH_BASICDIGEST	3	/* Basic authentication w/passwd.md5 */
+#define AUTH_NEGOTIATE		4	/* Kerberos authentication */
 
-#define CUPSD_AUTH_ANON		0	/* Anonymous access */
-#define CUPSD_AUTH_USER		1	/* Must have a valid username/password */
-#define CUPSD_AUTH_GROUP	2	/* Must also be in a named group */
+#define AUTH_ANON		0	/* Anonymous access */
+#define AUTH_USER		1	/* Must have a valid username/password */
+#define AUTH_GROUP		2	/* Must also be in a named group */
 
-#define CUPSD_AUTH_ALLOW	0	/* Allow access */
-#define CUPSD_AUTH_DENY		1	/* Deny access */
+#define AUTH_ALLOW		0	/* Allow access */
+#define AUTH_DENY		1	/* Deny access */
 
-#define CUPSD_AUTH_NAME		0	/* Authorize host by name */
-#define CUPSD_AUTH_IP		1	/* Authorize host by IP */
-#define CUPSD_AUTH_INTERFACE	2	/* Authorize host by interface */
+#define AUTH_NAME		0	/* Authorize host by name */
+#define AUTH_IP			1	/* Authorize host by IP */
+#define AUTH_INTERFACE		2	/* Authorize host by interface */
 
-#define CUPSD_AUTH_SATISFY_ALL	0	/* Satisfy both address and auth */
-#define CUPSD_AUTH_SATISFY_ANY	1	/* Satisfy either address or auth */
+#define AUTH_SATISFY_ALL	0	/* Satisfy both address and auth */
+#define AUTH_SATISFY_ANY	1	/* Satisfy either address or auth */
 
-#define CUPSD_AUTH_LIMIT_DELETE	1	/* Limit DELETE requests */
-#define CUPSD_AUTH_LIMIT_GET	2	/* Limit GET requests */
-#define CUPSD_AUTH_LIMIT_HEAD	4	/* Limit HEAD requests */
-#define CUPSD_AUTH_LIMIT_OPTIONS 8	/* Limit OPTIONS requests */
-#define CUPSD_AUTH_LIMIT_POST	16	/* Limit POST requests */
-#define CUPSD_AUTH_LIMIT_PUT	32	/* Limit PUT requests */
-#define CUPSD_AUTH_LIMIT_TRACE	64	/* Limit TRACE requests */
-#define CUPSD_AUTH_LIMIT_ALL	127	/* Limit all requests */
-#define CUPSD_AUTH_LIMIT_IPP	128	/* Limit IPP requests */
+#define AUTH_LIMIT_DELETE	1	/* Limit DELETE requests */
+#define AUTH_LIMIT_GET		2	/* Limit GET requests */
+#define AUTH_LIMIT_HEAD		4	/* Limit HEAD requests */
+#define AUTH_LIMIT_OPTIONS	8	/* Limit OPTIONS requests */
+#define AUTH_LIMIT_POST		16	/* Limit POST requests */
+#define AUTH_LIMIT_PUT		32	/* Limit PUT requests */
+#define AUTH_LIMIT_TRACE	64	/* Limit TRACE requests */
+#define AUTH_LIMIT_ALL		127	/* Limit all requests */
+#define AUTH_LIMIT_IPP		128	/* Limit IPP requests */
 
 #define IPP_ANY_OPERATION	(ipp_op_t)0
 					/* Any IPP operation */
@@ -116,7 +116,7 @@ typedef struct cupsd_client_s cupsd_client_t;
 
 VAR cups_array_t	*Locations	VALUE(NULL);
 					/* Authorization locations */
-VAR int			DefaultAuthType	VALUE(CUPSD_AUTH_BASIC);
+VAR int			DefaultAuthType	VALUE(AUTH_BASIC);
 					/* Default AuthType, if not specified */
 #ifdef HAVE_SSL
 VAR http_encryption_t	DefaultEncryption VALUE(HTTP_ENCRYPT_REQUIRED);
@@ -131,9 +131,8 @@ VAR http_encryption_t	DefaultEncryption VALUE(HTTP_ENCRYPT_REQUIRED);
 extern cupsd_location_t	*cupsdAddLocation(const char *location);
 extern void		cupsdAddName(cupsd_location_t *loc, char *name);
 extern void		cupsdAllowHost(cupsd_location_t *loc, char *name);
-extern void		cupsdAllowIP(cupsd_location_t *loc, 
-				     const unsigned address[4],
-			             const unsigned netmask[4]);
+extern void		cupsdAllowIP(cupsd_location_t *loc, unsigned address[4],
+			             unsigned netmask[4]);
 extern void		cupsdAuthorize(cupsd_client_t *con);
 extern int		cupsdCheckAuth(unsigned ip[4], char *name, int namelen,
 				       int num_masks, cupsd_authmask_t *masks);
@@ -144,9 +143,8 @@ extern cupsd_location_t	*cupsdCopyLocation(cupsd_location_t **loc);
 extern void		cupsdDeleteAllLocations(void);
 extern void		cupsdDeleteLocation(cupsd_location_t *loc);
 extern void		cupsdDenyHost(cupsd_location_t *loc, char *name);
-extern void		cupsdDenyIP(cupsd_location_t *loc, 
-				    const unsigned address[4],
-			            const unsigned netmask[4]);
+extern void		cupsdDenyIP(cupsd_location_t *loc, unsigned address[4],
+			            unsigned netmask[4]);
 extern cupsd_location_t	*cupsdFindBest(const char *path, http_state_t state);
 extern cupsd_location_t	*cupsdFindLocation(const char *location);
 extern http_status_t	cupsdIsAuthorized(cupsd_client_t *con, const char *owner);

scheduler/banners.c

@@ -3,7 +3,7 @@
  *
  *   Banner routines for the Common UNIX Printing System (CUPS).
  *
- *   Copyright 2007-2008 by Apple Inc.
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2006 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -147,8 +147,8 @@ add_banner(const char *name,		/* I - Name of banner */
   if ((filetype = mimeFileType(MimeDatabase, filename, NULL, NULL)) == NULL)
   {
     cupsdLogMessage(CUPSD_LOG_WARN,
-                    "add_banner: Banner \"%s\" (\"%s\") is of an unknown file "
-		    "type - skipping!", name, filename);
+                    "add_banner: Banner \"%s\" (\"%s\") is of an unknown file type - skipping!",
+                    name, filename);
     return;
   }
 
@@ -156,27 +156,13 @@ add_banner(const char *name,		/* I - Name of banner */
   * Allocate memory...
   */
 
-  if ((temp = calloc(1, sizeof(cupsd_banner_t))) == NULL)
-  {
-    cupsdLogMessage(CUPSD_LOG_WARN,
-                    "add_banner: Unable to allocate memory for banner \"%s\" - "
-		    "skipping!", name);
-    return;
-  }
+  temp = calloc(1, sizeof(cupsd_banner_t));
 
  /*
   * Copy the new banner data over...
   */
 
-  if ((temp->name = strdup(name)) == NULL)
-  {
-    cupsdLogMessage(CUPSD_LOG_WARN,
-                    "add_banner: Unable to allocate memory for banner \"%s\" - "
-		    "skipping!", name);
-    free(temp);
-    return;
-  }
-
+  temp->name     = strdup(name);
   temp->filetype = filetype;
 
   cupsArrayAdd(Banners, temp);

scheduler/cert.c

@@ -4,7 +4,7 @@
  *   Authentication certificate routines for the Common UNIX
  *   Printing System (CUPS).
  *
- *   Copyright 2007-2008 by Apple Inc.
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2006 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -42,8 +42,7 @@
 
 void
 cupsdAddCert(int        pid,		/* I - Process ID */
-             const char *username,	/* I - Username */
-             void       *ccache)	/* I - Kerberos credentials or NULL */
+             const char *username)	/* I - Username */
 {
   int		i;			/* Looping var */
   cupsd_cert_t	*cert;			/* Current certificate */
@@ -244,16 +243,6 @@ cupsdAddCert(int        pid,		/* I - Process ID */
   write(fd, cert->certificate, strlen(cert->certificate));
   close(fd);
 
- /*
-  * Add Kerberos credentials as needed...
-  */
-
-#ifdef HAVE_GSSAPI
-  cert->ccache = (krb5_ccache)ccache;
-#else
-  (void)ccache;
-#endif /* HAVE_GSSAPI */
-
  /*
   * Insert the certificate at the front of the list...
   */
@@ -293,15 +282,6 @@ cupsdDeleteCert(int pid)		/* I - Process ID */
       else
         prev->next = cert->next;
 
-#ifdef HAVE_GSSAPI
-     /*
-      * Release Kerberos credentials as needed...
-      */
-
-      if (cert->ccache)
-	krb5_cc_destroy(KerberosContext, cert->ccache);
-#endif /* HAVE_GSSAPI */
-
       free(cert);
 
      /*
@@ -432,7 +412,7 @@ cupsdInitCerts(void)
   */
 
   if (!RunUser)
-    cupsdAddCert(0, "root", NULL);
+    cupsdAddCert(0, "root");
 }
 
 

scheduler/cert.h

@@ -4,7 +4,7 @@
  *   Authentication certificate definitions for the Common UNIX
  *   Printing System (CUPS).
  *
- *   Copyright 2007-2008 by Apple Inc.
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2005 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -24,9 +24,6 @@ typedef struct cupsd_cert_s
   int		pid;			/* Process ID (0 for root certificate) */
   char		certificate[33];	/* 32 hex characters, or 128 bits */
   char		username[33];		/* Authenticated username */
-#ifdef HAVE_GSSAPI
-  krb5_ccache	ccache;			/* Kerberos credential cache */
-#endif /* HAVE_GSSAPI */
 } cupsd_cert_t;
 
 
@@ -34,18 +31,15 @@ typedef struct cupsd_cert_s
  * Globals...
  */
 
-VAR cupsd_cert_t	*Certs		/* List of certificates */
-				VALUE(NULL);
-VAR time_t		RootCertTime	/* Root certificate update time */
-				VALUE(0);
+VAR cupsd_cert_t	*Certs;		/* List of certificates */
+VAR time_t		RootCertTime;	/* Root certificate update time */
 
 
 /*
  * Prototypes...
  */
 
-extern void		cupsdAddCert(int pid, const char *username,
-			             void *ccache);
+extern void		cupsdAddCert(int pid, const char *username);
 extern void		cupsdDeleteCert(int pid);
 extern void		cupsdDeleteAllCerts(void);
 extern const char	*cupsdFindCert(const char *certificate);

scheduler/classes.c

@@ -393,7 +393,7 @@ cupsdLoadAllClasses(void)
       {
         cupsdLogMessage(CUPSD_LOG_ERROR,
 	                "Syntax error on line %d of classes.conf.", linenum);
-        break;
+        return;
       }
     }
     else if (!strcasecmp(line, "</Class>"))
@@ -407,14 +407,14 @@ cupsdLoadAllClasses(void)
       {
         cupsdLogMessage(CUPSD_LOG_ERROR,
 	                "Syntax error on line %d of classes.conf.", linenum);
-        break;
+        return;
       }
     }
     else if (!p)
     {
       cupsdLogMessage(CUPSD_LOG_ERROR,
                       "Syntax error on line %d of classes.conf.", linenum);
-      break;
+      return;
     }
     else if (!strcasecmp(line, "AuthInfoRequired"))
     {
@@ -458,7 +458,7 @@ cupsdLoadAllClasses(void)
       {
 	cupsdLogMessage(CUPSD_LOG_ERROR,
 	                "Syntax error on line %d of classes.conf.", linenum);
-	break;
+	return;
       }
       else if ((temp = cupsdFindPrinter(value)) == NULL)
       {
@@ -504,7 +504,7 @@ cupsdLoadAllClasses(void)
 	cupsdLogMessage(CUPSD_LOG_ERROR,
 	                "Syntax error on line %d of classes.conf.",
 	                linenum);
-	break;
+	return;
       }
     }
     else if (!strcasecmp(line, "StateMessage"))
@@ -546,7 +546,7 @@ cupsdLoadAllClasses(void)
 	cupsdLogMessage(CUPSD_LOG_ERROR,
 	                "Syntax error on line %d of classes.conf.",
 	                linenum);
-	break;
+	return;
       }
     }
     else if (!strcasecmp(line, "Shared"))
@@ -568,9 +568,9 @@ cupsdLoadAllClasses(void)
       else
       {
 	cupsdLogMessage(CUPSD_LOG_ERROR,
-	                "Syntax error on line %d of classes.conf.",
+	                "Syntax error on line %d of printers.conf.",
 	                linenum);
-	break;
+	return;
       }
     }
     else if (!strcasecmp(line, "JobSheets"))
@@ -609,7 +609,7 @@ cupsdLoadAllClasses(void)
       {
 	cupsdLogMessage(CUPSD_LOG_ERROR,
 	                "Syntax error on line %d of classes.conf.", linenum);
-	break;
+	return;
       }
     }
     else if (!strcasecmp(line, "AllowUser"))
@@ -623,7 +623,7 @@ cupsdLoadAllClasses(void)
       {
 	cupsdLogMessage(CUPSD_LOG_ERROR,
 	                "Syntax error on line %d of classes.conf.", linenum);
-	break;
+	return;
       }
     }
     else if (!strcasecmp(line, "DenyUser"))
@@ -637,7 +637,7 @@ cupsdLoadAllClasses(void)
       {
 	cupsdLogMessage(CUPSD_LOG_ERROR,
 	                "Syntax error on line %d of classes.conf.", linenum);
-	break;
+	return;
       }
     }
     else if (!strcasecmp(line, "QuotaPeriod"))
@@ -648,7 +648,7 @@ cupsdLoadAllClasses(void)
       {
 	cupsdLogMessage(CUPSD_LOG_ERROR,
 	                "Syntax error on line %d of classes.conf.", linenum);
-	break;
+	return;
       }
     }
     else if (!strcasecmp(line, "PageLimit"))
@@ -659,7 +659,7 @@ cupsdLoadAllClasses(void)
       {
 	cupsdLogMessage(CUPSD_LOG_ERROR,
 	                "Syntax error on line %d of classes.conf.", linenum);
-	break;
+	return;
       }
     }
     else if (!strcasecmp(line, "KLimit"))
@@ -670,7 +670,7 @@ cupsdLoadAllClasses(void)
       {
 	cupsdLogMessage(CUPSD_LOG_ERROR,
 	                "Syntax error on line %d of classes.conf.", linenum);
-	break;
+	return;
       }
     }
     else if (!strcasecmp(line, "OpPolicy"))
@@ -694,7 +694,7 @@ cupsdLoadAllClasses(void)
       {
 	cupsdLogMessage(CUPSD_LOG_ERROR,
 	                "Syntax error on line %d of classes.conf.", linenum);
-	break;
+	return;
       }
     }
     else if (!strcasecmp(line, "ErrorPolicy"))
@@ -705,7 +705,7 @@ cupsdLoadAllClasses(void)
       {
 	cupsdLogMessage(CUPSD_LOG_ERROR,
 	                "Syntax error on line %d of classes.conf.", linenum);
-	break;
+	return;
       }
     }
     else

scheduler/client.c

@@ -3,7 +3,7 @@
  *
  *   Client routines for the Common UNIX Printing System (CUPS) scheduler.
  *
- *   Copyright 2007-2008 by Apple Inc.
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2007 by Easy Software Products, all rights reserved.
  *
  *   This file contains Kerberos support code, copyright 2006 by
@@ -144,19 +144,9 @@ cupsdAcceptClient(cupsd_listener_t *lis)/* I - Listener socket */
     Clients = cupsArrayNew(NULL, NULL);
 
   if (!Clients)
-  {
-    cupsdLogMessage(CUPSD_LOG_ERROR,
-                    "Unable to allocate memory for client array!");
-    cupsdPauseListening();
     return;
-  }
 
-  if ((con = calloc(1, sizeof(cupsd_client_t))) == NULL)
-  {
-    cupsdLogMessage(CUPSD_LOG_ERROR, "Unable to allocate memory for client!");
-    cupsdPauseListening();
-    return;
-  }
+  con = calloc(1, sizeof(cupsd_client_t));
 
   con->http.activity = time(NULL);
   con->file          = -1;
@@ -853,7 +843,7 @@ cupsdReadClient(cupsd_client_t *con)	/* I - Client to read from */
 	      cupsdLogMessage(CUPSD_LOG_ERROR,
 	                      "Bad request line \"%s\" from %s!", line,
 	                      con->http.hostname);
-	      cupsdSendError(con, HTTP_BAD_REQUEST, CUPSD_AUTH_NONE);
+	      cupsdSendError(con, HTTP_BAD_REQUEST, AUTH_NONE);
 	      cupsdCloseClient(con);
 	      return;
 	  case 2 :
@@ -865,7 +855,7 @@ cupsdReadClient(cupsd_client_t *con)	/* I - Client to read from */
 		cupsdLogMessage(CUPSD_LOG_ERROR,
 		                "Bad request line \"%s\" from %s!", line,
 	                        con->http.hostname);
-		cupsdSendError(con, HTTP_BAD_REQUEST, CUPSD_AUTH_NONE);
+		cupsdSendError(con, HTTP_BAD_REQUEST, AUTH_NONE);
 		cupsdCloseClient(con);
 		return;
 	      }
@@ -880,7 +870,7 @@ cupsdReadClient(cupsd_client_t *con)	/* I - Client to read from */
 	      }
 	      else
 	      {
-	        cupsdSendError(con, HTTP_NOT_SUPPORTED, CUPSD_AUTH_NONE);
+	        cupsdSendError(con, HTTP_NOT_SUPPORTED, AUTH_NONE);
 		cupsdCloseClient(con);
 		return;
 	      }
@@ -926,7 +916,7 @@ cupsdReadClient(cupsd_client_t *con)	/* I - Client to read from */
 
 	    cupsdLogMessage(CUPSD_LOG_ERROR, "Bad URI \"%s\" in request!",
 	                    con->uri);
-	    cupsdSendError(con, HTTP_METHOD_NOT_ALLOWED, CUPSD_AUTH_NONE);
+	    cupsdSendError(con, HTTP_METHOD_NOT_ALLOWED, AUTH_NONE);
 	    cupsdCloseClient(con);
 	    return;
 	  }
@@ -960,7 +950,7 @@ cupsdReadClient(cupsd_client_t *con)	/* I - Client to read from */
 	else
 	{
 	  cupsdLogMessage(CUPSD_LOG_ERROR, "Bad operation \"%s\"!", operation);
-	  cupsdSendError(con, HTTP_BAD_REQUEST, CUPSD_AUTH_NONE);
+	  cupsdSendError(con, HTTP_BAD_REQUEST, AUTH_NONE);
 	  cupsdCloseClient(con);
 	  return;
 	}
@@ -992,7 +982,7 @@ cupsdReadClient(cupsd_client_t *con)	/* I - Client to read from */
 
 	if (status != HTTP_OK && status != HTTP_CONTINUE)
 	{
-	  cupsdSendError(con, HTTP_BAD_REQUEST, CUPSD_AUTH_NONE);
+	  cupsdSendError(con, HTTP_BAD_REQUEST, AUTH_NONE);
 	  cupsdCloseClient(con);
 	  return;
 	}
@@ -1060,7 +1050,7 @@ cupsdReadClient(cupsd_client_t *con)	/* I - Client to read from */
       * HTTP/1.1 and higher require the "Host:" field...
       */
 
-      if (!cupsdSendError(con, HTTP_BAD_REQUEST, CUPSD_AUTH_NONE))
+      if (!cupsdSendError(con, HTTP_BAD_REQUEST, AUTH_NONE))
       {
 	cupsdCloseClient(con);
 	return;
@@ -1072,9 +1062,9 @@ cupsdReadClient(cupsd_client_t *con)	/* I - Client to read from */
       * Do OPTIONS command...
       */
 
-      if (con->best && con->best->type != CUPSD_AUTH_NONE)
+      if (con->best && con->best->type != AUTH_NONE)
       {
-	if (!cupsdSendHeader(con, HTTP_UNAUTHORIZED, NULL, CUPSD_AUTH_NONE))
+	if (!cupsdSendHeader(con, HTTP_UNAUTHORIZED, NULL, AUTH_NONE))
 	{
 	  cupsdCloseClient(con);
 	  return;
@@ -1089,7 +1079,7 @@ cupsdReadClient(cupsd_client_t *con)	/* I - Client to read from */
         * Do encryption stuff...
 	*/
 
-	if (!cupsdSendHeader(con, HTTP_SWITCHING_PROTOCOLS, NULL, CUPSD_AUTH_NONE))
+	if (!cupsdSendHeader(con, HTTP_SWITCHING_PROTOCOLS, NULL, AUTH_NONE))
 	{
 	  cupsdCloseClient(con);
 	  return;
@@ -1112,7 +1102,7 @@ cupsdReadClient(cupsd_client_t *con)	/* I - Client to read from */
 	  return;
 	}
 #else
-	if (!cupsdSendError(con, HTTP_NOT_IMPLEMENTED, CUPSD_AUTH_NONE))
+	if (!cupsdSendError(con, HTTP_NOT_IMPLEMENTED, AUTH_NONE))
 	{
 	  cupsdCloseClient(con);
 	  return;
@@ -1120,7 +1110,7 @@ cupsdReadClient(cupsd_client_t *con)	/* I - Client to read from */
 #endif /* HAVE_SSL */
       }
 
-      if (!cupsdSendHeader(con, HTTP_OK, NULL, CUPSD_AUTH_NONE))
+      if (!cupsdSendHeader(con, HTTP_OK, NULL, AUTH_NONE))
       {
 	cupsdCloseClient(con);
 	return;
@@ -1142,7 +1132,7 @@ cupsdReadClient(cupsd_client_t *con)	/* I - Client to read from */
       * Protect against malicious users!
       */
 
-      if (!cupsdSendError(con, HTTP_FORBIDDEN, CUPSD_AUTH_NONE))
+      if (!cupsdSendError(con, HTTP_FORBIDDEN, AUTH_NONE))
       {
 	cupsdCloseClient(con);
 	return;
@@ -1158,7 +1148,7 @@ cupsdReadClient(cupsd_client_t *con)	/* I - Client to read from */
         * Do encryption stuff...
 	*/
 
-	if (!cupsdSendHeader(con, HTTP_SWITCHING_PROTOCOLS, NULL, CUPSD_AUTH_NONE))
+	if (!cupsdSendHeader(con, HTTP_SWITCHING_PROTOCOLS, NULL, AUTH_NONE))
 	{
 	  cupsdCloseClient(con);
 	  return;
@@ -1181,7 +1171,7 @@ cupsdReadClient(cupsd_client_t *con)	/* I - Client to read from */
 	  return;
 	}
 #else
-	if (!cupsdSendError(con, HTTP_NOT_IMPLEMENTED, CUPSD_AUTH_NONE))
+	if (!cupsdSendError(con, HTTP_NOT_IMPLEMENTED, AUTH_NONE))
 	{
 	  cupsdCloseClient(con);
 	  return;
@@ -1194,7 +1184,7 @@ cupsdReadClient(cupsd_client_t *con)	/* I - Client to read from */
         cupsdLogMessage(CUPSD_LOG_DEBUG2,
 	                "cupsdReadClient: Unauthorized request for %s...\n",
 	                con->uri);
-	cupsdSendError(con, status, CUPSD_AUTH_NONE);
+	cupsdSendError(con, status, AUTH_NONE);
 	cupsdCloseClient(con);
 	return;
       }
@@ -1208,7 +1198,7 @@ cupsdReadClient(cupsd_client_t *con)	/* I - Client to read from */
 	  * Send 100-continue header...
 	  */
 
-	  if (!cupsdSendHeader(con, HTTP_CONTINUE, NULL, CUPSD_AUTH_NONE))
+	  if (!cupsdSendHeader(con, HTTP_CONTINUE, NULL, AUTH_NONE))
 	  {
 	    cupsdCloseClient(con);
 	    return;
@@ -1220,7 +1210,7 @@ cupsdReadClient(cupsd_client_t *con)	/* I - Client to read from */
 	  * Send 417-expectation-failed header...
 	  */
 
-	  if (!cupsdSendHeader(con, HTTP_EXPECTATION_FAILED, NULL, CUPSD_AUTH_NONE))
+	  if (!cupsdSendHeader(con, HTTP_EXPECTATION_FAILED, NULL, AUTH_NONE))
 	  {
 	    cupsdCloseClient(con);
 	    return;
@@ -1254,7 +1244,7 @@ cupsdReadClient(cupsd_client_t *con)	/* I - Client to read from */
 		snprintf(con->uri, sizeof(con->uri), "/ppd/%s.ppd", p->name);
 	      else
 	      {
-		if (!cupsdSendError(con, HTTP_NOT_FOUND, CUPSD_AUTH_NONE))
+		if (!cupsdSendError(con, HTTP_NOT_FOUND, AUTH_NONE))
 		{
 		  cupsdCloseClient(con);
 		  return;
@@ -1326,7 +1316,7 @@ cupsdReadClient(cupsd_client_t *con)	/* I - Client to read from */
 
               if (!cupsdSendCommand(con, con->command, con->options, 0))
 	      {
-		if (!cupsdSendError(con, HTTP_NOT_FOUND, CUPSD_AUTH_NONE))
+		if (!cupsdSendError(con, HTTP_NOT_FOUND, AUTH_NONE))
 		{
 		  cupsdCloseClient(con);
 		  return;
@@ -1350,7 +1340,7 @@ cupsdReadClient(cupsd_client_t *con)	/* I - Client to read from */
 	      * /admin/conf...
 	      */
 
-	      if (!cupsdSendError(con, HTTP_FORBIDDEN, CUPSD_AUTH_NONE))
+	      if (!cupsdSendError(con, HTTP_FORBIDDEN, AUTH_NONE))
 	      {
 		cupsdCloseClient(con);
 		return;
@@ -1367,7 +1357,7 @@ cupsdReadClient(cupsd_client_t *con)	/* I - Client to read from */
               if ((filename = get_file(con, &filestats, buf,
 	                               sizeof(buf))) == NULL)
 	      {
-		if (!cupsdSendError(con, HTTP_NOT_FOUND, CUPSD_AUTH_NONE))
+		if (!cupsdSendError(con, HTTP_NOT_FOUND, AUTH_NONE))
 		{
 		  cupsdCloseClient(con);
 		  return;
@@ -1387,7 +1377,7 @@ cupsdReadClient(cupsd_client_t *con)	/* I - Client to read from */
 
         	if (!cupsdSendCommand(con, con->command, con->options, 0))
 		{
-		  if (!cupsdSendError(con, HTTP_NOT_FOUND, CUPSD_AUTH_NONE))
+		  if (!cupsdSendError(con, HTTP_NOT_FOUND, AUTH_NONE))
 		  {
 		    cupsdCloseClient(con);
 		    return;
@@ -1403,7 +1393,7 @@ cupsdReadClient(cupsd_client_t *con)	/* I - Client to read from */
 
 	      if (!check_if_modified(con, &filestats))
               {
-        	if (!cupsdSendError(con, HTTP_NOT_MODIFIED, CUPSD_AUTH_NONE))
+        	if (!cupsdSendError(con, HTTP_NOT_MODIFIED, AUTH_NONE))
 		{
 		  cupsdCloseClient(con);
 		  return;
@@ -1443,7 +1433,7 @@ cupsdReadClient(cupsd_client_t *con)	/* I - Client to read from */
 	      * Request too large...
 	      */
 
-              if (!cupsdSendError(con, HTTP_REQUEST_TOO_LARGE, CUPSD_AUTH_NONE))
+              if (!cupsdSendError(con, HTTP_REQUEST_TOO_LARGE, AUTH_NONE))
 	      {
 		cupsdCloseClient(con);
 		return;
@@ -1457,7 +1447,7 @@ cupsdReadClient(cupsd_client_t *con)	/* I - Client to read from */
 	      * Negative content lengths are invalid!
 	      */
 
-              if (!cupsdSendError(con, HTTP_BAD_REQUEST, CUPSD_AUTH_NONE))
+              if (!cupsdSendError(con, HTTP_BAD_REQUEST, AUTH_NONE))
 	      {
 		cupsdCloseClient(con);
 		return;
@@ -1552,7 +1542,7 @@ cupsdReadClient(cupsd_client_t *con)	/* I - Client to read from */
               if ((filename = get_file(con, &filestats, buf,
 	                               sizeof(buf))) == NULL)
 	      {
-		if (!cupsdSendError(con, HTTP_NOT_FOUND, CUPSD_AUTH_NONE))
+		if (!cupsdSendError(con, HTTP_NOT_FOUND, AUTH_NONE))
 		{
 		  cupsdCloseClient(con);
 		  return;
@@ -1569,7 +1559,7 @@ cupsdReadClient(cupsd_client_t *con)	/* I - Client to read from */
 	        * Only POST to CGI's...
 		*/
 
-		if (!cupsdSendError(con, HTTP_UNAUTHORIZED, CUPSD_AUTH_NONE))
+		if (!cupsdSendError(con, HTTP_UNAUTHORIZED, AUTH_NONE))
 		{
 		  cupsdCloseClient(con);
 		  return;
@@ -1592,7 +1582,7 @@ cupsdReadClient(cupsd_client_t *con)	/* I - Client to read from */
 	      * /admin/conf...
 	      */
 
-	      if (!cupsdSendError(con, HTTP_FORBIDDEN, CUPSD_AUTH_NONE))
+	      if (!cupsdSendError(con, HTTP_FORBIDDEN, AUTH_NONE))
 	      {
 		cupsdCloseClient(con);
 		return;
@@ -1618,7 +1608,7 @@ cupsdReadClient(cupsd_client_t *con)	/* I - Client to read from */
 	      * Request too large...
 	      */
 
-              if (!cupsdSendError(con, HTTP_REQUEST_TOO_LARGE, CUPSD_AUTH_NONE))
+              if (!cupsdSendError(con, HTTP_REQUEST_TOO_LARGE, AUTH_NONE))
 	      {
 		cupsdCloseClient(con);
 		return;
@@ -1632,7 +1622,7 @@ cupsdReadClient(cupsd_client_t *con)	/* I - Client to read from */
 	      * Negative content lengths are invalid!
 	      */
 
-              if (!cupsdSendError(con, HTTP_BAD_REQUEST, CUPSD_AUTH_NONE))
+              if (!cupsdSendError(con, HTTP_BAD_REQUEST, AUTH_NONE))
 	      {
 		cupsdCloseClient(con);
 		return;
@@ -1649,23 +1639,19 @@ cupsdReadClient(cupsd_client_t *con)	/* I - Client to read from */
 	                    request_id ++);
 	    con->file = open(con->filename, O_WRONLY | O_CREAT | O_TRUNC, 0640);
 
+            cupsdLogMessage(CUPSD_LOG_DEBUG2,
+	                    "cupsdReadClient: %d REQUEST %s=%d", con->http.fd,
+	                    con->filename, con->file);
+
 	    if (con->file < 0)
 	    {
-	      cupsdLogMessage(CUPSD_LOG_ERROR,
-	                      "Unable to create request file %s: %s",
-	                      con->filename, strerror(errno));
-
-	      if (!cupsdSendError(con, HTTP_REQUEST_TOO_LARGE, CUPSD_AUTH_NONE))
+	      if (!cupsdSendError(con, HTTP_REQUEST_TOO_LARGE, AUTH_NONE))
 	      {
 		cupsdCloseClient(con);
 		return;
 	      }
 	    }
 
-            cupsdLogMessage(CUPSD_LOG_DEBUG2,
-	                    "cupsdReadClient: %d REQUEST %s=%d", con->http.fd,
-	                    con->filename, con->file);
-
 	    fchmod(con->file, 0640);
 	    fchown(con->file, RunUser, Group);
 	    fcntl(con->file, F_SETFD, fcntl(con->file, F_GETFD) | FD_CLOEXEC);
@@ -1673,7 +1659,7 @@ cupsdReadClient(cupsd_client_t *con)	/* I - Client to read from */
 
 	case HTTP_DELETE :
 	case HTTP_TRACE :
-            cupsdSendError(con, HTTP_NOT_IMPLEMENTED, CUPSD_AUTH_NONE);
+            cupsdSendError(con, HTTP_NOT_IMPLEMENTED, AUTH_NONE);
 	    cupsdCloseClient(con);
 	    return;
 
@@ -1692,7 +1678,7 @@ cupsdReadClient(cupsd_client_t *con)	/* I - Client to read from */
 		snprintf(con->uri, sizeof(con->uri), "/ppd/%s.ppd", p->name);
 	      else
 	      {
-		if (!cupsdSendError(con, HTTP_NOT_FOUND, CUPSD_AUTH_NONE))
+		if (!cupsdSendError(con, HTTP_NOT_FOUND, AUTH_NONE))
 		{
 		  cupsdCloseClient(con);
 		  return;
@@ -1714,7 +1700,7 @@ cupsdReadClient(cupsd_client_t *con)	/* I - Client to read from */
 	      * CGI output...
 	      */
 
-              if (!cupsdSendHeader(con, HTTP_OK, "text/html", CUPSD_AUTH_NONE))
+              if (!cupsdSendHeader(con, HTTP_OK, "text/html", AUTH_NONE))
 	      {
 		cupsdCloseClient(con);
 		return;
@@ -1746,7 +1732,7 @@ cupsdReadClient(cupsd_client_t *con)	/* I - Client to read from */
 	      * /admin/conf...
 	      */
 
-	      if (!cupsdSendError(con, HTTP_FORBIDDEN, CUPSD_AUTH_NONE))
+	      if (!cupsdSendError(con, HTTP_FORBIDDEN, AUTH_NONE))
 	      {
 		cupsdCloseClient(con);
 		return;
@@ -1757,7 +1743,7 @@ cupsdReadClient(cupsd_client_t *con)	/* I - Client to read from */
 	    else if ((filename = get_file(con, &filestats, buf,
 	                                  sizeof(buf))) == NULL)
 	    {
-	      if (!cupsdSendHeader(con, HTTP_NOT_FOUND, "text/html", CUPSD_AUTH_NONE))
+	      if (!cupsdSendHeader(con, HTTP_NOT_FOUND, "text/html", AUTH_NONE))
 	      {
 		cupsdCloseClient(con);
 		return;
@@ -1767,7 +1753,7 @@ cupsdReadClient(cupsd_client_t *con)	/* I - Client to read from */
 	    }
 	    else if (!check_if_modified(con, &filestats))
             {
-              if (!cupsdSendError(con, HTTP_NOT_MODIFIED, CUPSD_AUTH_NONE))
+              if (!cupsdSendError(con, HTTP_NOT_MODIFIED, AUTH_NONE))
 	      {
 		cupsdCloseClient(con);
 		return;
@@ -1787,7 +1773,7 @@ cupsdReadClient(cupsd_client_t *con)	/* I - Client to read from */
 	      else
 		snprintf(line, sizeof(line), "%s/%s", type->super, type->type);
 
-              if (!cupsdSendHeader(con, HTTP_OK, line, CUPSD_AUTH_NONE))
+              if (!cupsdSendHeader(con, HTTP_OK, line, AUTH_NONE))
 	      {
 		cupsdCloseClient(con);
 		return;
@@ -1876,7 +1862,7 @@ cupsdReadClient(cupsd_client_t *con)	/* I - Client to read from */
 	      unlink(con->filename);
 	      cupsdClearString(&con->filename);
 
-              if (!cupsdSendError(con, HTTP_REQUEST_TOO_LARGE, CUPSD_AUTH_NONE))
+              if (!cupsdSendError(con, HTTP_REQUEST_TOO_LARGE, AUTH_NONE))
 	      {
 		cupsdCloseClient(con);
 		return;
@@ -1916,7 +1902,7 @@ cupsdReadClient(cupsd_client_t *con)	/* I - Client to read from */
 	    unlink(con->filename);
 	    cupsdClearString(&con->filename);
 
-            if (!cupsdSendError(con, HTTP_REQUEST_TOO_LARGE, CUPSD_AUTH_NONE))
+            if (!cupsdSendError(con, HTTP_REQUEST_TOO_LARGE, AUTH_NONE))
 	    {
 	      cupsdCloseClient(con);
 	      return;
@@ -1933,7 +1919,7 @@ cupsdReadClient(cupsd_client_t *con)	/* I - Client to read from */
 	  * Return the status to the client...
 	  */
 
-          if (!cupsdSendError(con, status, CUPSD_AUTH_NONE))
+          if (!cupsdSendError(con, status, AUTH_NONE))
 	  {
 	    cupsdCloseClient(con);
 	    return;
@@ -1964,7 +1950,7 @@ cupsdReadClient(cupsd_client_t *con)	/* I - Client to read from */
 	                      "cupsdReadClient: %d IPP Read Error!",
 			      con->http.fd);
 
-	      cupsdSendError(con, HTTP_BAD_REQUEST, CUPSD_AUTH_NONE);
+	      cupsdSendError(con, HTTP_BAD_REQUEST, AUTH_NONE);
 	      cupsdCloseClient(con);
 	      return;
 	    }
@@ -1972,7 +1958,7 @@ cupsdReadClient(cupsd_client_t *con)	/* I - Client to read from */
 	    {
               if (con->http.state == HTTP_POST_SEND)
 	      {
-		cupsdSendError(con, HTTP_BAD_REQUEST, CUPSD_AUTH_NONE);
+		cupsdSendError(con, HTTP_BAD_REQUEST, AUTH_NONE);
 		cupsdCloseClient(con);
 		return;
 	      }
@@ -1992,22 +1978,18 @@ cupsdReadClient(cupsd_client_t *con)	/* I - Client to read from */
             cupsdSetStringf(&con->filename, "%s/%08x", RequestRoot, request_id ++);
 	    con->file = open(con->filename, O_WRONLY | O_CREAT | O_TRUNC, 0640);
 
+            cupsdLogMessage(CUPSD_LOG_DEBUG2, "cupsdReadClient: %d REQUEST %s=%d", con->http.fd,
+	                    con->filename, con->file);
+
 	    if (con->file < 0)
 	    {
-	      cupsdLogMessage(CUPSD_LOG_ERROR,
-	                      "Unable to create request file %s: %s",
-	                      con->filename, strerror(errno));
-
-	      if (!cupsdSendError(con, HTTP_REQUEST_TOO_LARGE, CUPSD_AUTH_NONE))
+	      if (!cupsdSendError(con, HTTP_REQUEST_TOO_LARGE, AUTH_NONE))
 	      {
 		cupsdCloseClient(con);
 		return;
 	      }
 	    }
 
-            cupsdLogMessage(CUPSD_LOG_DEBUG2, "cupsdReadClient: %d REQUEST %s=%d", con->http.fd,
-	                    con->filename, con->file);
-
 	    fchmod(con->file, 0640);
 	    fchown(con->file, RunUser, Group);
             fcntl(con->file, F_SETFD, fcntl(con->file, F_GETFD) | FD_CLOEXEC);
@@ -2043,7 +2025,7 @@ cupsdReadClient(cupsd_client_t *con)	/* I - Client to read from */
 		unlink(con->filename);
 		cupsdClearString(&con->filename);
 
-        	if (!cupsdSendError(con, HTTP_REQUEST_TOO_LARGE, CUPSD_AUTH_NONE))
+        	if (!cupsdSendError(con, HTTP_REQUEST_TOO_LARGE, AUTH_NONE))
 		{
 		  cupsdCloseClient(con);
 		  return;
@@ -2099,7 +2081,7 @@ cupsdReadClient(cupsd_client_t *con)	/* I - Client to read from */
 		con->request = NULL;
               }
 
-              if (!cupsdSendError(con, HTTP_REQUEST_TOO_LARGE, CUPSD_AUTH_NONE))
+              if (!cupsdSendError(con, HTTP_REQUEST_TOO_LARGE, AUTH_NONE))
 	      {
 		cupsdCloseClient(con);
 		return;
@@ -2110,7 +2092,7 @@ cupsdReadClient(cupsd_client_t *con)	/* I - Client to read from */
 	    {
 	      if (!cupsdSendCommand(con, con->command, con->options, 0))
 	      {
-		if (!cupsdSendError(con, HTTP_NOT_FOUND, CUPSD_AUTH_NONE))
+		if (!cupsdSendError(con, HTTP_NOT_FOUND, AUTH_NONE))
 		{
 		  cupsdCloseClient(con);
 		  return;
@@ -2250,7 +2232,7 @@ cupsdSendError(cupsd_client_t *con,	/* I - Connection */
   * never disable it in that case.
   */
 
-  if (code >= HTTP_BAD_REQUEST && con->http.auth_type != CUPSD_AUTH_NEGOTIATE)
+  if (code >= HTTP_BAD_REQUEST && con->http.auth_type != AUTH_NEGOTIATE)
     con->http.keep_alive = HTTP_KEEPALIVE_OFF;
 
  /*
@@ -2369,11 +2351,7 @@ cupsdSendHeader(
     char           *type,		/* I - MIME type of document */
     int            auth_type)		/* I - Type of authentication */
 {
-  char		auth_str[1024];		/* Authorization string */
-#ifdef HAVE_GSSAPI
-  static char	*gss_buf = NULL;	/* Kerberos auth data buffer */
-  static int	gss_bufsize = 0;	/* Size of Kerberos auth data buffer */
-#endif /* HAVE_GSSAPI */
+  char	auth_str[1024];			/* Authorization string */
 
 
  /*
@@ -2416,9 +2394,9 @@ cupsdSendHeader(
 
   if (code == HTTP_UNAUTHORIZED)
   {
-    if (auth_type == CUPSD_AUTH_NONE)
+    if (auth_type == AUTH_NONE)
     {
-      if (!con->best || con->best->type <= CUPSD_AUTH_NONE)
+      if (!con->best || con->best->type <= AUTH_NONE)
 	auth_type = DefaultAuthType;
       else
 	auth_type = con->best->type;
@@ -2426,18 +2404,18 @@ cupsdSendHeader(
 
     auth_str[0] = '\0';
 
-    if (auth_type == CUPSD_AUTH_BASIC || auth_type == CUPSD_AUTH_BASICDIGEST)
+    if (auth_type == AUTH_BASIC || auth_type == AUTH_BASICDIGEST)
       strlcpy(auth_str, "Basic realm=\"CUPS\"", sizeof(auth_str));
-    else if (auth_type == CUPSD_AUTH_DIGEST)
+    else if (auth_type == AUTH_DIGEST)
       snprintf(auth_str, sizeof(auth_str), "Digest realm=\"CUPS\", nonce=\"%s\"",
 	       con->http.hostname);
 #ifdef HAVE_GSSAPI
-    else if (auth_type == CUPSD_AUTH_NEGOTIATE && con->gss_output_token.length == 0)
+    else if (auth_type == AUTH_NEGOTIATE && con->gss_output_token.length == 0)
       strlcpy(auth_str, "Negotiate", sizeof(auth_str));
 #endif /* HAVE_GSSAPI */
 
 #ifdef HAVE_AUTHORIZATION_H
-    if (con->best && auth_type != CUPSD_AUTH_NEGOTIATE)
+    if (con->best && auth_type != AUTH_NEGOTIATE)
     {
       int 	 i;			/* Looping var */
       char	*auth_key;		/* Auth key buffer */
@@ -2482,57 +2460,23 @@ cupsdSendHeader(
   * non-401 replies...
   */
 
-  if (con->gss_output_token.length > 0 && con->gss_output_token.length <= 65536)
+  if (con->gss_output_token.length > 0)
   {
+    char	buf[2048];		/* Output token buffer */
     OM_uint32	minor_status;		/* Minor status code */
-    int		bufsize;		/* Size of output token buffer */
 
 
-    bufsize = con->gss_output_token.length * 4 / 3 + 2;
-
-    if (bufsize > gss_bufsize)
-    {
-      char	*buf;			/* New buffer */
-
-
-      bufsize = (bufsize + 1023) & 1023;/* Round up */
-
-      if (gss_buf)
-        buf = realloc(gss_buf, bufsize);
-      else
-        buf = malloc(bufsize);
-
-      if (!buf)
-      {
-	cupsdLogMessage(CUPSD_LOG_ERROR,
-			"Unable to allocate %d bytes for Kerberos credentials!",
-			bufsize);
-	return (0);
-      }
-
-      gss_buf     = buf;
-      gss_bufsize = bufsize;
-    }
-
-    httpEncode64_2(gss_buf, gss_bufsize,
-		   con->gss_output_token.value,
+    httpEncode64_2(buf, sizeof(buf),
+    	           con->gss_output_token.value,
 		   con->gss_output_token.length);
     gss_release_buffer(&minor_status, &con->gss_output_token);
 
     cupsdLogMessage(CUPSD_LOG_DEBUG,
-		    "cupsdSendHeader: WWW-Authenticate: Negotiate %s", gss_buf);
+                    "cupsdSendHeader: WWW-Authenticate: Negotiate %s", buf);
 
-    if (httpPrintf(HTTP(con), "WWW-Authenticate: Negotiate %s\r\n",
-                   gss_buf) < 0)
+    if (httpPrintf(HTTP(con), "WWW-Authenticate: Negotiate %s\r\n", buf) < 0)
       return (0);
   }
-  else if (con->gss_output_token.length > 65536)
-  {
-    cupsdLogMessage(CUPSD_LOG_ERROR,
-                    "Kerberos credentials larger than 64k (%d)!",
-		    (int)con->gss_output_token.length);
-    return (0);
-  }
 #endif /* HAVE_GSSAPI */
 
   if (con->language && strcmp(con->language->language, "C"))
@@ -2675,7 +2619,7 @@ cupsdWriteClient(cupsd_client_t *con)	/* I - Client connection */
 
             if (!strncasecmp(buf, "Location:", 9))
 	    {
-  	      cupsdSendHeader(con, HTTP_SEE_OTHER, NULL, CUPSD_AUTH_NONE);
+  	      cupsdSendHeader(con, HTTP_SEE_OTHER, NULL, AUTH_NONE);
 	      con->sent_header = 2;
 
 	      if (httpPrintf(HTTP(con), "Content-Length: 0\r\n") < 0)
@@ -2683,12 +2627,12 @@ cupsdWriteClient(cupsd_client_t *con)	/* I - Client connection */
 	    }
 	    else if (!strncasecmp(buf, "Status:", 7))
 	    {
-  	      cupsdSendError(con, (http_status_t)atoi(buf + 7), CUPSD_AUTH_NONE);
+  	      cupsdSendError(con, (http_status_t)atoi(buf + 7), AUTH_NONE);
 	      con->sent_header = 2;
 	    }
 	    else
 	    {
-  	      cupsdSendHeader(con, HTTP_OK, NULL, CUPSD_AUTH_NONE);
+  	      cupsdSendHeader(con, HTTP_OK, NULL, AUTH_NONE);
 	      con->sent_header = 1;
 
 	      if (con->http.version == HTTP_1_1)
@@ -4276,7 +4220,7 @@ pipe_command(cupsd_client_t *con,	/* I - Client connection */
   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 */
@@ -4292,10 +4236,6 @@ pipe_command(cupsd_client_t *con,	/* I - Client connection */
 		server_name[1024],	/* SERVER_NAME environment variable */
 		server_port[1024];	/* SERVER_PORT environment variable */
   ipp_attribute_t *attr;		/* attributes-natural-language attribute */
-#ifdef HAVE_GSSAPI
-  krb5_ccache	ccache = NULL;		/* Kerberos credentials */
-  char		krb5ccname[1024];	/* KRB5CCNAME environment variable */
-#endif /* HAVE_GSSAPI */
 
 
  /*
@@ -4422,7 +4362,7 @@ pipe_command(cupsd_client_t *con,	/* I - Client connection */
 
   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)
@@ -4515,120 +4455,6 @@ pipe_command(cupsd_client_t *con,	/* I - Client connection */
     snprintf(remote_user, sizeof(remote_user), "REMOTE_USER=%s", con->username);
 
     envp[envc ++] = remote_user;
-
-   /*
-    * Save Kerberos credentials, if any...
-    */
-
-#ifdef HAVE_GSSAPI
-    if (con->gss_have_creds)
-    {
-#  if !defined(HAVE_KRB5_CC_NEW_UNIQUE) && !defined(HAVE_HEIMDAL)
-      cupsdLogMessage(CUPSD_LOG_INFO,
-		      "Sorry, your version of Kerberos does not support "
-		      "delegated credentials!");
-
-#  else
-      krb5_error_code	error;		/* Kerberos error code */
-      OM_uint32		major_status,	/* Major status code */
-			minor_status;	/* Minor status code */
-      krb5_principal	principal;	/* Kerberos principal */
-
-
-#   ifdef __APPLE__
-     /*
-      * If the weak-linked GSSAPI/Kerberos library is not present, don't try
-      * to use it...
-      */
-
-      if (krb5_init_context != NULL)
-      {
-#    endif /* __APPLE__ */
-
-     /*
-      * We MUST create a file-based cache because memory-based caches are
-      * only valid for the current process/address space.
-      *
-      * Due to various bugs/features in different versions of Kerberos, we
-      * need either the krb5_cc_new_unique() function or Heimdal's version
-      * of krb5_cc_gen_new() to create a new FILE: credential cache that
-      * can be passed to the backend.  These functions create a temporary
-      * file (typically in /tmp) containing the cached credentials, which
-      * are removed when we have successfully printed a job.
-      */
-
-#    ifdef HAVE_KRB5_CC_NEW_UNIQUE
-      if ((error = krb5_cc_new_unique(KerberosContext, "FILE", NULL,
-				      &ccache)) != 0)
-#    else /* HAVE_HEIMDAL */
-      if ((error = krb5_cc_gen_new(KerberosContext, &krb5_fcc_ops,
-				   &ccache)) != 0)
-#    endif /* HAVE_KRB5_CC_NEW_UNIQUE */
-      {
-	cupsdLogMessage(CUPSD_LOG_ERROR,
-			"Unable to create new credentials cache (%d/%s)",
-			error, strerror(errno));
-	ccache = NULL;
-      }
-      else if ((error = krb5_parse_name(KerberosContext, con->username,
-				        &principal)) != 0)
-      {
-	cupsdLogMessage(CUPSD_LOG_ERROR,
-			"Unable to parse kerberos username (%d/%s)", error,
-			strerror(errno));
-	krb5_cc_destroy(KerberosContext, ccache);
-	ccache = NULL;
-      }
-      else if ((error = krb5_cc_initialize(KerberosContext, ccache,
-                                           principal)))
-      {
-	cupsdLogMessage(CUPSD_LOG_ERROR,
-			"Unable to initialize credentials cache (%d/%s)", error,
-			strerror(errno));
-	krb5_cc_destroy(KerberosContext, ccache);
-	krb5_free_principal(KerberosContext, principal);
-	ccache = NULL;
-      }
-      else
-      {
-	krb5_free_principal(KerberosContext, principal);
-
-       /*
-	* Copy the user's credentials to the new cache file...
-	*/
-
-	major_status = gss_krb5_copy_ccache(&minor_status,
-	                                    con->gss_delegated_cred, ccache);
-
-	if (GSS_ERROR(major_status))
-	{
-	  cupsdLogGSSMessage(CUPSD_LOG_ERROR, major_status, minor_status,
-			     "Unable to import client credentials cache");
-	  krb5_cc_destroy(KerberosContext, ccache);
-	  ccache = NULL;
-	}
-	else
-	{
-	 /*
-	  * Add the KRB5CCNAME environment variable to the job so that the
-	  * backend can use the credentials when printing.
-	  */
-
-	  snprintf(krb5ccname, sizeof(krb5ccname), "KRB5CCNAME=FILE:%s",
-		   krb5_cc_get_name(KerberosContext, ccache));
-          envp[envc++] = krb5ccname;
-
-	  if (!RunUser)
-	    chown(krb5_cc_get_name(KerberosContext, ccache), User, Group);
-        }
-     }
-#    ifdef __APPLE__
-     }
-#    endif /* __APPLE__ */
-#  endif /* HAVE_KRB5_CC_NEW_UNIQUE || HAVE_HEIMDAL */
-    }
-#endif /* HAVE_GSSAPI */
-
   }
 
   if (con->http.version == HTTP_1_1)
@@ -4742,11 +4568,7 @@ pipe_command(cupsd_client_t *con,	/* I - Client connection */
     */
 
     if (con->username[0])
-#ifdef HAVE_GSSAPI
-      cupsdAddCert(pid, con->username, ccache);
-#else
-      cupsdAddCert(pid, con->username, NULL);
-#endif /* HAVE_GSSAPI */
+      cupsdAddCert(pid, con->username);
 
     cupsdLogMessage(CUPSD_LOG_DEBUG, "[CGI] %s started - PID = %d",
                     command, pid);
@@ -4782,7 +4604,7 @@ write_file(cupsd_client_t *con,		/* I - Client connection */
 
   con->pipe_pid = 0;
 
-  if (!cupsdSendHeader(con, code, type, CUPSD_AUTH_NONE))
+  if (!cupsdSendHeader(con, code, type, AUTH_NONE))
     return (0);
 
   if (httpPrintf(HTTP(con), "Last-Modified: %s\r\n",

scheduler/conf.c

@@ -3,7 +3,7 @@
  *
  *   Configuration routines for the Common UNIX Printing System (CUPS).
  *
- *   Copyright 2007-2008 by Apple Inc.
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2007 by Easy Software Products, all rights reserved.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -72,7 +72,7 @@ typedef struct
  * Local globals...
  */
 
-static const cupsd_var_t	variables[] =
+static cupsd_var_t	variables[] =
 {
   { "AccessLog",		&AccessLog,		CUPSD_VARTYPE_STRING },
 #ifdef __APPLE__
@@ -173,11 +173,11 @@ static const cupsd_var_t	variables[] =
 #define NUM_VARS	(sizeof(variables) / sizeof(variables[0]))
 
 
-static const unsigned	ones[4] =
+static unsigned		ones[4] =
 			{
 			  0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff
 			};
-static const unsigned	zeros[4] =
+static unsigned		zeros[4] =
 			{
 			  0x00000000, 0x00000000, 0x00000000, 0x00000000
 			};
@@ -384,7 +384,7 @@ cupsdReadConfiguration(void)
   if (NumRelays > 0)
   {
     for (i = 0; i < NumRelays; i ++)
-      if (Relays[i].from.type == CUPSD_AUTH_NAME)
+      if (Relays[i].from.type == AUTH_NAME)
 	free(Relays[i].from.mask.name.name);
 
     free(Relays);
@@ -508,7 +508,7 @@ cupsdReadConfiguration(void)
   */
 
   ConfigFilePerm        = CUPS_DEFAULT_CONFIG_FILE_PERM;
-  DefaultAuthType       = CUPSD_AUTH_BASIC;
+  DefaultAuthType       = AUTH_BASIC;
 #ifdef HAVE_SSL
   DefaultEncryption     = HTTP_ENCRYPT_REQUIRED;
 #endif /* HAVE_SSL */
@@ -962,8 +962,8 @@ cupsdReadConfiguration(void)
       cupsdLogMessage(CUPSD_LOG_INFO, "Order Deny,Allow");
 
       po = cupsdAddPolicyOp(p, NULL, IPP_SEND_DOCUMENT);
-      po->order_type = CUPSD_AUTH_ALLOW;
-      po->level      = CUPSD_AUTH_USER;
+      po->order_type = AUTH_ALLOW;
+      po->level      = AUTH_USER;
 
       cupsdAddName(po, "@OWNER");
       cupsdAddName(po, "@SYSTEM");
@@ -1003,9 +1003,9 @@ cupsdReadConfiguration(void)
       cupsdLogMessage(CUPSD_LOG_INFO, "AuthType Default");
 
       po = cupsdAddPolicyOp(p, NULL, IPP_PAUSE_PRINTER);
-      po->order_type = CUPSD_AUTH_ALLOW;
-      po->type       = CUPSD_AUTH_DEFAULT;
-      po->level      = CUPSD_AUTH_USER;
+      po->order_type = AUTH_ALLOW;
+      po->type       = AUTH_DEFAULT;
+      po->level      = AUTH_USER;
 
       cupsdAddName(po, "@SYSTEM");
       cupsdLogMessage(CUPSD_LOG_INFO, "Require user @SYSTEM");
@@ -1038,7 +1038,7 @@ cupsdReadConfiguration(void)
       cupsdLogMessage(CUPSD_LOG_INFO, "Order Deny,Allow");
 
       po = cupsdAddPolicyOp(p, NULL, IPP_ANY_OPERATION);
-      po->order_type = CUPSD_AUTH_ALLOW;
+      po->order_type = AUTH_ALLOW;
 
       cupsdLogMessage(CUPSD_LOG_INFO, "</Limit>");
       cupsdLogMessage(CUPSD_LOG_INFO, "</Policy>");
@@ -1119,28 +1119,20 @@ cupsdReadConfiguration(void)
     if (!mimeType(MimeDatabase, "application", "octet-stream"))
       NumMimeTypes ++;
 
-    if ((MimeTypes = calloc(NumMimeTypes, sizeof(const char *))) == NULL)
-    {
-      cupsdLogMessage(CUPSD_LOG_ERROR,
-                      "Unable to allocate memory for %d MIME types!",
-		      NumMimeTypes);
-      NumMimeTypes = 0;
-    }
-    else
-    {
-      for (i = 0, type = mimeFirstType(MimeDatabase);
-	   type;
-	   i ++, type = mimeNextType(MimeDatabase))
-      {
-	snprintf(mimetype, sizeof(mimetype), "%s/%s", type->super, type->type);
+    MimeTypes = calloc(NumMimeTypes, sizeof(const char *));
 
-	MimeTypes[i] = _cupsStrAlloc(mimetype);
-      }
+    for (i = 0, type = mimeFirstType(MimeDatabase);
+         type;
+	 i ++, type = mimeNextType(MimeDatabase))
+    {
+      snprintf(mimetype, sizeof(mimetype), "%s/%s", type->super, type->type);
 
-      if (i < NumMimeTypes)
-	MimeTypes[i] = _cupsStrAlloc("application/octet-stream");
+      MimeTypes[i] = _cupsStrAlloc(mimetype);
     }
 
+    if (i < NumMimeTypes)
+      MimeTypes[i] = _cupsStrAlloc("application/octet-stream");
+
     if (LogLevel == CUPSD_LOG_DEBUG2)
     {
       mime_filter_t	*filter;	/* Current filter */
@@ -1576,9 +1568,9 @@ parse_aaa(cupsd_location_t *loc,	/* I - Location */
     */
 
     if (!strncasecmp(value, "deny", 4))
-      loc->order_type = CUPSD_AUTH_ALLOW;
+      loc->order_type = AUTH_ALLOW;
     else if (!strncasecmp(value, "allow", 5))
-      loc->order_type = CUPSD_AUTH_DENY;
+      loc->order_type = AUTH_DENY;
     else
     {
       cupsdLogMessage(CUPSD_LOG_ERROR, "Unknown Order value %s on line %d.",
@@ -1689,44 +1681,44 @@ parse_aaa(cupsd_location_t *loc,	/* I - Location */
 
     if (!strcasecmp(value, "none"))
     {
-      loc->type  = CUPSD_AUTH_NONE;
-      loc->level = CUPSD_AUTH_ANON;
+      loc->type  = AUTH_NONE;
+      loc->level = AUTH_ANON;
     }
     else if (!strcasecmp(value, "basic"))
     {
-      loc->type = CUPSD_AUTH_BASIC;
+      loc->type = AUTH_BASIC;
 
-      if (loc->level == CUPSD_AUTH_ANON)
-	loc->level = CUPSD_AUTH_USER;
+      if (loc->level == AUTH_ANON)
+	loc->level = AUTH_USER;
     }
     else if (!strcasecmp(value, "digest"))
     {
-      loc->type = CUPSD_AUTH_DIGEST;
+      loc->type = AUTH_DIGEST;
 
-      if (loc->level == CUPSD_AUTH_ANON)
-	loc->level = CUPSD_AUTH_USER;
+      if (loc->level == AUTH_ANON)
+	loc->level = AUTH_USER;
     }
     else if (!strcasecmp(value, "basicdigest"))
     {
-      loc->type = CUPSD_AUTH_BASICDIGEST;
+      loc->type = AUTH_BASICDIGEST;
 
-      if (loc->level == CUPSD_AUTH_ANON)
-	loc->level = CUPSD_AUTH_USER;
+      if (loc->level == AUTH_ANON)
+	loc->level = AUTH_USER;
     }
     else if (!strcasecmp(value, "default"))
     {
-      loc->type = CUPSD_AUTH_DEFAULT;
+      loc->type = AUTH_DEFAULT;
 
-      if (loc->level == CUPSD_AUTH_ANON)
-	loc->level = CUPSD_AUTH_USER;
+      if (loc->level == AUTH_ANON)
+	loc->level = AUTH_USER;
     }
 #ifdef HAVE_GSSAPI
     else if (!strcasecmp(value, "negotiate"))
     {
-      loc->type = CUPSD_AUTH_NEGOTIATE;
+      loc->type = AUTH_NEGOTIATE;
 
-      if (loc->level == CUPSD_AUTH_ANON)
-	loc->level = CUPSD_AUTH_USER;
+      if (loc->level == AUTH_ANON)
+	loc->level = AUTH_USER;
     }
 #endif /* HAVE_GSSAPI */
     else
@@ -1745,8 +1737,8 @@ parse_aaa(cupsd_location_t *loc,	/* I - Location */
 
     if (!strcasecmp(value, "anonymous"))
     {
-      loc->type  = CUPSD_AUTH_NONE;
-      loc->level = CUPSD_AUTH_ANON;
+      loc->type  = AUTH_NONE;
+      loc->level = AUTH_ANON;
 
       cupsdLogMessage(CUPSD_LOG_WARN,
                       "\"AuthClass %s\" is deprecated; consider removing "
@@ -1755,7 +1747,7 @@ parse_aaa(cupsd_location_t *loc,	/* I - Location */
     }
     else if (!strcasecmp(value, "user"))
     {
-      loc->level = CUPSD_AUTH_USER;
+      loc->level = AUTH_USER;
 
       cupsdLogMessage(CUPSD_LOG_WARN,
                       "\"AuthClass %s\" is deprecated; consider using "
@@ -1764,7 +1756,7 @@ parse_aaa(cupsd_location_t *loc,	/* I - Location */
     }
     else if (!strcasecmp(value, "group"))
     {
-      loc->level = CUPSD_AUTH_GROUP;
+      loc->level = AUTH_GROUP;
 
       cupsdLogMessage(CUPSD_LOG_WARN,
                       "\"AuthClass %s\" is deprecated; consider using "
@@ -1773,7 +1765,7 @@ parse_aaa(cupsd_location_t *loc,	/* I - Location */
     }
     else if (!strcasecmp(value, "system"))
     {
-      loc->level = CUPSD_AUTH_GROUP;
+      loc->level = AUTH_GROUP;
 
       cupsdAddName(loc, "@SYSTEM");
 
@@ -1818,9 +1810,9 @@ parse_aaa(cupsd_location_t *loc,	/* I - Location */
 
     if (!strcasecmp(value, "valid-user") ||
         !strcasecmp(value, "user"))
-      loc->level = CUPSD_AUTH_USER;
+      loc->level = AUTH_USER;
     else if (!strcasecmp(value, "group"))
-      loc->level = CUPSD_AUTH_GROUP;
+      loc->level = AUTH_GROUP;
     else
     {
       cupsdLogMessage(CUPSD_LOG_WARN, "Unknown Require type %s on line %d.",
@@ -1881,9 +1873,9 @@ parse_aaa(cupsd_location_t *loc,	/* I - Location */
   else if (!strcasecmp(line, "Satisfy"))
   {
     if (!strcasecmp(value, "all"))
-      loc->satisfy = CUPSD_AUTH_SATISFY_ALL;
+      loc->satisfy = AUTH_SATISFY_ALL;
     else if (!strcasecmp(value, "any"))
-      loc->satisfy = CUPSD_AUTH_SATISFY_ANY;
+      loc->satisfy = AUTH_SATISFY_ANY;
     else
     {
       cupsdLogMessage(CUPSD_LOG_WARN, "Unknown Satisfy value %s on line %d.",
@@ -2062,7 +2054,7 @@ read_configuration(cups_file_t *fp)	/* I - File to read from */
 			*value,		/* Pointer to value */
 			*valueptr;	/* Pointer into value */
   int			valuelen;	/* Length of value */
-  cupsd_var_t const	*var;		/* Current variable */
+  cupsd_var_t		*var;		/* Current variable */
   http_addrlist_t	*addrlist,	/* Address list */
 			*addr;		/* Current address */
   unsigned		ip[4],		/* Address value */
@@ -2361,9 +2353,9 @@ read_configuration(cups_file_t *fp)	/* I - File to read from */
         cupsdLogMessage(CUPSD_LOG_ERROR,
 	                "Unable to initialize browse access control list!");
       else if (!strncasecmp(value, "deny", 4))
-        location->order_type = CUPSD_AUTH_ALLOW;
+        location->order_type = AUTH_ALLOW;
       else if (!strncasecmp(value, "allow", 5))
-        location->order_type = CUPSD_AUTH_DENY;
+        location->order_type = AUTH_DENY;
       else
         cupsdLogMessage(CUPSD_LOG_ERROR,
 	                "Unknown BrowseOrder value %s on line %d.",
@@ -2567,16 +2559,8 @@ read_configuration(cups_file_t *fp)	/* I - File to read from */
 	if ((ptr = strchr(temp, ' ')) != NULL)
 	  *ptr = '\0';
 
-        relay->from.type = CUPSD_AUTH_NAME;
-
-	if ((relay->from.mask.name.name = strdup(temp)) == NULL)
-	{
-	  cupsdLogMessage(CUPSD_LOG_ERROR,
-			  "Unable to allocate BrowseRelay name at line %d - %s.",
-			  linenum, strerror(errno));
-	  continue;
-	}
-
+        relay->from.type             = AUTH_NAME;
+	relay->from.mask.name.name   = strdup(temp);
 	relay->from.mask.name.length = strlen(temp);
       }
       else
@@ -2592,7 +2576,7 @@ read_configuration(cups_file_t *fp)	/* I - File to read from */
 	  break;
 	}
 
-        relay->from.type = CUPSD_AUTH_IP;
+        relay->from.type = AUTH_IP;
 	memcpy(relay->from.mask.ip.address, ip,
 	       sizeof(relay->from.mask.ip.address));
 	memcpy(relay->from.mask.ip.netmask, mask,
@@ -2642,7 +2626,7 @@ read_configuration(cups_file_t *fp)	/* I - File to read from */
   
 	  httpAddrString(&(relay->to), temp, sizeof(temp));
   
-	  if (relay->from.type == CUPSD_AUTH_IP)
+	  if (relay->from.type == AUTH_IP)
 	    snprintf(temp2, sizeof(temp2), "%u.%u.%u.%u/%u.%u.%u.%u",
 		     relay->from.mask.ip.address[0] >> 24,
 		     (relay->from.mask.ip.address[0] >> 16) & 255,
@@ -2668,7 +2652,7 @@ read_configuration(cups_file_t *fp)	/* I - File to read from */
       }
       else
       {
-        if (relay->from.type == CUPSD_AUTH_NAME)
+        if (relay->from.type == AUTH_NAME)
 	  free(relay->from.mask.name.name);
 
         cupsdLogMessage(CUPSD_LOG_ERROR, "Bad relay address %s at line %d.",
@@ -2744,16 +2728,16 @@ read_configuration(cups_file_t *fp)	/* I - File to read from */
       */
 
       if (!strcasecmp(value, "none"))
-	DefaultAuthType = CUPSD_AUTH_NONE;
+	DefaultAuthType = AUTH_NONE;
       else if (!strcasecmp(value, "basic"))
-	DefaultAuthType = CUPSD_AUTH_BASIC;
+	DefaultAuthType = AUTH_BASIC;
       else if (!strcasecmp(value, "digest"))
-	DefaultAuthType = CUPSD_AUTH_DIGEST;
+	DefaultAuthType = AUTH_DIGEST;
       else if (!strcasecmp(value, "basicdigest"))
-	DefaultAuthType = CUPSD_AUTH_BASICDIGEST;
+	DefaultAuthType = AUTH_BASICDIGEST;
 #ifdef HAVE_GSSAPI
       else if (!strcasecmp(value, "negotiate"))
-        DefaultAuthType = CUPSD_AUTH_NEGOTIATE;
+        DefaultAuthType = AUTH_NEGOTIATE;
 #endif /* HAVE_GSSAPI */
       else
       {
@@ -3141,7 +3125,7 @@ read_location(cups_file_t *fp,		/* I - Configuration file */
   if ((parent = cupsdAddLocation(location)) == NULL)
     return (0);
 
-  parent->limit = CUPSD_AUTH_LIMIT_ALL;
+  parent->limit = AUTH_LIMIT_ALL;
   loc           = parent;
 
   while (cupsFileGetConf(fp, line, sizeof(line), &value, &linenum))
@@ -3173,19 +3157,19 @@ read_location(cups_file_t *fp,		/* I - Configuration file */
 	  *valptr++ = '\0';
 
         if (!strcmp(value, "ALL"))
-	  loc->limit = CUPSD_AUTH_LIMIT_ALL;
+	  loc->limit = AUTH_LIMIT_ALL;
 	else if (!strcmp(value, "GET"))
-	  loc->limit |= CUPSD_AUTH_LIMIT_GET;
+	  loc->limit |= AUTH_LIMIT_GET;
 	else if (!strcmp(value, "HEAD"))
-	  loc->limit |= CUPSD_AUTH_LIMIT_HEAD;
+	  loc->limit |= AUTH_LIMIT_HEAD;
 	else if (!strcmp(value, "OPTIONS"))
-	  loc->limit |= CUPSD_AUTH_LIMIT_OPTIONS;
+	  loc->limit |= AUTH_LIMIT_OPTIONS;
 	else if (!strcmp(value, "POST"))
-	  loc->limit |= CUPSD_AUTH_LIMIT_POST;
+	  loc->limit |= AUTH_LIMIT_POST;
 	else if (!strcmp(value, "PUT"))
-	  loc->limit |= CUPSD_AUTH_LIMIT_PUT;
+	  loc->limit |= AUTH_LIMIT_PUT;
 	else if (!strcmp(value, "TRACE"))
-	  loc->limit |= CUPSD_AUTH_LIMIT_TRACE;
+	  loc->limit |= AUTH_LIMIT_TRACE;
 	else
 	  cupsdLogMessage(CUPSD_LOG_WARN, "Unknown request type %s on line %d!",
 	                  value, linenum);
@@ -3194,12 +3178,11 @@ read_location(cups_file_t *fp,		/* I - Configuration file */
       }
 
       if (!strcasecmp(line, "<LimitExcept"))
-        loc->limit = CUPSD_AUTH_LIMIT_ALL ^ loc->limit;
+        loc->limit = AUTH_LIMIT_ALL ^ loc->limit;
 
       parent->limit &= ~loc->limit;
     }
-    else if (!strcasecmp(line, "</Limit>") ||
-             !strcasecmp(line, "</LimitExcept>"))
+    else if (!strcasecmp(line, "</Limit>"))
       loc = parent;
     else if (!parse_aaa(loc, line, value, linenum))
     {

scheduler/conf.h

@@ -68,11 +68,9 @@ VAR char		*ConfigurationFile	VALUE(NULL),
 VAR int			ServerNameIsIP		VALUE(0);
 VAR int			NumSystemGroups		VALUE(0);
 					/* Number of system group names */
-VAR char		*SystemGroups[MAX_SYSTEM_GROUPS]
-						VALUE({0});
+VAR char		*SystemGroups[MAX_SYSTEM_GROUPS];
 					/* System group names */
-VAR gid_t		SystemGroupIDs[MAX_SYSTEM_GROUPS]
-						VALUE({0});
+VAR gid_t		SystemGroupIDs[MAX_SYSTEM_GROUPS];
 					/* System group IDs */
 VAR char		*AccessLog		VALUE(NULL),
 					/* Access log filename */
@@ -162,8 +160,7 @@ VAR int			ClassifyOverride	VALUE(0),
 					/* Timeout before reload from SIGHUP */
 			RootCertDuration	VALUE(300),
 					/* Root certificate update interval */
-			RunUser			VALUE(0),
-					/* User to run as, used for files */
+			RunUser,	/* User to run as, used for files */
 			PrintcapFormat		VALUE(PRINTCAP_BSD),
 					/* Format of printcap file? */
 			DefaultShared		VALUE(TRUE);

scheduler/cups-deviced.c

@@ -3,7 +3,7 @@
  *
  *   Device scanning mini-daemon for the Common UNIX Printing System (CUPS).
  *
- *   Copyright 2007-2008 by Apple Inc.
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2006 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -291,8 +291,6 @@ main(int  argc,				/* I - Number of command-line args */
 	  if (!dev)
 	  {
             cupsDirClose(dir);
-	    fclose(fp);
-            kill(pid, SIGTERM);
 	    return (1);
 	  }
 

scheduler/cups-driverd.c

@@ -7,7 +7,7 @@
  *   in CUPS_DATADIR/model and dynamically generated PPD files using
  *   the driver helper programs in CUPS_SERVERBIN/driver.
  *
- *   Copyright 2007-2008 by Apple Inc.
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2007 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -60,7 +60,7 @@ extern cups_encoding_t	_ppdGetEncoding(const char *name);
 #define PPD_TYPE_FAX		3	/* Facsimile/MFD PPD */
 #define PPD_TYPE_UNKNOWN	4	/* Other/hybrid PPD */
 
-static const char * const ppd_types[] =	/* ppd-type values */
+static const char *ppd_types[] =
 {
   "postscript",
   "pdf",
@@ -1664,7 +1664,6 @@ load_drivers(void)
           if (!ppd)
 	  {
             cupsDirClose(dir);
-	    pclose(fp);
 	    return (0);
 	  }
 

scheduler/cups-lpd.c

@@ -3,7 +3,7 @@
  *
  *   Line Printer Daemon interface for the Common UNIX Printing System (CUPS).
  *
- *   Copyright 2007-2008 by Apple Inc.
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2006 by Easy Software Products, all rights reserved.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -1274,9 +1274,9 @@ recv_print_job(
 	  if (status)
 	    break;
 	}
-      }
 
-      fclose(fp);
+	fclose(fp);
+      }
     }
   }
 

scheduler/cups-polld.c

@@ -144,7 +144,7 @@ main(int  argc,				/* I - Number of command-line args */
   * Loop forever, asking for available printers and classes...
   */
 
-  for (http = NULL; !ferror(stderr);)
+  for (http = NULL;;)
   {
    /*
     * Open a connection to the server...
@@ -180,8 +180,6 @@ main(int  argc,				/* I - Number of command-line args */
     if (remain > 0 && !restart_polling)
       sleep(remain);
   }
-
-  return (1);
 }
 
 

scheduler/cupsd.h

@@ -152,8 +152,7 @@ typedef void (*cupsd_selfunc_t)(void *data);
  * Globals...
  */
 
-VAR int			MaxFDs		VALUE(0);
-					/* Maximum number of files */
+VAR int			MaxFDs;		/* Maximum number of files */
 
 VAR time_t		ReloadTime	VALUE(0);
 					/* Time of reload request... */
@@ -161,8 +160,7 @@ VAR int			NeedReload	VALUE(RELOAD_ALL);
 					/* Need to load configuration? */
 
 #ifdef HAVE_GSSAPI
-VAR krb5_context	KerberosContext VALUE(NULL);
-					/* Kerberos context for credentials */
+VAR krb5_context	KerberosContext;/* Kerberos context for credentials */
 #endif /* HAVE_GSSAPI */
 
 #ifdef HAVE_LAUNCH_H

scheduler/cupsfilter.c

@@ -3,7 +3,7 @@
  *
  *   CUPS filtering program for the Common UNIX Printing System (CUPS).
  *
- *   Copyright 2007-2008 by Apple Inc.
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2006 by Easy Software Products, all rights reserved.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -131,7 +131,6 @@ main(int  argc,				/* I - Number of command-line args */
 
   mime         = NULL;
   srctype      = NULL;
-  compression  = 0;
   dsttype      = "application/pdf";
   infile       = NULL;
   outfile      = NULL;
@@ -457,8 +456,7 @@ escape_options(
   for (i = num_options, option = options, bytes = 1; i > 0; i --, option ++)
     bytes += 2 * (strlen(option->name) + strlen(option->value)) + 2;
 
-  if ((s = malloc(bytes)) == NULL)
-    return (NULL);
+  s = malloc(bytes);
 
  /*
   * Copy the options to the string...
@@ -808,8 +806,6 @@ exec_filters(cups_array_t  *filters,	/* I - Array of filters to run */
     }
   }
 
-  cupsArrayDelete(pids);
-
   return (retval);
 }
 

scheduler/dirsvc.c

@@ -3,7 +3,7 @@
  *
  *   Directory services routines for the Common UNIX Printing System (CUPS).
  *
- *   Copyright 2007-2008 by Apple Inc.
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2007 by Easy Software Products, all rights reserved.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -325,7 +325,7 @@ cupsdLoadRemoteCache(void)
       {
         cupsdLogMessage(CUPSD_LOG_ERROR,
 	                "Syntax error on line %d of remote.cache.", linenum);
-        break;
+        return;
       }
     }
     else if (!strcasecmp(line, "<Class") ||
@@ -366,7 +366,7 @@ cupsdLoadRemoteCache(void)
       {
         cupsdLogMessage(CUPSD_LOG_ERROR,
 	                "Syntax error on line %d of remote.cache.", linenum);
-        break;
+        return;
       }
     }
     else if (!strcasecmp(line, "</Printer>") ||
@@ -386,14 +386,14 @@ cupsdLoadRemoteCache(void)
       {
         cupsdLogMessage(CUPSD_LOG_ERROR,
 	                "Syntax error on line %d of remote.cache.", linenum);
-        break;
+        return;
       }
     }
     else if (!p)
     {
       cupsdLogMessage(CUPSD_LOG_ERROR,
                       "Syntax error on line %d of remote.cache.", linenum);
-      break;
+      return;
     }
     else if (!strcasecmp(line, "Info"))
     {
@@ -426,7 +426,7 @@ cupsdLoadRemoteCache(void)
       {
 	cupsdLogMessage(CUPSD_LOG_ERROR,
 	                "Syntax error on line %d of remote.cache.", linenum);
-	break;
+	return;
       }
     }
     else if (!strcasecmp(line, "Option") && value)
@@ -462,7 +462,7 @@ cupsdLoadRemoteCache(void)
       {
 	cupsdLogMessage(CUPSD_LOG_ERROR,
 	                "Syntax error on line %d of remote.cache.", linenum);
-	break;
+	return;
       }
     }
     else if (!strcasecmp(line, "StateMessage"))
@@ -494,7 +494,7 @@ cupsdLoadRemoteCache(void)
       {
 	cupsdLogMessage(CUPSD_LOG_ERROR,
 	                "Syntax error on line %d of remote.cache.", linenum);
-	break;
+	return;
       }
     }
     else if (!strcasecmp(line, "Type"))
@@ -505,7 +505,7 @@ cupsdLoadRemoteCache(void)
       {
 	cupsdLogMessage(CUPSD_LOG_ERROR,
 	                "Syntax error on line %d of remote.cache.", linenum);
-	break;
+	return;
       }
     }
     else if (!strcasecmp(line, "BrowseTime"))
@@ -521,7 +521,7 @@ cupsdLoadRemoteCache(void)
       {
 	cupsdLogMessage(CUPSD_LOG_ERROR,
 	                "Syntax error on line %d of remote.cache.", linenum);
-	break;
+	return;
       }
     }
     else if (!strcasecmp(line, "JobSheets"))
@@ -556,7 +556,7 @@ cupsdLoadRemoteCache(void)
       {
 	cupsdLogMessage(CUPSD_LOG_ERROR,
 	                "Syntax error on line %d of remote.cache.", linenum);
-	break;
+	return;
       }
     }
     else if (!strcasecmp(line, "AllowUser"))
@@ -570,7 +570,7 @@ cupsdLoadRemoteCache(void)
       {
 	cupsdLogMessage(CUPSD_LOG_ERROR,
 	                "Syntax error on line %d of remote.cache.", linenum);
-	break;
+	return;
       }
     }
     else if (!strcasecmp(line, "DenyUser"))
@@ -584,7 +584,7 @@ cupsdLoadRemoteCache(void)
       {
 	cupsdLogMessage(CUPSD_LOG_ERROR,
 	                "Syntax error on line %d of remote.cache.", linenum);
-	break;
+	return;
       }
     }
     else
@@ -1793,9 +1793,9 @@ process_browse_data(
     if (hptr && !*hptr)
       *hptr = '.';			/* Resource FQDN */
 
-    if ((p = cupsdFindDest(name)) == NULL && BrowseShortNames)
+    if ((p = cupsdFindClass(name)) == NULL && BrowseShortNames)
     {
-      if ((p = cupsdFindDest(resource + 9)) != NULL)
+      if ((p = cupsdFindClass(resource + 9)) != NULL)
       {
         if (p->hostname && strcasecmp(p->hostname, host))
 	{
@@ -1900,9 +1900,9 @@ process_browse_data(
     if (hptr && !*hptr)
       *hptr = '.';			/* Resource FQDN */
 
-    if ((p = cupsdFindDest(name)) == NULL && BrowseShortNames)
+    if ((p = cupsdFindPrinter(name)) == NULL && BrowseShortNames)
     {
-      if ((p = cupsdFindDest(resource + 10)) != NULL)
+      if ((p = cupsdFindPrinter(resource + 10)) != NULL)
       {
         if (p->hostname && strcasecmp(p->hostname, host))
 	{
@@ -3629,7 +3629,7 @@ update_cups_browse(void)
       * Access from localhost (127.0.0.1) is always allowed...
       */
 
-      auth = CUPSD_AUTH_ALLOW;
+      auth = AUTH_ALLOW;
     }
     else
     {
@@ -3640,39 +3640,39 @@ update_cups_browse(void)
       switch (BrowseACL->order_type)
       {
         default :
-	    auth = CUPSD_AUTH_DENY;	/* anti-compiler-warning-code */
+	    auth = AUTH_DENY;	/* anti-compiler-warning-code */
 	    break;
 
-	case CUPSD_AUTH_ALLOW : /* Order Deny,Allow */
-            auth = CUPSD_AUTH_ALLOW;
+	case AUTH_ALLOW : /* Order Deny,Allow */
+            auth = AUTH_ALLOW;
 
             if (cupsdCheckAuth(address, srcname, len,
 	        	  BrowseACL->num_deny, BrowseACL->deny))
-	      auth = CUPSD_AUTH_DENY;
+	      auth = AUTH_DENY;
 
             if (cupsdCheckAuth(address, srcname, len,
 	        	  BrowseACL->num_allow, BrowseACL->allow))
-	      auth = CUPSD_AUTH_ALLOW;
+	      auth = AUTH_ALLOW;
 	    break;
 
-	case CUPSD_AUTH_DENY : /* Order Allow,Deny */
-            auth = CUPSD_AUTH_DENY;
+	case AUTH_DENY : /* Order Allow,Deny */
+            auth = AUTH_DENY;
 
             if (cupsdCheckAuth(address, srcname, len,
 	        	  BrowseACL->num_allow, BrowseACL->allow))
-	      auth = CUPSD_AUTH_ALLOW;
+	      auth = AUTH_ALLOW;
 
             if (cupsdCheckAuth(address, srcname, len,
 	        	  BrowseACL->num_deny, BrowseACL->deny))
-	      auth = CUPSD_AUTH_DENY;
+	      auth = AUTH_DENY;
 	    break;
       }
     }
   }
   else
-    auth = CUPSD_AUTH_ALLOW;
+    auth = AUTH_ALLOW;
 
-  if (auth == CUPSD_AUTH_DENY)
+  if (auth == AUTH_DENY)
   {
     cupsdLogMessage(CUPSD_LOG_DEBUG,
                     "update_cups_browse: Refused %d bytes from %s", bytes,

scheduler/ipp.c

@@ -3,7 +3,7 @@
  *
  *   IPP routines for the Common UNIX Printing System (CUPS) scheduler.
  *
- *   Copyright 2007-2008 by Apple Inc.
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2007 by Easy Software Products, all rights reserved.
  *
  *   This file contains Kerberos support code, copyright 2006 by
@@ -658,7 +658,7 @@ cupsdProcessIPPRequest(
                     con->http.fd, con->response->request.status.status_code,
 	            ippErrorString(con->response->request.status.status_code));
 
-    if (cupsdSendHeader(con, HTTP_OK, "application/ipp", CUPSD_AUTH_NONE))
+    if (cupsdSendHeader(con, HTTP_OK, "application/ipp", AUTH_NONE))
     {
 #ifdef CUPSD_USE_CHUNKING
      /*
@@ -746,7 +746,7 @@ cupsdProcessIPPRequest(
  * 'cupsdTimeoutJob()' - Timeout a job waiting on job files.
  */
 
-int					/* O - 0 on success, -1 on error */
+void
 cupsdTimeoutJob(cupsd_job_t *job)	/* I - Job to timeout */
 {
   cupsd_printer_t	*printer;	/* Destination printer or class */
@@ -774,13 +774,10 @@ cupsdTimeoutJob(cupsd_job_t *job)	/* I - Job to timeout */
     cupsdLogMessage(CUPSD_LOG_INFO, "[Job %d] Adding end banner page \"%s\".",
                     job->id, attr->values[1].string.text);
 
-    if ((kbytes = copy_banner(NULL, job, attr->values[1].string.text)) < 0)
-      return (-1);
+    kbytes = copy_banner(NULL, job, attr->values[1].string.text);
 
     cupsdUpdateQuota(printer, job->username, 0, kbytes);
   }
-
-  return (0);
 }
 
 
@@ -1789,8 +1786,7 @@ add_job(cupsd_client_t  *con,		/* I - Client connection */
                       "[Job %d] Adding start banner page \"%s\".",
                       job->id, attr->values[0].string.text);
 
-      if ((kbytes = copy_banner(con, job, attr->values[0].string.text)) < 0)
-        return (NULL);
+      kbytes = copy_banner(con, job, attr->values[0].string.text);
 
       cupsdUpdateQuota(printer, job->username, 0, kbytes);
     }
@@ -2407,15 +2403,12 @@ add_printer(cupsd_client_t  *con,	/* I - Client connection */
 
     supported = ippFindAttribute(printer->attrs, "port-monitor-supported",
                                  IPP_TAG_NAME);
-    if (supported)
-    {
-      for (i = 0; i < supported->num_values; i ++)
-        if (!strcmp(supported->values[i].string.text,
-                    attr->values[0].string.text))
-          break;
-    }
+    for (i = 0; i < supported->num_values; i ++)
+      if (!strcmp(supported->values[i].string.text,
+                  attr->values[0].string.text))
+        break;
 
-    if (!supported || i >= supported->num_values)
+    if (i >= supported->num_values)
     {
       send_ipp_status(con, IPP_NOT_POSSIBLE, _("Bad port-monitor \"%s\"!"),
         	      attr->values[0].string.text);
@@ -3416,6 +3409,13 @@ check_quotas(cupsd_client_t  *con,	/* I - Client connection */
   cupsdLogMessage(CUPSD_LOG_DEBUG2, "check_quotas(%p[%d], %p[%s])",
                   con, con->http.fd, p, p->name);
 
+ /*
+  * Check input...
+  */
+
+  if (!con || !p)
+    return (0);
+
  /*
   * Figure out who is printing...
   */
@@ -3922,7 +3922,7 @@ copy_banner(cupsd_client_t *con,	/* I - Client connection */
   */
 
   if (add_file(con, job, banner->filetype, 0))
-    return (-1);
+    return (0);
 
   snprintf(filename, sizeof(filename), "%s/d%05d-%03d", RequestRoot, job->id,
            job->num_files);
@@ -4644,10 +4644,6 @@ copy_printer_attrs(
 		 printer->recoverable);
 #endif /* __APPLE__ */
 
-  if (!ra || cupsArrayFind(ra, "marker-change-time"))
-    ippAddInteger(con->response, IPP_TAG_PRINTER, IPP_TAG_INTEGER,
-                  "marker-change-time", printer->marker_time);
-
   if (printer->alert && (!ra || cupsArrayFind(ra, "printer-alert")))
     ippAddString(con->response, IPP_TAG_PRINTER, IPP_TAG_STRING,
                  "printer-alert", NULL, printer->alert);
@@ -7039,6 +7035,17 @@ move_job(cupsd_client_t  *con,		/* I - Client connection */
     return;
   }
 
+ /*
+  * Check policy...
+  */
+
+  if ((status = cupsdCheckPolicy(dprinter->op_policy_ptr, con,
+                                 NULL)) != HTTP_OK)
+  {
+    send_http_error(con, status, dprinter);
+    return;
+  }
+
  /*
   * See if we have a job URI or a printer URI...
   */
@@ -7146,17 +7153,6 @@ move_job(cupsd_client_t  *con,		/* I - Client connection */
     }
   }
 
- /*
-  * Check the policy of the destination printer...
-  */
-
-  if ((status = cupsdCheckPolicy(dprinter->op_policy_ptr, con,
-                                 job ? job->username : NULL)) != HTTP_OK)
-  {
-    send_http_error(con, status, dprinter);
-    return;
-  }
-
  /*
   * Now move the job or jobs...
   */
@@ -7545,8 +7541,7 @@ print_job(cupsd_client_t  *con,		/* I - Client connection */
   * See if we need to add the ending sheet...
   */
 
-  if (cupsdTimeoutJob(job))
-    return;
+  cupsdTimeoutJob(job);
 
  /*
   * Log and save the job...
@@ -8270,13 +8265,13 @@ save_auth_info(
       cupsFilePrintf(fp, "%s\n", line);
 
       if (!strcmp(dest->auth_info_required[i], "username"))
-        cupsdSetStringf(&job->auth_username, "CUPSD_AUTH_USERNAME=%s",
+        cupsdSetStringf(&job->auth_username, "AUTH_USERNAME=%s",
 	                auth_info->values[i].string.text);
       else if (!strcmp(dest->auth_info_required[i], "domain"))
-        cupsdSetStringf(&job->auth_domain, "CUPSD_AUTH_DOMAIN=%s",
+        cupsdSetStringf(&job->auth_domain, "AUTH_DOMAIN=%s",
 	                auth_info->values[i].string.text);
       else if (!strcmp(dest->auth_info_required[i], "password"))
-        cupsdSetStringf(&job->auth_password, "CUPSD_AUTH_PASSWORD=%s",
+        cupsdSetStringf(&job->auth_password, "AUTH_PASSWORD=%s",
 	                auth_info->values[i].string.text);
     }
   }
@@ -8289,7 +8284,7 @@ save_auth_info(
     httpEncode64_2(line, sizeof(line), con->username, strlen(con->username));
     cupsFilePrintf(fp, "%s\n", line);
 
-    cupsdSetStringf(&job->auth_username, "CUPSD_AUTH_USERNAME=%s", con->username);
+    cupsdSetStringf(&job->auth_username, "AUTH_USERNAME=%s", con->username);
     cupsdClearString(&job->auth_domain);
 
    /*
@@ -8299,7 +8294,7 @@ save_auth_info(
     httpEncode64_2(line, sizeof(line), con->password, strlen(con->password));
     cupsFilePrintf(fp, "%s\n", line);
 
-    cupsdSetStringf(&job->auth_password, "CUPSD_AUTH_PASSWORD=%s", con->password);
+    cupsdSetStringf(&job->auth_password, "AUTH_PASSWORD=%s", con->password);
   }
 
  /*
@@ -8750,8 +8745,7 @@ send_document(cupsd_client_t  *con,	/* I - Client connection */
     * See if we need to add the ending sheet...
     */
 
-    if (cupsdTimeoutJob(job))
-      return;
+    cupsdTimeoutJob(job);
 
     if (job->state_value == IPP_JOB_STOPPED)
     {
@@ -8836,7 +8830,7 @@ send_http_error(
   if (status == HTTP_UNAUTHORIZED &&
       printer && printer->num_auth_info_required > 0 &&
       !strcmp(printer->auth_info_required[0], "negotiate"))
-    cupsdSendError(con, status, CUPSD_AUTH_NEGOTIATE);
+    cupsdSendError(con, status, AUTH_NEGOTIATE);
   else if (printer)
   {
     char	resource[HTTP_MAX_URI];	/* Resource portion of URI */
@@ -8849,13 +8843,13 @@ send_http_error(
       snprintf(resource, sizeof(resource), "/printers/%s", printer->name);
 
     if ((auth = cupsdFindBest(resource, HTTP_POST)) == NULL ||
-        auth->type == CUPSD_AUTH_NONE)
+        auth->type == AUTH_NONE)
       auth = cupsdFindPolicyOp(printer->op_policy_ptr, IPP_PRINT_JOB);
 
-    cupsdSendError(con, status, auth ? auth->type : CUPSD_AUTH_NONE);
+    cupsdSendError(con, status, auth ? auth->type : AUTH_NONE);
   }
   else
-    cupsdSendError(con, status, CUPSD_AUTH_NONE);
+    cupsdSendError(con, status, AUTH_NONE);
 
   ippDelete(con->response);
   con->response = NULL;
@@ -9158,8 +9152,7 @@ set_job_attrs(cupsd_client_t  *con,	/* I - Client connection */
       else if (con->response->request.status.status_code == IPP_OK)
       {
         cupsdSetJobPriority(job, attr->values[0].integer);
-        event |= CUPSD_EVENT_JOB_CONFIG_CHANGED |
-	         CUPSD_EVENT_PRINTER_QUEUE_ORDER_CHANGED;
+        event |= CUPSD_EVENT_JOB_CONFIG_CHANGED;
       }
     }
     else if (!strcmp(attr->name, "job-state"))
@@ -9306,10 +9299,6 @@ set_job_attrs(cupsd_client_t  *con,	/* I - Client connection */
   * Send events as needed...
   */
 
-  if (event & CUPSD_EVENT_PRINTER_QUEUE_ORDER_CHANGED)
-    cupsdAddEvent(CUPSD_EVENT_PRINTER_QUEUE_ORDER_CHANGED, job->printer, job,
-                  "Job priority changed by user.");
-
   if (event & CUPSD_EVENT_JOB_STATE)
     cupsdAddEvent(CUPSD_EVENT_JOB_STATE, job->printer, job,
                   job->state_value == IPP_JOB_HELD ?
@@ -9816,8 +9805,6 @@ user_allowed(cupsd_printer_t *p,	/* I - Printer or class */
 {
   int		i;			/* Looping var */
   struct passwd	*pw;			/* User password data */
-  char		baseuser[256],		/* Base username */
-		*baseptr;		/* Pointer to "@" in base username */
 
 
   if (p->num_users == 0)
@@ -9826,20 +9813,6 @@ user_allowed(cupsd_printer_t *p,	/* I - Printer or class */
   if (!strcmp(username, "root"))
     return (1);
 
-  if (strchr(username, '@'))
-  {
-   /*
-    * Strip @REALM for username check...
-    */
-
-    strlcpy(baseuser, username, sizeof(baseuser));
-
-    if ((baseptr = strchr(baseuser, '@')) != NULL)
-      *baseptr = '\0';
-
-    username = baseuser;
-  }
-
   pw = getpwnam(username);
   endpwent();
 
@@ -10006,8 +9979,8 @@ validate_user(cupsd_job_t    *job,	/* I - Job */
   cupsdLogMessage(CUPSD_LOG_DEBUG2,
                   "validate_user(job=%d, con=%d, owner=\"%s\", username=%p, "
 		  "userlen=%d)",
-        	  job->id, con ? con->http.fd : 0,
-		  owner ? owner : "(null)", username, userlen);
+        	  job ? job->id : 0, con->http.fd, owner ? owner : "(null)",
+		  username, userlen);
 
  /*
   * Validate input...

scheduler/job.c

@@ -3,7 +3,7 @@
  *
  *   Job management routines for the Common UNIX Printing System (CUPS).
  *
- *   Copyright 2007-2008 by Apple Inc.
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2007 by Easy Software Products, all rights reserved.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -113,8 +113,7 @@ cupsdAddJob(int        priority,	/* I - Job priority */
   cupsd_job_t	*job;			/* New job record */
 
 
-  if ((job = calloc(sizeof(cupsd_job_t), 1)) == NULL)
-    return (NULL);
+  job = calloc(sizeof(cupsd_job_t), 1);
 
   job->id              = NextJobId ++;
   job->priority        = priority;
@@ -352,7 +351,6 @@ cupsdCheckJobs(void)
   cupsd_job_t		*job;		/* Current job in queue */
   cupsd_printer_t	*printer,	/* Printer destination */
 			*pclass;	/* Printer class destination */
-  ipp_attribute_t	*attr;		/* Job attribute */
 
 
   DEBUG_puts("cupsdCheckJobs()");
@@ -378,25 +376,10 @@ cupsdCheckJobs(void)
 	job->hold_until < time(NULL))
     {
       if (job->pending_timeout)
-      {
-       /* Add trailing banner as needed */
-        if (cupsdTimeoutJob(job))
-	  continue;
-      }
+        cupsdTimeoutJob(job);		/* Add trailing banner as needed */
 
       job->state->values[0].integer = IPP_JOB_PENDING;
       job->state_value              = IPP_JOB_PENDING;
-
-      if ((attr = ippFindAttribute(job->attrs, "job-hold-until",
-				   IPP_TAG_KEYWORD)) == NULL)
-	attr = ippFindAttribute(job->attrs, "job-hold-until", IPP_TAG_NAME);
-
-      if (attr)
-      {
-	attr->value_tag = IPP_TAG_KEYWORD;
-	cupsdSetString(&(attr->values[0].string.text), "no-hold");
-	cupsdSaveJob(job);
-      }
     }
 
    /*
@@ -456,6 +439,9 @@ cupsdCheckJobs(void)
 	  * so that we know which printer actually printed the job...
 	  */
 
+          ipp_attribute_t	*attr;	/* job-actual-printer-uri attribute */
+
+
           if ((attr = ippFindAttribute(job->attrs, "job-actual-printer-uri",
 	                               IPP_TAG_URI)) != NULL)
             cupsdSetString(&attr->values[0].string.text, printer->uri);
@@ -1826,7 +1812,6 @@ free_job(cupsd_job_t *job)		/* I - Job */
   cupsdClearString(&job->auth_username);
   cupsdClearString(&job->auth_domain);
   cupsdClearString(&job->auth_password);
-
 #ifdef HAVE_GSSAPI
  /*
   * Destroy the credential cache and clear the KRB5CCNAME env var string.
@@ -2460,7 +2445,7 @@ start_job(cupsd_job_t     *job,		/* I - Job ID */
 			title[IPP_MAX_NAME],
 					/* Job title string */
 			copies[255],	/* # copies string */
-			*envp[MAX_ENV + 16],
+			*envp[MAX_ENV + 15],
 					/* Environment variables */
 			charset[255],	/* CHARSET env variable */
 			class_name[255],/* CLASS env variable */
@@ -2473,10 +2458,6 @@ start_job(cupsd_job_t     *job,		/* I - Job ID */
 			final_content_type[1024],
 					/* FINAL_CONTENT_TYPE env variable */
 			lang[255],	/* LANG env variable */
-#ifdef __APPLE__
-			apple_language[255],
-					/* APPLE_LANGUAGE env variable */
-#endif /* __APPLE__ */
 			ppd[1024],	/* PPD env variable */
 			printer_name[255],
 					/* PRINTER env variable */
@@ -2533,7 +2514,7 @@ start_job(cupsd_job_t     *job,		/* I - Job ID */
                       "[Job %d] Unable to convert file %d to printable format!",
 	              job->current_file, job->id);
       cupsdLogMessage(CUPSD_LOG_INFO,
-                      "Hint: Do you have Ghostscript installed?");
+                      "Hint: Do you have ESP Ghostscript installed?");
 
       if (LogLevel < CUPSD_LOG_DEBUG)
         cupsdLogMessage(CUPSD_LOG_INFO,
@@ -2983,17 +2964,6 @@ start_job(cupsd_job_t     *job,		/* I - Job ID */
   else
     argv = calloc(8, sizeof(char *));
 
-  if (!argv)
-  {
-    cupsdLogMessage(CUPSD_LOG_ERROR, "Unable to allocate argument array!");
-    cupsArrayDelete(filters);
-
-    FilterLevel -= job->cost;
-
-    cupsdStopPrinter(printer, 0);
-    return;
-  }
-
   sprintf(jobid, "%d", job->id);
 
   argv[0] = printer->name;
@@ -3030,12 +3000,6 @@ start_job(cupsd_job_t     *job,		/* I - Job ID */
   attr = ippFindAttribute(job->attrs, "attributes-natural-language",
                           IPP_TAG_LANGUAGE);
 
-#ifdef __APPLE__
-  strcpy(apple_language, "APPLE_LANGUAGE");
-  _cupsAppleLanguage(attr->values[0].string.text,
-		     apple_language + 15, sizeof(apple_language) - 15);
-#endif /* __APPLE__ */
-
   switch (strlen(attr->values[0].string.text))
   {
     default :
@@ -3096,9 +3060,6 @@ start_job(cupsd_job_t     *job,		/* I - Job ID */
 
   envp[envc ++] = charset;
   envp[envc ++] = lang;
-#ifdef __APPLE__
-  envp[envc ++] = apple_language;
-#endif /* __APPLE__ */
   envp[envc ++] = ppd;
   envp[envc ++] = rip_max_cache;
   envp[envc ++] = content_type;
@@ -3153,8 +3114,8 @@ start_job(cupsd_job_t     *job,		/* I - Job ID */
   envp[envc] = NULL;
 
   for (i = 0; i < envc; i ++)
-    if (!strncmp(envp[i], "CUPSD_AUTH_", 5))
-      cupsdLogMessage(CUPSD_LOG_DEBUG, "[Job %d] envp[%d]=\"CUPSD_AUTH_%c****\"",
+    if (!strncmp(envp[i], "AUTH_", 5))
+      cupsdLogMessage(CUPSD_LOG_DEBUG, "[Job %d] envp[%d]=\"AUTH_%c****\"",
                       job->id, i, envp[i][5]);
     else if (strncmp(envp[i], "DEVICE_URI=", 11))
       cupsdLogMessage(CUPSD_LOG_DEBUG, "[Job %d] envp[%d]=\"%s\"",
@@ -3360,7 +3321,7 @@ start_job(cupsd_job_t     *job,		/* I - Job ID */
 
   if (strncmp(printer->device_uri, "file:", 5) != 0)
   {
-    if (job->current_file == 1 || printer->remote)
+    if (job->current_file == 1)
     {
       sscanf(printer->device_uri, "%254[^:]", method);
       snprintf(command, sizeof(command), "%s/backend/%s", ServerBin, method);
@@ -3577,7 +3538,7 @@ update_job(cupsd_job_t *job)		/* I - Job to check */
       * job sheet count...
       */
 
-      if (job->sheets)
+      if (job->sheets != NULL)
       {
         if (!strncasecmp(message, "total ", 6))
 	{
@@ -3622,9 +3583,8 @@ update_job(cupsd_job_t *job)		/* I - Job to check */
 
       cupsdLogPage(job, message);
 
-      if (job->sheets)
-	cupsdAddEvent(CUPSD_EVENT_JOB_PROGRESS, job->printer, job,
-		      "Printed %d page(s).", job->sheets->values[0].integer);
+      cupsdAddEvent(CUPSD_EVENT_JOB_PROGRESS, job->printer, job,
+                    "Printed %d page(s).", job->sheets->values[0].integer);
     }
     else if (loglevel == CUPSD_LOG_STATE)
     {
@@ -3637,7 +3597,7 @@ update_job(cupsd_job_t *job)		/* I - Job to check */
       {
 	cupsdSetPrinterReasons(job->printer, message);
 	cupsdAddPrinterHistory(job->printer);
-	event |= CUPSD_EVENT_PRINTER_STATE;
+	event |= CUPSD_EVENT_PRINTER_STATE_CHANGED;
       }
 
       update_job_attrs(job);
@@ -3666,42 +3626,14 @@ update_job(cupsd_job_t *job)		/* I - Job to check */
       if ((attr = cupsGetOption("printer-alert", num_attrs, attrs)) != NULL)
       {
         cupsdSetString(&job->printer->alert, attr);
-	event |= CUPSD_EVENT_PRINTER_STATE;
+	event |= CUPSD_EVENT_PRINTER_STATE_CHANGED;
       }
 
       if ((attr = cupsGetOption("printer-alert-description", num_attrs,
                                 attrs)) != NULL)
       {
         cupsdSetString(&job->printer->alert_description, attr);
-	event |= CUPSD_EVENT_PRINTER_STATE;
-      }
-
-      if ((attr = cupsGetOption("marker-colors", num_attrs, attrs)) != NULL)
-      {
-        cupsdSetPrinterAttr(job->printer, "marker-colors", (char *)attr);
-	job->printer->marker_time = time(NULL);
-	event |= CUPSD_EVENT_PRINTER_STATE;
-      }
-
-      if ((attr = cupsGetOption("marker-levels", num_attrs, attrs)) != NULL)
-      {
-        cupsdSetPrinterAttr(job->printer, "marker-levels", (char *)attr);
-	job->printer->marker_time = time(NULL);
-	event |= CUPSD_EVENT_PRINTER_STATE;
-      }
-
-      if ((attr = cupsGetOption("marker-names", num_attrs, attrs)) != NULL)
-      {
-        cupsdSetPrinterAttr(job->printer, "marker-names", (char *)attr);
-	job->printer->marker_time = time(NULL);
-	event |= CUPSD_EVENT_PRINTER_STATE;
-      }
-
-      if ((attr = cupsGetOption("marker-types", num_attrs, attrs)) != NULL)
-      {
-        cupsdSetPrinterAttr(job->printer, "marker-types", (char *)attr);
-	job->printer->marker_time = time(NULL);
-	event |= CUPSD_EVENT_PRINTER_STATE;
+	event |= CUPSD_EVENT_PRINTER_STATE_CHANGED;
       }
 
       cupsFreeOptions(num_attrs, attrs);
@@ -3718,7 +3650,7 @@ update_job(cupsd_job_t *job)		/* I - Job to check */
 
       cupsdSetString(&job->printer->recoverable, ptr);
       cupsdAddPrinterHistory(job->printer);
-      event |= CUPSD_EVENT_PRINTER_STATE;
+      event |= CUPSD_EVENT_PRINTER_STATE_CHANGED;
     }
     else if (!strncmp(message, "recovered:", 10))
     {
@@ -3731,7 +3663,7 @@ update_job(cupsd_job_t *job)		/* I - Job to check */
 
       cupsdSetString(&job->printer->recoverable, ptr);
       cupsdAddPrinterHistory(job->printer);
-      event |= CUPSD_EVENT_PRINTER_STATE;
+      event |= CUPSD_EVENT_PRINTER_STATE_CHANGED;
     }
 #endif /* __APPLE__ */
     else if (loglevel <= job->status_level)
@@ -3746,7 +3678,7 @@ update_job(cupsd_job_t *job)		/* I - Job to check */
       strlcpy(job->printer->state_message, message,
               sizeof(job->printer->state_message));
       cupsdAddPrinterHistory(job->printer);
-      event |= CUPSD_EVENT_PRINTER_STATE;
+      event |= CUPSD_EVENT_PRINTER_STATE_CHANGED;
 
       update_job_attrs(job);
     }
@@ -3755,8 +3687,8 @@ update_job(cupsd_job_t *job)		/* I - Job to check */
       break;
   }
 
-  if (event & CUPSD_EVENT_PRINTER_STATE)
-    cupsdAddEvent(CUPSD_EVENT_PRINTER_STATE, job->printer, NULL,
+  if ((event & CUPSD_EVENT_PRINTER_STATE_CHANGED))
+    cupsdAddEvent(CUPSD_EVENT_PRINTER_STATE_CHANGED, job->printer, NULL,
 		  (job->printer->type & CUPS_PRINTER_CLASS) ?
 		      "Class \"%s\" state changed." :
 		      "Printer \"%s\" state changed.",

scheduler/job.h

@@ -3,7 +3,7 @@
  *
  *   Print job definitions for the Common UNIX Printing System (CUPS) scheduler.
  *
- *   Copyright 2007-2008 by Apple Inc.
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2007 by Easy Software Products, all rights reserved.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -122,7 +122,7 @@ extern void		cupsdSetJobHoldUntil(cupsd_job_t *job, const char *when);
 extern void		cupsdSetJobPriority(cupsd_job_t *job, int priority);
 extern void		cupsdStopAllJobs(int force);
 extern void		cupsdStopJob(cupsd_job_t *job, int force);
-extern int		cupsdTimeoutJob(cupsd_job_t *job);
+extern void		cupsdTimeoutJob(cupsd_job_t *job);
 extern void		cupsdUnloadCompletedJobs(void);
 
 

scheduler/log.c

@@ -3,7 +3,7 @@
  *
  *   Log file routines for the Common UNIX Printing System (CUPS).
  *
- *   Copyright 2007-2008 by Apple Inc.
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2007 by Easy Software Products, all rights reserved.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -261,9 +261,6 @@ cupsdLogMessage(int        level,	/* I - Log level */
 
   if (len >= linesize)
   {
-    char	*temp;			/* Temporary string pointer */
-
-
     len ++;
 
     if (len < 8192)
@@ -271,12 +268,18 @@ cupsdLogMessage(int        level,	/* I - Log level */
     else if (len > 65536)
       len = 65536;
 
-    temp = realloc(line, len);
+    line = realloc(line, len);
 
-    if (temp)
-    {
-      line     = temp;
+    if (line)
       linesize = len;
+    else
+    {
+      cupsFilePrintf(ErrorFile,
+                     "ERROR: Unable to allocate memory for line - %s\n",
+                     strerror(errno));
+      cupsFileFlush(ErrorFile);
+
+      return (0);
     }
 
     va_start(ap, message);
@@ -352,7 +355,7 @@ cupsdLogPage(cupsd_job_t *job,		/* I - Job being printed */
  /*
   * Print a page log entry of the form:
   *
-  *    printer user job-id [DD/MON/YYYY:HH:MM:SS +TTTT] page num-copies \
+  *    printer job-id user [DD/MON/YYYY:HH:MM:SS +TTTT] page num-copies \
   *        billing hostname
   */
 

scheduler/main.c

@@ -3,7 +3,7 @@
  *
  *   Scheduler main loop for the Common UNIX Printing System (CUPS).
  *
- *   Copyright 2007-2008 by Apple Inc.
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2007 by Easy Software Products, all rights reserved.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -133,7 +133,10 @@ main(int  argc,				/* I - Number of command-line args */
 			browse_time,	/* Next browse send time */
 			senddoc_time,	/* Send-Document time */
 			expire_time,	/* Subscription expire time */
-			report_time;	/* Malloc/client/job report time */
+			mallinfo_time;	/* Malloc information time */
+  size_t		string_count,	/* String count */
+			alloc_bytes,	/* Allocated string bytes */
+			total_bytes;	/* Total string bytes */
   long			timeout;	/* Timeout for cupsdDoSelect() */
   struct rlimit		limit;		/* Runtime limit */
 #if defined(HAVE_SIGACTION) && !defined(HAVE_SIGSET)
@@ -146,8 +149,6 @@ main(int  argc,				/* I - Number of command-line args */
 #ifdef __APPLE__
   int			run_as_child = 0;
 					/* Needed for Mac OS X fork/exec */
-#else
-  time_t		netif_time = 0;	/* Time since last network update */
 #endif /* __APPLE__ */
 #if HAVE_LAUNCHD
   int			launchd_idle_exit;
@@ -225,22 +226,11 @@ main(int  argc,				/* I - Number of command-line args */
 		* are passed a NULL pointer.
 	        */
 
-                if ((current = malloc(1024)) == NULL)
-		{
-		  _cupsLangPuts(stderr,
-		                _("cupsd: Unable to get current directory!\n"));
-                  return (1);
-		}
-
-		if (!getcwd(current, 1024))
-		{
-		  _cupsLangPuts(stderr,
-		                _("cupsd: Unable to get current directory!\n"));
-                  free(current);
-		  return (1);
-		}
+                current = malloc(1024);
+		getcwd(current, 1024);
 
 		cupsdSetStringf(&ConfigurationFile, "%s/%s", current, argv[i]);
+
 		free(current);
               }
 	      break;
@@ -642,11 +632,11 @@ main(int  argc,				/* I - Number of command-line args */
   * Loop forever...
   */
 
+  mallinfo_time = 0;
   browse_time   = time(NULL);
+  senddoc_time  = time(NULL);
   expire_time   = time(NULL);
   fds           = 1;
-  report_time   = 0;
-  senddoc_time  = time(NULL);
 
   while (!stop_scheduler)
   {
@@ -837,18 +827,6 @@ main(int  argc,				/* I - Number of command-line args */
 
     current_time = time(NULL);
 
-#ifndef __APPLE__
-   /*
-    * Update the network interfaces once a minute...
-    */
-
-    if ((current_time - netif_time) >= 60)
-    {
-      netif_time  = current_time;
-      NetIFUpdate = 1;
-    }
-#endif /* !__APPLE__ */
-
 #if HAVE_LAUNCHD
    /*
     * If no other work was scheduled and we're being controlled by launchd
@@ -925,7 +903,7 @@ main(int  argc,				/* I - Number of command-line args */
       */
 
       cupsdDeleteCert(0);
-      cupsdAddCert(0, "root", NULL);
+      cupsdAddCert(0, "root");
     }
 
    /*
@@ -973,49 +951,30 @@ main(int  argc,				/* I - Number of command-line args */
     }
 
    /*
-    * Log statistics at most once a minute when in debug mode...
+    * Log memory usage every minute...
     */
 
-    if ((current_time - report_time) >= 60 && LogLevel >= CUPSD_LOG_DEBUG)
+    if ((current_time - mallinfo_time) >= 60 && LogLevel >= CUPSD_LOG_DEBUG2)
     {
-      size_t		string_count,	/* String count */
-			alloc_bytes,	/* Allocated string bytes */
-			total_bytes;	/* Total string bytes */
 #ifdef HAVE_MALLINFO
-      struct mallinfo	mem;		/* Malloc information */
+      struct mallinfo mem;		/* Malloc information */
 
 
       mem = mallinfo();
-      cupsdLogMessage(CUPSD_LOG_DEBUG, "Report: malloc-arena=%lu", mem.arena);
-      cupsdLogMessage(CUPSD_LOG_DEBUG, "Report: malloc-used=%lu",
-                      mem.usmblks + mem.uordblks);
-      cupsdLogMessage(CUPSD_LOG_DEBUG, "Report: malloc-free=%lu",
+      cupsdLogMessage(CUPSD_LOG_DEBUG2,
+                      "mallinfo: arena = %d, used = %d, free = %d\n",
+                      mem.arena, mem.usmblks + mem.uordblks,
 		      mem.fsmblks + mem.fordblks);
 #endif /* HAVE_MALLINFO */
 
-      cupsdLogMessage(CUPSD_LOG_DEBUG, "Report: clients=%d",
-                      cupsArrayCount(Clients));
-      cupsdLogMessage(CUPSD_LOG_DEBUG, "Report: jobs=%d",
-                      cupsArrayCount(Jobs));
-      cupsdLogMessage(CUPSD_LOG_DEBUG, "Report: jobs-active=%d",
-                      cupsArrayCount(ActiveJobs));
-      cupsdLogMessage(CUPSD_LOG_DEBUG, "Report: printers=%d",
-                      cupsArrayCount(Printers));
-      cupsdLogMessage(CUPSD_LOG_DEBUG, "Report: printers-implicit=%d",
-                      cupsArrayCount(ImplicitPrinters));
-
       string_count = _cupsStrStatistics(&alloc_bytes, &total_bytes);
-      cupsdLogMessage(CUPSD_LOG_DEBUG,
-                      "Report: stringpool-string-count=" CUPS_LLFMT,
-		      CUPS_LLCAST string_count);
-      cupsdLogMessage(CUPSD_LOG_DEBUG,
-                      "Report: stringpool-alloc-bytes=" CUPS_LLFMT,
-		      CUPS_LLCAST alloc_bytes);
-      cupsdLogMessage(CUPSD_LOG_DEBUG,
-                      "Report: stringpool-total-bytes=" CUPS_LLFMT,
+      cupsdLogMessage(CUPSD_LOG_DEBUG2,
+                      "stringpool: " CUPS_LLFMT " strings, "
+		      CUPS_LLFMT " allocated, " CUPS_LLFMT " total bytes",
+		      CUPS_LLCAST string_count, CUPS_LLCAST alloc_bytes,
 		      CUPS_LLCAST total_bytes);
 
-      report_time = current_time;
+      mallinfo_time = current_time;
     }
 
    /*
@@ -1056,7 +1015,7 @@ main(int  argc,				/* I - Number of command-line args */
       * Reset the accumulated events...
       */
 
-      LastEvent = CUPSD_EVENT_NONE;
+      LastEvent     = CUPSD_EVENT_NONE;
     }
   }
 
@@ -1663,11 +1622,8 @@ process_children(void)
 	    else
  	      job->status = -status;	/* Backend failed */
 
-            if (job->printer && !(job->printer->type & CUPS_PRINTER_FAX) &&
-	        job->status_level > CUPSD_LOG_ERROR)
+            if (job->printer && !(job->printer->type & CUPS_PRINTER_FAX))
 	    {
-	      job->status_level = CUPSD_LOG_ERROR;
-
               snprintf(job->printer->state_message,
 	               sizeof(job->printer->state_message), "%s failed", name);
               cupsdAddPrinterHistory(job->printer);

scheduler/mime.c

@@ -3,7 +3,7 @@
  *
  *   MIME database file routines for the Common UNIX Printing System (CUPS).
  *
- *   Copyright 2007-2008 by Apple Inc.
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2006 by Easy Software Products, all rights reserved.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -235,10 +235,7 @@ mimeMerge(mime_t     *mime,		/* I - MIME database to add to */
   if (!mime)
     mime = mimeNew();
   if (!mime)
-  {
-    cupsDirClose(dir);
     return (NULL);
-  }
 
  /*
   * Read all the .types files...

scheduler/policy.c

@@ -3,7 +3,7 @@
  *
  *   Policy routines for the Common UNIX Printing System (CUPS).
  *
- *   Copyright 2007-2008 by Apple Inc.
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2006 by Easy Software Products, all rights reserved.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -105,7 +105,7 @@ cupsdAddPolicyOp(cupsd_policy_t   *p,	/* I - Policy */
     p->num_ops ++;
 
     temp->op    = op;
-    temp->limit = CUPSD_AUTH_LIMIT_IPP;
+    temp->limit = AUTH_LIMIT_IPP;
 
     if (po)
     {
@@ -125,12 +125,12 @@ cupsdAddPolicyOp(cupsd_policy_t   *p,	/* I - Policy */
       for (i = 0; i < po->num_allow; i ++)
         switch (po->allow[i].type)
 	{
-	  case CUPSD_AUTH_IP :
+	  case AUTH_IP :
 	      cupsdAllowIP(temp, po->allow[i].mask.ip.address,
 	              po->allow[i].mask.ip.netmask);
 	      break;
 
-          case CUPSD_AUTH_INTERFACE :
+          case AUTH_INTERFACE :
 	      snprintf(name, sizeof(name), "@IF(%s)",
 	               po->allow[i].mask.name.name);
               cupsdAllowHost(temp, name);
@@ -144,12 +144,12 @@ cupsdAddPolicyOp(cupsd_policy_t   *p,	/* I - Policy */
       for (i = 0; i < po->num_deny; i ++)
         switch (po->deny[i].type)
 	{
-	  case CUPSD_AUTH_IP :
+	  case AUTH_IP :
 	      cupsdDenyIP(temp, po->deny[i].mask.ip.address,
 	              po->deny[i].mask.ip.netmask);
 	      break;
 
-          case CUPSD_AUTH_INTERFACE :
+          case AUTH_INTERFACE :
 	      snprintf(name, sizeof(name), "@IF(%s)",
 	               po->deny[i].mask.name.name);
               cupsdDenyHost(temp, name);

scheduler/printers.c

@@ -3,7 +3,7 @@
  *
  *   Printer routines for the Common UNIX Printing System (CUPS).
  *
- *   Copyright 2007-2008 by Apple Inc.
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2007 by Easy Software Products, all rights reserved.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -27,7 +27,6 @@
  *   cupsdSaveAllPrinters()      - Save all printer definitions to the
  *                                 printers.conf file.
  *   cupsdSetAuthInfoRequired()  - Set the required authentication info.
- *   cupsdSetPrinterAttr()       - Set a printer attribute.
  *   cupsdSetPrinterAttrs()      - Set printer attributes based upon the PPD
  *                                 file.
  *   cupsdSetPrinterReasons()    - Set/update the reasons strings.
@@ -901,7 +900,7 @@ cupsdLoadAllPrinters(void)
       {
         cupsdLogMessage(CUPSD_LOG_ERROR,
 	                "Syntax error on line %d of printers.conf.", linenum);
-	break;
+        return;
       }
     }
     else if (!strcasecmp(line, "</Printer>"))
@@ -946,14 +945,14 @@ cupsdLoadAllPrinters(void)
       {
         cupsdLogMessage(CUPSD_LOG_ERROR,
 	                "Syntax error on line %d of printers.conf.", linenum);
-	break;
+        return;
       }
     }
     else if (!p)
     {
       cupsdLogMessage(CUPSD_LOG_ERROR,
                       "Syntax error on line %d of printers.conf.", linenum);
-      break;
+      return;
     }
     else if (!strcasecmp(line, "AuthInfoRequired"))
     {
@@ -980,7 +979,7 @@ cupsdLoadAllPrinters(void)
       {
 	cupsdLogMessage(CUPSD_LOG_ERROR,
 	                "Syntax error on line %d of printers.conf.", linenum);
-	break;
+	return;
       }
     }
     else if (!strcasecmp(line, "Option") && value)
@@ -1012,7 +1011,7 @@ cupsdLoadAllPrinters(void)
       {
 	cupsdLogMessage(CUPSD_LOG_ERROR,
 	                "Syntax error on line %d of printers.conf.", linenum);
-	break;
+	return;
       }
     }
     else if (!strcasecmp(line, "State"))
@@ -1029,7 +1028,7 @@ cupsdLoadAllPrinters(void)
       {
 	cupsdLogMessage(CUPSD_LOG_ERROR,
 	                "Syntax error on line %d of printers.conf.", linenum);
-	break;
+	return;
       }
     }
     else if (!strcasecmp(line, "StateMessage"))
@@ -1070,7 +1069,7 @@ cupsdLoadAllPrinters(void)
       {
 	cupsdLogMessage(CUPSD_LOG_ERROR,
 	                "Syntax error on line %d of printers.conf.", linenum);
-	break;
+	return;
       }
     }
     else if (!strcasecmp(line, "Shared"))
@@ -1093,7 +1092,7 @@ cupsdLoadAllPrinters(void)
       {
 	cupsdLogMessage(CUPSD_LOG_ERROR,
 	                "Syntax error on line %d of printers.conf.", linenum);
-	break;
+	return;
       }
     }
     else if (!strcasecmp(line, "JobSheets"))
@@ -1128,7 +1127,7 @@ cupsdLoadAllPrinters(void)
       {
 	cupsdLogMessage(CUPSD_LOG_ERROR,
 	                "Syntax error on line %d of printers.conf.", linenum);
-	break;
+	return;
       }
     }
     else if (!strcasecmp(line, "AllowUser"))
@@ -1142,7 +1141,7 @@ cupsdLoadAllPrinters(void)
       {
 	cupsdLogMessage(CUPSD_LOG_ERROR,
 	                "Syntax error on line %d of printers.conf.", linenum);
-	break;
+	return;
       }
     }
     else if (!strcasecmp(line, "DenyUser"))
@@ -1156,7 +1155,7 @@ cupsdLoadAllPrinters(void)
       {
 	cupsdLogMessage(CUPSD_LOG_ERROR,
 	                "Syntax error on line %d of printers.conf.", linenum);
-	break;
+	return;
       }
     }
     else if (!strcasecmp(line, "QuotaPeriod"))
@@ -1167,7 +1166,7 @@ cupsdLoadAllPrinters(void)
       {
 	cupsdLogMessage(CUPSD_LOG_ERROR,
 	                "Syntax error on line %d of printers.conf.", linenum);
-	break;
+	return;
       }
     }
     else if (!strcasecmp(line, "PageLimit"))
@@ -1178,7 +1177,7 @@ cupsdLoadAllPrinters(void)
       {
 	cupsdLogMessage(CUPSD_LOG_ERROR,
 	                "Syntax error on line %d of printers.conf.", linenum);
-	break;
+	return;
       }
     }
     else if (!strcasecmp(line, "KLimit"))
@@ -1189,7 +1188,7 @@ cupsdLoadAllPrinters(void)
       {
 	cupsdLogMessage(CUPSD_LOG_ERROR,
 	                "Syntax error on line %d of printers.conf.", linenum);
-	break;
+	return;
       }
     }
     else if (!strcasecmp(line, "OpPolicy"))
@@ -1213,7 +1212,7 @@ cupsdLoadAllPrinters(void)
       {
 	cupsdLogMessage(CUPSD_LOG_ERROR,
 	                "Syntax error on line %d of printers.conf.", linenum);
-	break;
+	return;
       }
     }
     else if (!strcasecmp(line, "ErrorPolicy"))
@@ -1224,7 +1223,7 @@ cupsdLoadAllPrinters(void)
       {
 	cupsdLogMessage(CUPSD_LOG_ERROR,
 	                "Syntax error on line %d of printers.conf.", linenum);
-	break;
+	return;
       }
     }
     else
@@ -1642,120 +1641,6 @@ cupsdSetAuthInfoRequired(
 }
 
 
-/*
- * 'cupsdSetPrinterAttr()' - Set a printer attribute.
- */
-
-void
-cupsdSetPrinterAttr(
-    cupsd_printer_t *p,			/* I - Printer */
-    const char      *name,		/* I - Attribute name */
-    char            *value)		/* I - Attribute value string */
-{
-  ipp_attribute_t	*attr;		/* Attribute */
-  int			i,		/* Looping var */
-			count;		/* Number of values */
-  char			*ptr;		/* Pointer into value */
-  ipp_tag_t		value_tag;	/* Value tag for this attribute */
-
-
- /*
-  * Count the number of values...
-  */
-
-  for (count = 1, ptr = value;
-       (ptr = strchr(ptr, ',')) != NULL;
-       ptr ++, count ++);
-
- /*
-  * Then add or update the attribute as needed...
-  */
-
-  if (!strcmp(name, "marker-levels"))
-  {
-   /*
-    * Integer values...
-    */
-
-    if ((attr = ippFindAttribute(p->attrs, name, IPP_TAG_INTEGER)) != NULL &&
-        attr->num_values < count)
-    {
-      ippDeleteAttribute(p->attrs, attr);
-      attr = NULL;
-    }
-
-    if (attr)
-      attr->num_values = count;
-    else
-      attr = ippAddIntegers(p->attrs, IPP_TAG_PRINTER, IPP_TAG_INTEGER, name,
-                            count, NULL);
-
-    if (!attr)
-    {
-      cupsdLogMessage(CUPSD_LOG_ERROR,
-                      "Unable to allocate memory for printer attribute "
-		      "(%d values)", count);
-      return;
-    }
-
-    for (i = 0; i < count; i ++)
-    {
-      if ((ptr = strchr(value, ',')) != NULL)
-        *ptr++ = '\0';
-
-      attr->values[i].integer = strtol(value, NULL, 10);
-
-      if (ptr)
-        value = ptr;
-    }
-  }
-  else
-  {
-   /*
-    * Name or keyword values...
-    */
-
-    if (!strcmp(name, "marker-types"))
-      value_tag = IPP_TAG_KEYWORD;
-    else
-      value_tag = IPP_TAG_NAME;
-
-    if ((attr = ippFindAttribute(p->attrs, name, value_tag)) != NULL &&
-        attr->num_values < count)
-    {
-      ippDeleteAttribute(p->attrs, attr);
-      attr = NULL;
-    }
-
-    if (attr)
-      attr->num_values = count;
-    else
-      attr = ippAddStrings(p->attrs, IPP_TAG_PRINTER, value_tag, name,
-                           count, NULL, NULL);
-
-    if (!attr)
-    {
-      cupsdLogMessage(CUPSD_LOG_ERROR,
-                      "Unable to allocate memory for printer attribute "
-		      "(%d values)", count);
-      return;
-    }
-
-    for (i = 0; i < count; i ++)
-    {
-      if ((ptr = strchr(value, ',')) != NULL)
-        *ptr++ = '\0';
-
-      _cupsStrFree(attr->values[i].string.text);
-      attr->values[i].string.text = _cupsStrAlloc(value);
-
-      if (ptr)
-        value = ptr;
-    }
-  }
-}
-
-
 /*
  * 'cupsdSetPrinterAttrs()' - Set printer attributes based upon the PPD file.
  */
@@ -1851,25 +1736,25 @@ cupsdSetPrinterAttrs(cupsd_printer_t *p)/* I - Printer to setup */
       snprintf(resource, sizeof(resource), "/printers/%s", p->name);
 
     if ((auth = cupsdFindBest(resource, HTTP_POST)) == NULL ||
-        auth->type == CUPSD_AUTH_NONE)
+        auth->type == AUTH_NONE)
       auth = cupsdFindPolicyOp(p->op_policy_ptr, IPP_PRINT_JOB);
 
     if (auth)
     {
-      if (auth->type == CUPSD_AUTH_BASIC || auth->type == CUPSD_AUTH_BASICDIGEST)
+      if (auth->type == AUTH_BASIC || auth->type == AUTH_BASICDIGEST)
       {
 	auth_supported = "basic";
 	num_air        = 2;
 	air            = air_userpass;
       }
-      else if (auth->type == CUPSD_AUTH_DIGEST)
+      else if (auth->type == AUTH_DIGEST)
       {
 	auth_supported = "digest";
 	num_air        = 2;
 	air            = air_userpass;
       }
 #ifdef HAVE_GSSAPI
-      else if (auth->type == CUPSD_AUTH_NEGOTIATE)
+      else if (auth->type == AUTH_NEGOTIATE)
       {
 	auth_supported = "negotiate";
 	num_air        = 1;
@@ -1877,7 +1762,7 @@ cupsdSetPrinterAttrs(cupsd_printer_t *p)/* I - Printer to setup */
       }
 #endif /* HAVE_GSSAPI */
 
-      if (auth->type != CUPSD_AUTH_NONE)
+      if (auth->type != AUTH_NONE)
         p->type |= CUPS_PRINTER_AUTHENTICATED;
       else
         p->type &= ~CUPS_PRINTER_AUTHENTICATED;
@@ -2749,7 +2634,7 @@ cupsdSetPrinterState(
   if (old_state != s)
   {
     cupsdAddEvent(s == IPP_PRINTER_STOPPED ? CUPSD_EVENT_PRINTER_STOPPED :
-                      CUPSD_EVENT_PRINTER_STATE, p, NULL,
+                      CUPSD_EVENT_PRINTER_STATE_CHANGED, p, NULL,
 		  "%s \"%s\" state changed.",
 		  (p->type & CUPS_PRINTER_CLASS) ? "Class" : "Printer",
 		  p->name);

scheduler/printers.h

@@ -86,7 +86,6 @@ typedef struct cupsd_printer_s
   const char	*auth_info_required[4];	/* Required authentication fields */
   char		*alert,			/* PSX printer-alert value */
 		*alert_description;	/* PSX printer-alert-description value */
-  time_t	marker_time;		/* Last time marker attributes were updated */
 
 #ifdef __APPLE__
   char		*recoverable;		/* com.apple.print.recoverable-message */
@@ -151,8 +150,6 @@ extern void		cupsdSaveAllPrinters(void);
 extern int		cupsdSetAuthInfoRequired(cupsd_printer_t *p,
 			                         const char *values,
 						 ipp_attribute_t *attr);
-extern void		cupsdSetPrinterAttr(cupsd_printer_t *p,
-			                    const char *name, char *value);
 extern void		cupsdSetPrinterAttrs(cupsd_printer_t *p);
 extern void		cupsdSetPrinterReasons(cupsd_printer_t *p,
 			                       const char *s);

scheduler/subscriptions.c

@@ -3,7 +3,7 @@
  *
  *   Subscription routines for the Common UNIX Printing System (CUPS) scheduler.
  *
- *   Copyright 2007-2008 by Apple Inc.
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2007 by Easy Software Products, all rights reserved.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -323,7 +323,7 @@ cupsdAddSubscription(
                   "cupsdAddSubscription(mask=%x, dest=%p(%s), job=%p(%d), "
 		  "uri=\"%s\")",
                   mask, dest, dest ? dest->name : "", job, job ? job->id : 0,
-		  uri ? uri : "(null)");
+		  uri);
 
   if (!Subscriptions)
     Subscriptions = cupsArrayNew((cups_array_func_t)cupsd_compare_subscriptions,
@@ -504,14 +504,9 @@ cupsdEventName(
     case CUPSD_EVENT_PRINTER_MODIFIED :
         return ("printer-modified");
 
-    case CUPSD_EVENT_PRINTER_QUEUE_ORDER_CHANGED :
-        return ("printer-queue-order-changed");
-
-    case CUPSD_EVENT_PRINTER_STATE :
     case CUPSD_EVENT_PRINTER_STATE_CHANGED :
         return ("printer-state-changed");
 
-    case CUPSD_EVENT_PRINTER_CONFIG :
     case CUPSD_EVENT_PRINTER_CONFIG_CHANGED :
         return ("printer-config-changed");
 
@@ -534,6 +529,8 @@ cupsdEventName(
         return ("job-progress");
 
     case CUPSD_EVENT_JOB_STATE :
+        return ("job-state");
+
     case CUPSD_EVENT_JOB_STATE_CHANGED :
         return ("job-state-changed");
 
@@ -580,14 +577,14 @@ cupsdEventValue(const char *name)	/* I - Name of event */
     return (CUPSD_EVENT_PRINTER_DELETED);
   else if (!strcmp(name, "printer-modified"))
     return (CUPSD_EVENT_PRINTER_MODIFIED);
-  else if (!strcmp(name, "printer-queue-order-changed"))
-    return (CUPSD_EVENT_PRINTER_QUEUE_ORDER_CHANGED);
   else if (!strcmp(name, "printer-state-changed"))
     return (CUPSD_EVENT_PRINTER_STATE_CHANGED);
   else if (!strcmp(name, "printer-config-changed"))
     return (CUPSD_EVENT_PRINTER_CONFIG_CHANGED);
   else if (!strcmp(name, "printer-changed"))
     return (CUPSD_EVENT_PRINTER_CHANGED);
+  else if (!strcmp(name, "job-state"))
+    return (CUPSD_EVENT_JOB_STATE);
   else if (!strcmp(name, "job-created"))
     return (CUPSD_EVENT_JOB_CREATED);
   else if (!strcmp(name, "job-completed"))
@@ -734,7 +731,7 @@ cupsdLoadAllSubscriptions(void)
         cupsdLogMessage(CUPSD_LOG_ERROR,
 	                "Syntax error on line %d of subscriptions.conf.",
 	                linenum);
-        break;
+        return;
       }
     }
     else if (!strcasecmp(line, "</Subscription>"))
@@ -744,7 +741,7 @@ cupsdLoadAllSubscriptions(void)
         cupsdLogMessage(CUPSD_LOG_ERROR,
 	                "Syntax error on line %d of subscriptions.conf.",
 	                linenum);
-        break;
+        return;
       }
 
       if (delete_sub)
@@ -758,7 +755,7 @@ cupsdLoadAllSubscriptions(void)
       cupsdLogMessage(CUPSD_LOG_ERROR,
                       "Syntax error on line %d of subscriptions.conf.",
 	              linenum);
-      break;
+      return;
     }
     else if (!strcasecmp(line, "Events"))
     {
@@ -772,7 +769,7 @@ cupsdLoadAllSubscriptions(void)
 	cupsdLogMessage(CUPSD_LOG_ERROR,
 	                "Syntax error on line %d of subscriptions.conf.",
 	                linenum);
-	break;
+	return;
       }
 
       while (*value)
@@ -795,7 +792,7 @@ cupsdLoadAllSubscriptions(void)
 	  cupsdLogMessage(CUPSD_LOG_ERROR,
 	                  "Unknown event name \'%s\' on line %d of subscriptions.conf.",
 	                  value, linenum);
-	  break;
+	  return;
 	}
 
 	value = valueptr;
@@ -814,7 +811,7 @@ cupsdLoadAllSubscriptions(void)
 	cupsdLogMessage(CUPSD_LOG_ERROR,
 	                "Syntax error on line %d of subscriptions.conf.",
 	                linenum);
-	break;
+	return;
       }
     }
     else if (!strcasecmp(line, "Recipient"))
@@ -830,7 +827,7 @@ cupsdLoadAllSubscriptions(void)
 	cupsdLogMessage(CUPSD_LOG_ERROR,
 	                "Syntax error on line %d of subscriptions.conf.",
 	                linenum);
-	break;
+	return;
       }
     }
     else if (!strcasecmp(line, "JobId"))
@@ -854,7 +851,7 @@ cupsdLoadAllSubscriptions(void)
 	cupsdLogMessage(CUPSD_LOG_ERROR,
 	                "Syntax error on line %d of subscriptions.conf.",
 	                linenum);
-	break;
+	return;
       }
     }
     else if (!strcasecmp(line, "PrinterName"))
@@ -878,7 +875,7 @@ cupsdLoadAllSubscriptions(void)
 	cupsdLogMessage(CUPSD_LOG_ERROR,
 	                "Syntax error on line %d of subscriptions.conf.",
 	                linenum);
-	break;
+	return;
       }
     }
     else if (!strcasecmp(line, "UserData"))
@@ -940,7 +937,7 @@ cupsdLoadAllSubscriptions(void)
 	cupsdLogMessage(CUPSD_LOG_ERROR,
 	                "Syntax error on line %d of subscriptions.conf.",
 	                linenum);
-	break;
+	return;
       }
     }
     else if (!strcasecmp(line, "LeaseDuration"))
@@ -959,7 +956,7 @@ cupsdLoadAllSubscriptions(void)
 	cupsdLogMessage(CUPSD_LOG_ERROR,
 	                "Syntax error on line %d of subscriptions.conf.",
 	                linenum);
-	break;
+	return;
       }
     }
     else if (!strcasecmp(line, "Interval"))
@@ -975,7 +972,7 @@ cupsdLoadAllSubscriptions(void)
 	cupsdLogMessage(CUPSD_LOG_ERROR,
 	                "Syntax error on line %d of subscriptions.conf.",
 	                linenum);
-	break;
+	return;
       }
     }
     else if (!strcasecmp(line, "ExpirationTime"))
@@ -991,7 +988,7 @@ cupsdLoadAllSubscriptions(void)
 	cupsdLogMessage(CUPSD_LOG_ERROR,
 	                "Syntax error on line %d of subscriptions.conf.",
 	                linenum);
-	break;
+	return;
       }
     }
     else if (!strcasecmp(line, "NextEventId"))
@@ -1007,7 +1004,7 @@ cupsdLoadAllSubscriptions(void)
 	cupsdLogMessage(CUPSD_LOG_ERROR,
 	                "Syntax error on line %d of subscriptions.conf.",
 	                linenum);
-	break;
+	return;
       }
     }
     else

scheduler/subscriptions.h

@@ -20,52 +20,47 @@
 typedef enum
 {
   /* Individual printer events... */
-  CUPSD_EVENT_PRINTER_STATE = 0x0001,	/* Sent after generic printer state change */
-  CUPSD_EVENT_PRINTER_RESTARTED = 0x0002,
+  CUPSD_EVENT_PRINTER_RESTARTED = 0x0001,
 					/* Sent after printer restarted */
-  CUPSD_EVENT_PRINTER_SHUTDOWN = 0x0004,/* Sent after printer shutdown */
-  CUPSD_EVENT_PRINTER_STOPPED = 0x0008,	/* Sent after printer stopped */
-
-  CUPSD_EVENT_PRINTER_CONFIG = 0x0010,	/* Send after add/modify changes attrs */
-  CUPSD_EVENT_PRINTER_FINISHINGS_CHANGED = 0x0020,
+  CUPSD_EVENT_PRINTER_SHUTDOWN = 0x0002,/* Sent after printer shutdown */
+  CUPSD_EVENT_PRINTER_STOPPED = 0x0004,	/* Sent after printer stopped */
+  CUPSD_EVENT_PRINTER_FINISHINGS_CHANGED = 0x0008,
 					/* Sent after finishings-supported changed */
-  CUPSD_EVENT_PRINTER_MEDIA_CHANGED = 0x0040,
+  CUPSD_EVENT_PRINTER_MEDIA_CHANGED = 0x0010,
 					/* Sent after media-supported changed */
-  CUPSD_EVENT_PRINTER_ADDED = 0x0080,	/* Sent after printer added */
-  CUPSD_EVENT_PRINTER_DELETED = 0x0100,	/* Sent after printer deleted */
-  CUPSD_EVENT_PRINTER_MODIFIED = 0x0200,/* Sent after printer modified */
-  CUPSD_EVENT_PRINTER_QUEUE_ORDER_CHANGED = 0x0400,
-					/* Sent when the order of jobs is changed */
+  CUPSD_EVENT_PRINTER_ADDED = 0x0020,	/* Sent after printer added */
+  CUPSD_EVENT_PRINTER_DELETED = 0x0040,	/* Sent after printer deleted */
+  CUPSD_EVENT_PRINTER_MODIFIED = 0x0080,/* Sent after printer modified */
 
   /* Convenience printer event groupings... */
-  CUPSD_EVENT_PRINTER_STATE_CHANGED = 0x000f,
-					/* STATE + RESTARTED + SHUTDOWN + STOPPED */
-  CUPSD_EVENT_PRINTER_CONFIG_CHANGED = 0x0070,
-					/* CONFIG + FINISHINGS_CHANGED + MEDIA_CHANGED */
-  CUPSD_EVENT_PRINTER_CHANGED = 0x07ff,	/* All of the above */
+  CUPSD_EVENT_PRINTER_STATE_CHANGED = 0x0007,
+					/* RESTARTED + SHUTDOWN + STOPPED */
+  CUPSD_EVENT_PRINTER_CONFIG_CHANGED = 0x0018,
+					/* FINISHINGS_CHANGED + MEDIA_CHANGED */
+  CUPSD_EVENT_PRINTER_CHANGED = 0x00ff,	/* All of the above */
 
   /* Individual job events... */
-  CUPSD_EVENT_JOB_STATE = 0x0800,	/* Any state change */
-  CUPSD_EVENT_JOB_CREATED = 0x1000,	/* Send after job is created */
-  CUPSD_EVENT_JOB_COMPLETED = 0x2000,	/* Sent after job is completed */
-  CUPSD_EVENT_JOB_STOPPED = 0x4000,	/* Sent after job is stopped */
-  CUPSD_EVENT_JOB_CONFIG_CHANGED = 0x8000,
+  CUPSD_EVENT_JOB_STATE = 0x0100,	/* Any state change */
+  CUPSD_EVENT_JOB_CREATED = 0x0200,	/* Send after job is created */
+  CUPSD_EVENT_JOB_COMPLETED = 0x0400,	/* Sent after job is completed */
+  CUPSD_EVENT_JOB_STOPPED = 0x0800,	/* Sent after job is stopped */
+  CUPSD_EVENT_JOB_CONFIG_CHANGED = 0x1000,
 					/* Sent after set-job-attributes */
-  CUPSD_EVENT_JOB_PROGRESS = 0x10000,	/* Sent for each page */
+  CUPSD_EVENT_JOB_PROGRESS = 0x2000,	/* Sent for each page */
 
   /* Convenience job event grouping... */
-  CUPSD_EVENT_JOB_STATE_CHANGED = 0x7800,
-					/* STATE + CREATED + COMPLETED + STOPPED */
+  CUPSD_EVENT_JOB_STATE_CHANGED = 0x0f00,
+					/* Any state change + CREATED + COMPLETED + STOPPED */
 
   /* Server events... */
-  CUPSD_EVENT_SERVER_RESTARTED = 0x20000,/* Sent after server restarts */
-  CUPSD_EVENT_SERVER_STARTED = 0x40000,	/* Sent when server first starts */
-  CUPSD_EVENT_SERVER_STOPPED = 0x80000,	/* Sent when server is stopped */
-  CUPSD_EVENT_SERVER_AUDIT = 0x100000,	/* Security-related stuff */
+  CUPSD_EVENT_SERVER_RESTARTED = 0x4000,/* Sent after server restarts */
+  CUPSD_EVENT_SERVER_STARTED = 0x8000,	/* Sent when server first starts */
+  CUPSD_EVENT_SERVER_STOPPED = 0x10000,	/* Sent when server is stopped */
+  CUPSD_EVENT_SERVER_AUDIT = 0x20000,	/* Security-related stuff */
 
   /* Everything and nothing... */
   CUPSD_EVENT_NONE = 0,			/* Nothing */
-  CUPSD_EVENT_ALL = 0x1fffff		/* Everything */
+  CUPSD_EVENT_ALL = 0x1ffff		/* Everything */
 } cupsd_eventmask_t;
 
 

scheduler/testspeed.c

@@ -166,7 +166,7 @@ main(int  argc,				/* I - Number of command-line arguments */
   * Exit with no errors...
   */
 
-  return (0);
+  return (status);
 }
 
 

scheduler/type.c

@@ -567,12 +567,12 @@ mimeFileType(mime_t     *mime,		/* I - MIME database */
     if ((base = strrchr(filename, '/')) != NULL)
       base ++;
     else
-      base = filename;
+      filename = filename;
   }
   else if ((base = strrchr(pathname, '/')) != NULL)
     base ++;
   else
-    base = pathname;
+    filename = pathname;
 
  /*
   * Then check it against all known types...
@@ -638,8 +638,8 @@ compare_types(mime_type_t *t0,		/* I - First type */
   int	i;				/* Result of comparison */
 
 
-  if ((i = strcasecmp(t0->super, t1->super)) == 0)
-    i = strcasecmp(t0->type, t1->type);
+  if ((i = strcmp(t0->super, t1->super)) == 0)
+    i = strcmp(t0->type, t1->type);
 
   return (i);
 }