Import cups.org releases

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/tags/release-1.4.4@4306 a1ca3aef-8c08-0410-bb20-df032aa958be
2013-05-10 18:56:23 +00:00
@@ -3,6 +3,14 @@ CHANGES-1.3.txt

 CHANGES IN CUPS V1.3.11

+	- The scheduler did not prevent nested classes (STR #3211)
+	- The scheduler did not reprint processing jobs that were moved to
+	  another destination (STR #3222)
+	- The scheduler did not reset the current job file when stopping a
+	  printer (STR #3226)
+	- The scheduler did not handle POSTs to custom CGIs properly (STR #3221)
+	- The pdftops filter did not print landscape PDF pages properly
+	  (STR #2881)
 	- The scheduler did not handle partial header lines properly from CGI
 	  programs (STR #3194)
 	- The web interface could hang on OpenBSD (STR #3176, STR #3196)
@@ -1,6 +1,271 @@
-CHANGES.txt - 2009-05-16
+CHANGES.txt - 2010-06-17
 ------------------------

+CHANGES IN CUPS V1.4.4
+
+	- Documentation updates (STR #3453, STR #3527, STR #3528, STR #3529)
+	- Security: The texttops filter did not check the results of allocations
+	  (STR #3516)
+	- Security: The fix for CVE-2009-3553 was incomplete (STR #3490)
+	- Security: The web admin interface could disclose the contents of
+	  memory (STR #3577)
+	- Security: CUPS could overwrite files as root in directories owned or
+	  writable by non-root users (STR #3510)
+	- The cups-config utility did not return the correct linker options on
+	  AIX (STR #3587)
+	- Fixed some IPP conformance issues with the scheduler's
+	  ippget-event-life, operations-supported, output-bin, and sides
+	  attributes (STR #3554)
+	- The OpenSSL interfaces have been made thread-safe and the GNU TLS
+	  interface is explicitly forbidden when threading is enabled
+	  (STR #3461)
+	- Fixed an IPP conformance issue with the scheduler's Send-Document
+	  implementation (STR #3514)
+	- Added additional validation checks for the 1284 device ID (STR #3534)
+	- Fixed a problem with the RPM spec file (STR #3544)
+	- The lpstat command did not limit the job list to the specified
+	  printers (STR #3541)
+	- The cupsfilter command did not set the RIP_MAX_CACHE environment
+	  variable (STR #3531)
+	- Fixed support for media-col and page size variants (STR #3394)
+	- The PostScript filter did not support all media selection options for
+	  the first page (STR #3525)
+	- The scheduler did not always remove job control files (STR #3425)
+	- The scheduler could crash on restart if classes were defined
+	  (STR #3524)
+	- The scheduler no longer looks up network interface hostnames by
+	  default on Mac OS X (STR #3523)
+	- ippWriteIO did not write collection (member) attributes properly in
+	  all cases (STR #3521)
+	- The "cupsctl --remote-any" and corresponding web interface check box
+	  (allow printing from the Internet) did not work reliably (STR #3520)
+	- The lpq and lpr commands would sometimes choose different default
+	  printers (STR #3503)
+	- cupsDo*Request did not flush error text, leading to multiple issues
+	  (STR #3325, STR #3519)
+	- cupsDoAuthentication did not cancel password authentication after 3
+	  failures (STR #3518)
+	- Fixed several LDAP browsing bugs (STR #3392)
+	- The Dymo driver did not support copies (STR #3457)
+	- The scheduler did not update the classes.conf file when deleting a
+	  printer belonging to a class (STR #3505)
+	- The lppasswd command did not use localized password prompts
+	  (STR #3492)
+	- The socket backend no longer waits for back-channel data on platforms
+	  other than Mac OS X (STR #3495)
+	- The scheduler didn't send events when a printer started accepting or
+	  rejecting jobs (STR #3480)
+	- The web interface now includes additional CSRF protection (STR #3498)
+
+
+CHANGES IN CUPS V1.4.3
+
+	- SECURITY: The scheduler could try responding on a closed client
+	  connection, leading to a crash (STR #3200)
+	- SECURITY: The lppasswd program allowed the localization files to be
+	  overridden when running in setuid mode (STR #3482)
+	- Localization updates (STR #3352, STR #3409, STR #3422, STR #3452,
+	  STR #3473, STR #3502)
+	- Documentation updates (STR #3451, STR #3504)
+	- The IPP backend now sets the printer-state-message to "Ready to
+	  print." at the end of a successful job (STR #3460)
+	- The PPD compiler did not correctly add the manufacturer to the output
+	  filename when using the "-m" option (STR #3469)
+	- The IPP backend did not handle authentication properly for the Get-
+	  Printer-Attributes operation (STR 3458)
+	- Getting SNMP values larger than 127 bytes did not work.
+	- IPP conformance: Get-Jobs has a default value for requested-attributes
+	  (STR #3383)
+	- cupsPrintFiles() did not report all errors (STR #3449)
+	- cupsAddDest() could read freed memory (STR #3448)
+	- The DBUS notifier did not build (STR #3447)
+	- The scheduler would crash when an active printer was deleted.
+	- The snmp backend did not work with some printers (STR #3413)
+	- The web interface did not show the conflicting values when setting
+	  options (STR #3440)
+	- Setting options in the web interface did not always work (STR #3439)
+	- The scheduler did not use the Get-Job-Attributes policy for a printer
+	  (STR #3431)
+	- The scheduler added two job-name attributes to each job object
+	  (STR #3428)
+	- CSS files would not print (STR #3442)
+	- The scheduler did not clean out completed jobs when PreserveJobHistory
+	  was turned off (STR #3425)
+	- The web interface did not show completed jobs for a printer
+	  (STR #3436)
+	- Authenticated printing did not always work when printing directly to
+	  a remote server (STR #3435)
+	- The USB backend did not work on Solaris (STR #3423)
+	- cupstestppd didn't catch problems with JobPatchFile definitions
+	  (STR #3421)
+	- The socket backend could crash if a SNMP string had a negative length.
+	- Fixed some termination issues with the USB backend on Mac OS X.
+	- The side-channel APIs did not handle interrupts properly.
+	- The network backends incorrectly cleared the media-empty-warning
+	  state.
+	- The web interface did not allow users to successfully add serial
+	  printers (STR #3391)
+	- cupsTempFd() did not work in some situations (STR #3382)
+	- Some C API headers were missing C++ wrapper logic.
+	- The PPD compiler did not localize single-language PPD options properly
+	  (STR #3386)
+	- Modifying a printer from the web interface sometimes caused the wrong
+	  driver to be selected (STR #3418)
+	- The scheduler did not handle out-of-memory conditions properly when
+	  loading a job (STR #3407)
+	- When adding printers from the web interface, the dynamic updates of
+	  the device list made it hard to pick a device (STR #3406)
+	- Fixed a typo in the web interface admin page template (STR 3403)
+	- The web interface did not preserve the "printer is shared" state when
+	  modifying a printer (STR #3390)
+	- The PPD compiler incorrectly inserted translations of empty strings
+	  (STR #3411)
+	- The scheduler did not reset the SIGPIPE handler of child processes
+	  (STR #3399)
+	- cupsGetNamedDest() incorrectly returned the default printer if the
+	  named printer did not exist (STR #3397)
+	- Fixed a GNU TLS error handling bug (STR #3381)
+
+
+CHANGES IN CUPS V1.4.2
+
+	- SECURITY: The CUPS web interface was vulnerable to several XSS and
+	  HTTP header/body attacks via attribute injection (STR #3367,
+	  STR #3401)
+	- Fixed localization errors (STR #3359, STR #3372, STR #3380, STR #3387)
+	- The documentation for classes.conf and printers.conf did not provide
+	  the correct instructions for manual changes (STR #3351)
+	- The scheduler did not always rebuild printer cache files when the
+	  driver was changed (STR #3356)
+	- The documentation makefile failed to install localizations when using
+	  newer versions of Bash (STR #3360)
+	- The configure script did not use the --with-xinetd value for the
+	  default LPD configuration path (STR #3347)
+	- The configure script incorrectly required glib for DBUS support
+	  (STR #3346)
+	- The cupstestppd program incorrectly reported filters with bad
+	  permisssions as missing (STR #3363)
+	- The cups.desktop file used the wrong locale names (STR #3358)
+	- cupsSideChannelRead() did not return an error for short reads.
+	- The installed PAM configuration file did not use the correct options
+	  with the pam_unix2 module (STR #3313)
+	- The scheduler did not preserve default options that contained special
+	  characters (STR #3340)
+	- The scheduler did not remove old pre-filters when updating a printer
+	  driver (STR #3342)
+	- The HP/GL-2 filter did not check for early end-of-file (STR #3319)
+	- The USB backend did not compile on some platforms (STR #3332)
+	- cupsSideChannelSNMPWalk() could go into an infinite loop with broken
+	  SNMP implementations.
+
+
+CHANGES IN CUPS V1.4.1
+
+	- Documention fixes (STR #3296)
+	- SNMP supply levels and states were wrong for some printers.
+	- The IPP backend did not update the auth-info-required value.
+	- The libusb-based USB backend would hang at the end of the job
+	  (STR #3315, STR #3318)
+	- DNS-SD registrations for raw queues had an empty "ty" key (STR #3299)
+	- The JPEG and BMP MIME type rules were broken (STR #3284)
+	- cupsGetNamedDest returned the default printer when the named
+	  destination did not exist (STR #3285)
+	- The JobKillDelay was not triggered for canceled jobs (STR #3292)
+	- The PPD compiler could get in an infinite loop (STR #3293)
+	- The configure check for dns-sd.h was broken (STR #3297)
+	- The "Query Printer for Default Options" page did not go away if the
+	  query job was held (STR #3302)
+	- Boolean options did not show up as selected in the web interface
+	  (STR #3303)
+      	- The scheduler did not cache or report driver information files
+	  correctly, leading to a variety of issues (STR #3283, STR #3297,
+	  STR #3305)
+	- cupsDoIORequest() did not abort on permanent errors (STR #3311)
+	- Modifying a class in the web interface did not work (STR #3312)
+	- BrowseLocalProtocols could be cleared when changing the sharing
+	  setting (STR #3287)
+	- The scheduler could return an empty supported document format
+	  (STR #3308)
+	- The PPD compiler generated invalid PPD files when the locale used
+	  something other than "." for the decimal point (STR #3300)
+	- The IPP backend did not handle some non-comforming IPP printer
+	  implementations (STR #3262)
+	- The scheduler leaked three file descriptors to each job filter
+	  (STR #3263)
+	- The scheduler now uses a default CUPS-Get-Devices timeout of 15
+	  seconds (STR #3307)
+
+
+CHANGES IN CUPS V1.4.0
+
+	- Localization updates (STR #3223, STR #3246, STR #3248, STR #3250)
+	- Documentation updates (STR #3225, STR #3230, STR #3242, STR #3260)
+	- The --with-pdftops configure option did not accept a full path to the
+	  filter (STR #3278)
+	- The banner filter did not position the back side image correctly
+	  (STR #3277)
+	- The dnssd backend could crash (STR #3272)
+	- The 1284 device ID sometimes contained trailing garbage (STR #3266)
+	- The USB backend returned different URIs for some printers than in
+	  CUPS 1.3 (STR #3259)
+	- The scheduler did not do local job-hold-until processing for remote
+	  queues (STR #3258)
+	- The scheduler did not try all possible SSL certificates on Mac OS X.
+	- The scheduler did not always remove a file descriptor when using the
+	  kqueue interface (STR #3256)
+	- The scheduler did not protect against bad job control files in all
+	  cases (STR #3253)
+	- The scheduler did not encode "+" in model names (STR #3254)
+	- The web interface didn't show the default options (STR #3244)
+	- The IPP and LPD backends needed print data before they would do an
+	  SNMP query.
+	- Fixed a GNU TLS compatibility issue (STR #3231)
+	- Fixed a HTML error in the add and modify printer web interface
+	  templates (STR #3229)
+	- The scheduler did not minimize the number of printer state events that
+	  were generated by filter STATE: messages, which could lead to poor
+	  performance.
+	- The USB backend on Mac OS X did not cleanly cancel a job.
+	- The network backends now set the connecting-to-device printer-state-
+	  reasons value when looking up the address and copying the print data
+	  for consistency.
+	- The scheduler now supports the com.apple.print.recoverable-warning
+	  reason on all platforms.
+
+
+CHANGES IN CUPS V1.4rc1
+
+	- The PPD compiler documentation was missing information on localization
+	  (STR #3212)
+	- The IPP backend now reconnects after every request when talking to
+	  printers that claim IPP support but only use HTTP/1.0.
+	- The PPD compiler crashed when both "Resolution" and "Group foo Option
+	  Resolution" were specified in the .drv file.
+	- The PPD compiler's #if/#elif/#else/#endif did not work for undefined
+	  variables (STR #3210)
+	- Static libraries could not be installed by a non-root user on systems
+	  needing a ranlib program (STR #3209)
+	- The scheduler incorrectly always tried to copy Kerberos credentials
+	  for print jobs.
+	- Updated the Spanish localization (STR #3204)
+	- The scheduler crashed when getting the default paper size from
+	  libpaper (STR #3205, STR #3206)
+	- The PPD compiler now defines six variables: CUPS_VERSION,
+	  CUPS_VERSION_MAJOR, CUPS_VERSION_MINOR, CUPS_VERSION_PATCH,
+	  PLATFORM_NAME, and PLATFORM_ARCH (STR #3203)
+	- Fixed a whitespace skipping bug in cupsRasterInterpretPPD.
+	- The scheduler did not return HTTP 403 (Forbidden) for authenticated
+	  users that were not authorized to do IPP operations (STR #3193)
+	- The scheduler did not report more than 8 Product strings from a PPD
+	  file.  Some PPD files have as many as 24.
+	- ppdOpen*() could crash if a keyword had no value string (something
+	  that cupstestppd looks for...)
+	- cupsLangDefault() did not return the correct language on Mac OS X.
+	- The Mac OS X USB backend did not handle aborted or stalled pipe
+	  conditions properly, which prevented drivers from ejecting partial
+	  pages when a job was canceled or held.
+
+
 CHANGES IN CUPS V1.4b3

 	- Documentation fixes (STR #3044, STR #3057, STR #3153, STR #3158,
@@ -1,4 +1,4 @@
-CREDITS.txt - 2008-12-08
+CREDITS.txt - 2010-03-13
 ------------------------

 Few projects are completed by one person, and CUPS is no exception.  We'd
@@ -17,6 +17,7 @@ like to thank the following individuals for their contributions:
    Wang Jian                      - CUPS RPM corrections.
    Roderick Johnstone             - Beta tester of the millenium.
    Till Kamppeter                 - Bug fixes, beta testing, evangelism.
+    I–aki Larra–aga                - Basque localization.
    Kenshi Muto                    - Japanese localization, patches, and
                                     testing.
    Tomohiro Kato                  - Japanese localization.
@@ -28,6 +29,7 @@ like to thank the following individuals for their contributions:
    Jason McMullan                 - Original CUPS RPM distributions.
    Wes Morgan                     - *BSD fixes.
    Daniel Nylander                - Swedish localization.
+    Niklas 'Nille' �kerstršm       - Swedish localization.
    Giulio Orsero                  - Bug fixes and testing.
    Michal Osowiecki               - Polish localization.
    Citra Paska                    - Indonesian localization.
@@ -38,7 +40,7 @@ like to thank the following individuals for their contributions:
    Opher Shachar                  - Hebrew localization.
    Stuart Stevens                 - HP JetDirect IPP information.
    Andrea Suatoni                 - IRIX desktop integration and testing.
-    Teppo Turlianen                - Finnish localization.
+    Teppo Turliainen               - Finnish localization.
    Tim Waugh                      - Lots of patches, testing, and Linux
                                     integration.
    Yugami                         - LDAP browsing support.
@@ -1,4 +1,4 @@
-INSTALL - CUPS v1.4b3 - 2009-05-19
+INSTALL - CUPS v1.4.4 - 2010-06-17
 ----------------------------------

 This file describes how to compile and install CUPS from source code. For more
@@ -43,7 +43,7 @@ COMPILING THE SUBVERSION REPOSITORY CODE
    configure script.  You'll need to run the GNU autoconf software (2.60 or
    higher) to create it:

-	autoconf -f
+	autoconf


 CONFIGURATION
@@ -1,9 +1,9 @@
 #
 # "$Id$"
 #
-#   Common makefile definitions for the Common UNIX Printing System (CUPS).
+#   Common makefile definitions for CUPS.
 #
-#   Copyright 2007-2009 by Apple Inc.
+#   Copyright 2007-2010 by Apple Inc.
 #   Copyright 1997-2007 by Easy Software Products, all rights reserved.
 #
 #   These coded instructions, statements, and computer programs are the
@@ -20,6 +20,7 @@
 AR		=	@AR@
 AWK		=	@AWK@
 CC		=	@LIBTOOL@ @CC@
+CHMOD		=	@CHMOD@
 CXX		=	@LIBTOOL@ @CXX@
 DSO		=	@DSO@
 DSOXX		=	@DSOXX@
@@ -262,7 +263,7 @@ DBUSDIR		=	@DBUSDIR@

 .c.o:
 	echo Compiling $<...
-	$(CC) $(ARCHFLAGS) $(OPTIM) $(ALL_CFLAGS) -c $<
+	$(CC) $(ARCHFLAGS) $(OPTIM) $(ALL_CFLAGS) -c -o $@ $<

 .c.32.o:
 	echo Compiling 32-bit $<...
@@ -274,7 +275,7 @@ DBUSDIR		=	@DBUSDIR@

 .cxx.o:
 	echo Compiling $<...
-	$(CXX) $(ARCHFLAGS) $(OPTIM) $(ALL_CXXFLAGS) -c $<
+	$(CXX) $(ARCHFLAGS) $(OPTIM) $(ALL_CXXFLAGS) -c -o $@ $<

 .man.1 .man.1m .man.3 .man.5 .man.7 .man.8:
 	echo Linking $<...
@@ -1,9 +1,9 @@
 #
 # "$Id$"
 #
-#   Top-level Makefile for the Common UNIX Printing System (CUPS).
+#   Top-level Makefile for CUPS.
 #
-#   Copyright 2007-2009 by Apple Inc.
+#   Copyright 2007-2010 by Apple Inc.
 #   Copyright 1997-2007 by Easy Software Products, all rights reserved.
 #
 #   These coded instructions, statements, and computer programs are the
@@ -16,13 +16,6 @@
 include Makedefs


-#
-# Don't run top-level build targets in parallel...
-#
-
-.NOTPARALLEL:
-
-
 #
 # Directories to make...
 #
@@ -139,13 +132,15 @@ depend:

 #
 # Run the clang.llvm.org static code analysis tool on the C sources.
+# (at least checker-231 is required for scan-build to work this way)
 #

-.PHONY: clang
+.PHONY: clang clang-changes
 clang:
 	$(RM) -r clang
-	scan-build -V -k -o `pwd`/clang $(MAKE) $(MFLAGS) \
-		CC=ccc-analyzer CXX=ccc-analyzer clean all
+	scan-build -V -k -o `pwd`/clang $(MAKE) $(MFLAGS) clean all
+clang-changes:
+	scan-build -V -k -o `pwd`/clang $(MAKE) $(MFLAGS) all


 #
@@ -392,6 +387,7 @@ docset:	apihelp
 	echo Indexing docset...
 	/Developer/usr/bin/docsetutil index org.cups.docset
 	echo Generating docset archive and feed...
+	$(RM) org.cups.docset.atom
 	/Developer/usr/bin/docsetutil package --output org.cups.docset.xar \
 		--atom org.cups.docset.atom \
 		--download-url http://www.cups.org/org.cups.docset.xar \
@@ -399,7 +395,7 @@ docset:	apihelp


 #
-# Make software distributions using EPM (http://www.easysw.com/epm/)...
+# Make software distributions using EPM (http://www.epmhome.org/)...
 #

 EPMFLAGS	=	-v --output-dir dist $(EPMARCH)
@@ -424,11 +420,18 @@ dist:	all
 		*BSD*) $(MAKE) $(MFLAGS) bsd;; \
 		Darwin*) $(MAKE) $(MFLAGS) osx;; \
 		IRIX*) $(MAKE) $(MFLAGS) tardist;; \
-		Linux*) $(MAKE) $(MFLAGS) rpm;; \
+		Linux*) test ! -x /usr/bin/rpm || $(MAKE) $(MFLAGS) rpm;; \
 		SunOS*) $(MAKE) $(MFLAGS) pkg;; \
 	esac


+#
+# Don't run top-level build targets in parallel...
+#
+
+.NOTPARALLEL:
+
+
 #
 # End of "$Id$".
 #
@@ -1,19 +1,6 @@
-README - CUPS v1.4b3 - 2009-05-19
+README - CUPS v1.4.4 - 2010-06-17
 ---------------------------------

-**********************************************************************
-**********************************************************************
-**********                                                  **********
-**********  THIS IS BETA-RELEASE SOFTWARE.  DO NOT USE ON   **********
-**********  PRODUCTION SYSTEMS!  REPORT PROBLEMS TO THE     **********
-**********  CUPS FORUMS OR BUG REPORTING PAGES:             **********
-**********                                                  **********
-**********    http://www.cups.org/newsgroups.php (FORUMS)   **********
-**********    http://www.cups.org/str.php        (BUGS)     **********
-**********                                                  **********
-**********************************************************************
-**********************************************************************
-
 Looking for compile instructions?  Read the file "INSTALL.txt"
 instead...

@@ -163,7 +150,7 @@ PRINTING FILES

 LEGAL STUFF

-    CUPS is Copyright 2007-2009 by Apple Inc.  CUPS and the CUPS logo are
+    CUPS is Copyright 2007-2010 by Apple Inc.  CUPS and the CUPS logo are
    trademarks of Apple Inc.

    The MD5 Digest code is Copyright 1999 Aladdin Enterprises.
@@ -34,6 +34,26 @@
 #  include <cups/string.h>
 #  include <signal.h>

+#  ifdef __linux
+#    include <sys/ioctl.h>
+#    include <linux/lp.h>
+#    define IOCNR_GET_DEVICE_ID		1
+#    define LPIOC_GET_DEVICE_ID(len)	_IOC(_IOC_READ, 'P', IOCNR_GET_DEVICE_ID, len)
+#    include <linux/parport.h>
+#    include <linux/ppdev.h>
+#    include <unistd.h>
+#    include <fcntl.h>
+#  endif /* __linux */
+
+#  ifdef __sun
+#    ifdef __sparc
+#      include <sys/ecppio.h>
+#    else
+#      include <sys/ioccom.h>
+#      include <sys/ecppsys.h>
+#    endif /* __sparc */
+#  endif /* __sun */
+

 /*
 * C++ magic...
@@ -276,16 +296,17 @@ extern int		backendGetDeviceID(int fd, char *device_id,
 extern int		backendGetMakeModel(const char *device_id,
 			                    char *make_model,
 				            int make_model_size);
-extern void		backendNetworkSideCB(int print_fd, int device_fd,
+extern int		backendNetworkSideCB(int print_fd, int device_fd,
 			                     int snmp_fd, http_addr_t *addr,
 					     int use_bc);
 extern ssize_t		backendRunLoop(int print_fd, int device_fd, int snmp_fd,
-			               http_addr_t *addr, int use_bc,
-				       void (*side_cb)(int print_fd,
-				                       int device_fd,
-						       int snmp_fd,
-						       http_addr_t *addr,
-						       int use_bc));
+			               http_addr_t *addr, int use_bc, 
+			               int update_state, 
+				       int (*side_cb)(int print_fd,
+				                      int device_fd,
+						      int snmp_fd,
+						      http_addr_t *addr,
+						      int use_bc));
 extern int		backendSNMPSupplies(int snmp_fd, http_addr_t *addr,
 			                    int *page_count,
 					    int *printer_state);
@@ -153,8 +153,8 @@ main(int  argc,				/* I - Number of command-line args */
  memset(&action, 0, sizeof(action));

  sigemptyset(&action.sa_mask);
-  action.sa_handler = SIG_IGN;
-  sigaction(SIGTERM, &action, sigterm_handler);
+  action.sa_handler = sigterm_handler;
+  sigaction(SIGTERM, &action, NULL);
 #else
  signal(SIGTERM, sigterm_handler);
 #endif /* HAVE_SIGSET */
@@ -3,7 +3,7 @@
 *
 *   IEEE-1284 support functions for the Common UNIX Printing System (CUPS).
 *
- *   Copyright 2007-2008 by Apple Inc.
+ *   Copyright 2007-2009 by Apple Inc.
 *   Copyright 1997-2007 by Easy Software Products, all rights reserved.
 *
 *   These coded instructions, statements, and computer programs are the
@@ -27,26 +27,6 @@

 #include "backend-private.h"

-#ifdef __linux
-#  include <sys/ioctl.h>
-#  include <linux/lp.h>
-#  define IOCNR_GET_DEVICE_ID		1
-#  define LPIOC_GET_DEVICE_ID(len)	_IOC(_IOC_READ, 'P', IOCNR_GET_DEVICE_ID, len)
-#  include <linux/parport.h>
-#  include <linux/ppdev.h>
-#  include <unistd.h>
-#  include <fcntl.h>
-#endif /* __linux */
-
-#ifdef __sun
-#  ifdef __sparc
-#    include <sys/ecppio.h>
-#  else
-#    include <sys/ioccom.h>
-#    include <sys/ecppsys.h>
-#  endif /* __sparc */
-#endif /* __sun */
-

 /*
 * 'backendGetDeviceID()' - Get the IEEE-1284 device ID string and
@@ -196,20 +176,43 @@ backendGetDeviceID(
      * and then limit the length to the size of our buffer...
      */

-      if (length > (device_id_size - 2))
+      if (length > device_id_size)
 	length = (((unsigned)device_id[1] & 255) << 8) +
 		 ((unsigned)device_id[0] & 255);

-      if (length > (device_id_size - 2))
-	length = device_id_size - 2;
+      if (length > device_id_size)
+	length = device_id_size;

     /*
-      * Copy the device ID text to the beginning of the buffer and
-      * nul-terminate.
+      * The length field counts the number of bytes in the string
+      * including the length field itself (2 bytes).  The minimum
+      * length for a valid/usable device ID is 14 bytes:
+      *
+      *     <LENGTH> MFG: <MFG> ;MDL: <MDL> ;
+      *        2  +   4  +  1  +  5 +  1 +  1
      */

-      memmove(device_id, device_id + 2, length);
-      device_id[length] = '\0';
+      if (length < 14)
+      {
+       /*
+	* Can't use this device ID, so don't try to copy it...
+	*/
+
+	device_id[0] = '\0';
+	got_id       = 0;
+      }
+      else
+      {
+       /*
+	* Copy the device ID text to the beginning of the buffer and
+	* nul-terminate.
+	*/
+
+	length -= 2;
+
+	memmove(device_id, device_id + 2, length);
+	device_id[length] = '\0';
+      }
    }
 #    ifdef DEBUG
    else
@@ -306,6 +309,17 @@ backendGetDeviceID(
      mfg = temp;
    }

+    if (!mdl)
+      mdl = "";
+
+    if (!strncasecmp(mdl, mfg, strlen(mfg)))
+    {
+      mdl += strlen(mfg);
+
+      while (isspace(*mdl & 255))
+        mdl ++;
+    }
+
   /*
    * Generate the device URI from the manufacturer, make_model, and
    * serial number strings.
@@ -389,7 +403,11 @@ backendGetMakeModel(

      char	temp[1024];		/* Temporary make and model */

-      snprintf(temp, sizeof(temp), "%s %s", mfg, mdl);
+      if (mfg)
+	snprintf(temp, sizeof(temp), "%s %s", mfg, mdl);
+      else
+	snprintf(temp, sizeof(temp), "%s", mdl);
+
      _ppdNormalizeMakeAndModel(temp, make_model, make_model_size);
    }
  }
@@ -3,7 +3,7 @@
 *
 *   IPP backend for the Common UNIX Printing System (CUPS).
 *
- *   Copyright 2007-2009 by Apple Inc.
+ *   Copyright 2007-2010 by Apple Inc.
 *   Copyright 1997-2007 by Easy Software Products, all rights reserved.
 *
 *   These coded instructions, statements, and computer programs are the
@@ -45,6 +45,8 @@

 static char	*password = NULL;	/* Password for device URI */
 static int	password_tries = 0;	/* Password tries */
+static const char *auth_info_required = "none";
+					/* New auth-info-required value */
 #ifdef __APPLE__
 static char	pstmpname[1024] = "";	/* Temporary PostScript file name */
 #endif /* __APPLE__ */
@@ -91,7 +93,7 @@ main(int  argc,				/* I - Number of command-line args */
  int		num_options;		/* Number of printer options */
  cups_option_t	*options;		/* Printer options */
  const char	*device_uri;		/* Device URI */
-  char		method[255],		/* Method in URI */
+  char		scheme[255],		/* Scheme in URI */
 		hostname[1024],		/* Hostname */
 		username[255],		/* Username info */
 		resource[1024],		/* Resource info (printer name) */
@@ -236,21 +238,14 @@ main(int  argc,				/* I - Number of command-line args */
  if ((device_uri = cupsBackendDeviceURI(argv)) == NULL)
    return (CUPS_BACKEND_FAILED);

-  if (httpSeparateURI(HTTP_URI_CODING_ALL, device_uri,
-                      method, sizeof(method), username, sizeof(username),
-		      hostname, sizeof(hostname), &port,
-		      resource, sizeof(resource)) < HTTP_URI_OK)
-  {
-    _cupsLangPuts(stderr,
-                  _("ERROR: Missing device URI on command-line and no "
-		    "DEVICE_URI environment variable!\n"));
-    return (CUPS_BACKEND_STOP);
-  }
+  httpSeparateURI(HTTP_URI_CODING_ALL, device_uri, scheme, sizeof(scheme),
+                  username, sizeof(username), hostname, sizeof(hostname), &port,
+		  resource, sizeof(resource));

  if (!port)
    port = IPP_PORT;			/* Default to port 631 */

-  if (!strcmp(method, "https"))
+  if (!strcmp(scheme, "https"))
    cupsSetEncryption(HTTP_ENCRYPT_ALWAYS);
  else
    cupsSetEncryption(HTTP_ENCRYPT_IF_REQUESTED);
@@ -416,11 +411,12 @@ main(int  argc,				/* I - Number of command-line args */

    int			fd;		/* File descriptor */
    http_addrlist_t	*addrlist;	/* Address list */
-    char		buffer[8192];	/* Buffer for copying */
-    int			bytes;		/* Number of bytes read */
    off_t		tbytes;		/* Total bytes copied */


+    fputs("STATE: +connecting-to-device\n", stderr);
+    fprintf(stderr, "DEBUG: Looking up \"%s\"...\n", hostname);
+
    if ((addrlist = httpAddrGetList(hostname, AF_UNSPEC, "1")) == NULL)
    {
      _cupsLangPrintf(stderr, _("ERROR: Unable to locate printer \'%s\'!\n"),
@@ -438,23 +434,8 @@ main(int  argc,				/* I - Number of command-line args */

    _cupsLangPuts(stderr, _("INFO: Copying print data...\n"));

-    tbytes = 0;
-
-    while ((bytes = fread(buffer, 1, sizeof(buffer), stdin)) > 0)
-    {
-      if (write(fd, buffer, bytes) < bytes)
-      {
-        _cupsLangPrintError(_("ERROR: Unable to write to temporary file"));
-	close(fd);
-	unlink(tmpfilename);
-	return (CUPS_BACKEND_FAILED);
-      }
-      else
-        tbytes += bytes;
-
-      if (snmp_fd >= 0)
-	backendCheckSideChannel(snmp_fd, &(addrlist->addr));
-    }
+    tbytes = backendRunLoop(-1, fd, snmp_fd, &(addrlist->addr), 0, 0,
+                            backendNetworkSideCB);

    if (snmp_fd >= 0)
      _cupsSNMPClose(snmp_fd);
@@ -544,8 +525,7 @@ main(int  argc,				/* I - Number of command-line args */

  do
  {
-    fprintf(stderr, "DEBUG: Connecting to %s:%d\n",
-	    hostname, port);
+    fprintf(stderr, "DEBUG: Connecting to %s:%d\n", hostname, port);
    _cupsLangPuts(stderr, _("INFO: Connecting to printer...\n"));

    if ((http = httpConnectEncrypt(hostname, port, cupsEncryption())) == NULL)
@@ -661,7 +641,8 @@ main(int  argc,				/* I - Number of command-line args */
  * might contain username:password information...
  */

-  snprintf(uri, sizeof(uri), "%s://%s:%d%s", method, hostname, port, resource);
+  httpAssembleURI(HTTP_URI_CODING_ALL, uri, sizeof(uri), scheme, NULL, hostname,
+		  port, resource);

 /*
  * First validate the destination and see if the device supports multiple
@@ -702,6 +683,9 @@ main(int  argc,				/* I - Number of command-line args */

    fputs("DEBUG: Getting supported attributes...\n", stderr);

+    if (http->version < HTTP_1_1)
+      httpReconnect(http);
+
    if ((supported = cupsDoRequest(http, request, resource)) == NULL)
      ipp_status = cupsLastError();
    else
@@ -754,6 +738,15 @@ main(int  argc,				/* I - Number of command-line args */

 	return (CUPS_BACKEND_STOP);
      }
+      else if (ipp_status == IPP_NOT_AUTHORIZED || ipp_status == IPP_FORBIDDEN)
+      {
+	if (!strncmp(httpGetField(http, HTTP_FIELD_WWW_AUTHENTICATE),
+		     "Negotiate", 9))
+	  auth_info_required = "negotiate";
+
+	fprintf(stderr, "ATTR: auth-info-required=%s\n", auth_info_required);
+	return (CUPS_BACKEND_AUTH_REQUIRED);
+      }
      else
      {
 	_cupsLangPrintf(stderr,
@@ -1021,6 +1014,9 @@ main(int  argc,				/* I - Number of command-line args */
    * Do the request...
    */

+    if (http->version < HTTP_1_1)
+      httpReconnect(http);
+
    if (num_files > 1)
      response = cupsDoRequest(http, request, resource);
    else
@@ -1064,16 +1060,21 @@ main(int  argc,				/* I - Number of command-line args */
        _cupsLangPrintf(stderr, _("ERROR: Print file was not accepted (%s)!\n"),
 			cupsLastErrorString());

-	if (ipp_status == IPP_NOT_AUTHORIZED)
+	if (ipp_status == IPP_NOT_AUTHORIZED || ipp_status == IPP_FORBIDDEN)
 	{
 	  fprintf(stderr, "DEBUG: WWW-Authenticate=\"%s\"\n",
 		  httpGetField(http, HTTP_FIELD_WWW_AUTHENTICATE));

+         /*
+	  * Normal authentication goes through the password callback, which sets
+	  * auth_info_required to "username,password".  Kerberos goes directly
+	  * through GSSAPI, so look for Negotiate in the WWW-Authenticate header
+	  * here and set auth_info_required as needed...
+	  */
+
 	  if (!strncmp(httpGetField(http, HTTP_FIELD_WWW_AUTHENTICATE),
 		       "Negotiate", 9))
-	    fputs("ATTR: auth-info-required=negotiate\n", stderr);
-	  else
-	    fputs("ATTR: auth-info-required=username,password\n", stderr);
+	    auth_info_required = "negotiate";
 	}
      }
    }
@@ -1130,6 +1131,9 @@ main(int  argc,				/* I - Number of command-line args */
        ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_MIMETYPE,
 	             "document-format", NULL, content_type);

+	if (http->version < HTTP_1_1)
+	  httpReconnect(http);
+
        ippDelete(cupsDoFileRequest(http, request, resource, files[i]));

 	if (cupsLastError() > IPP_OK_CONFLICT)
@@ -1198,7 +1202,7 @@ main(int  argc,				/* I - Number of command-line args */
      * Do the request...
      */

-      if (!copies_sup)
+      if (!copies_sup || http->version < HTTP_1_1)
 	httpReconnect(http);

      response   = cupsDoRequest(http, request, resource);
@@ -1251,6 +1255,19 @@ main(int  argc,				/* I - Number of command-line args */
 	    break;
 	  }
 	}
+	else
+	{
+	 /*
+	  * If the printer does not return a job-state attribute, it does not
+	  * conform to the IPP specification - break out immediately and fail
+	  * the job...
+	  */
+
+          fputs("DEBUG: No job-state available from printer - stopping queue.\n",
+	        stderr);
+	  ipp_status = IPP_INTERNAL_ERROR;
+	  break;
+	}
      }

      ippDelete(response);
@@ -1295,6 +1312,15 @@ main(int  argc,				/* I - Number of command-line args */
      page_count > start_count)
    fprintf(stderr, "PAGE: total %d\n", page_count - start_count);

+#ifdef HAVE_GSSAPI
+ /*
+  * See if we used Kerberos at all...
+  */
+
+  if (http->gssctx)
+    auth_info_required = "negotiate";
+#endif /* HAVE_GSSAPI */
+
 /*
  * Free memory...
  */
@@ -1327,12 +1353,19 @@ main(int  argc,				/* I - Number of command-line args */
  * Return the queue status...
  */

-  if (ipp_status == IPP_NOT_AUTHORIZED)
+  fprintf(stderr, "ATTR: auth-info-required=%s\n", auth_info_required);
+
+  if (ipp_status == IPP_NOT_AUTHORIZED || ipp_status == IPP_FORBIDDEN)
    return (CUPS_BACKEND_AUTH_REQUIRED);
+  else if (ipp_status == IPP_INTERNAL_ERROR)
+    return (CUPS_BACKEND_STOP);
  else if (ipp_status > IPP_OK_CONFLICT)
    return (CUPS_BACKEND_FAILED);
  else
+  {
+    _cupsLangPuts(stderr, _("INFO: Ready to print.\n"));
    return (CUPS_BACKEND_OK);
+  }
 }


@@ -1369,6 +1402,9 @@ cancel_job(http_t     *http,		/* I - HTTP connection */
  * Do the request...
  */

+  if (http->version < HTTP_1_1)
+    httpReconnect(http);
+
  ippDelete(cupsDoRequest(http, request, resource));

  if (cupsLastError() > IPP_OK_CONFLICT)
@@ -1428,6 +1464,9 @@ check_printer_state(
  * Do the request...
  */

+  if (http->version < HTTP_1_1)
+    httpReconnect(http);
+
  if ((response = cupsDoRequest(http, request, resource)) != NULL)
  {
    report_printer_state(response, job_id);
@@ -1523,6 +1562,12 @@ password_cb(const char *prompt)		/* I - Prompt (not used) */
 {
  (void)prompt;

+ /*
+  * Remember that we need to authenticate...
+  */
+
+  auth_info_required = "username,password";
+
  if (password && *password && password_tries < 3)
  {
    password_tries ++;
@@ -1532,23 +1577,10 @@ password_cb(const char *prompt)		/* I - Prompt (not used) */
  else
  {
   /*
-    * If there is no password set in the device URI, return the
-    * "authentication required" exit code...
+    * Give up after 3 tries or if we don't have a password to begin with...
    */

-    if (tmpfilename[0])
-      unlink(tmpfilename);
-
-#ifdef __APPLE__
-    if (pstmpname[0])
-      unlink(pstmpname);
-#endif /* __APPLE__ */
-
-    fputs("ATTR: auth-info-required=username,password\n", stderr);
-
-    exit(CUPS_BACKEND_AUTH_REQUIRED);
-
-    return (NULL);			/* Eliminate compiler warning */
+    return (NULL);
  }
 }

@@ -1802,8 +1834,7 @@ run_pictwps_filter(char       **argv,	/* I - Command-line arguments */
    * file...
    */

-    close(1);
-    dup(fd);
+    dup2(fd, 1);
    close(fd);

    if (!getuid())
@@ -1812,8 +1843,11 @@ run_pictwps_filter(char       **argv,	/* I - Command-line arguments */
      * Change to an unpriviledged user...
      */

-      setgid(fileinfo.st_gid);
-      setuid(fileinfo.st_uid);
+      if (setgid(fileinfo.st_gid))
+        return (errno);
+
+      if (setuid(fileinfo.st_uid))
+        return (errno);
    }

    execlp("pictwpstops", printer, argv[1], argv[2], argv[3], argv[4], argv[5],
@@ -113,7 +113,7 @@ main(int  argc,				/* I - Number of command-line arguments (6 or 7) */
     char *argv[])			/* I - Command-line arguments */
 {
  const char	*device_uri;		/* Device URI */
-  char		method[255],		/* Method in URI */
+  char		scheme[255],		/* Scheme in URI */
 		hostname[1024],		/* Hostname */
 		username[255],		/* Username info */
 		resource[1024],		/* Resource info (printer name) */
@@ -193,9 +193,8 @@ main(int  argc,				/* I - Number of command-line arguments (6 or 7) */
  if ((device_uri = cupsBackendDeviceURI(argv)) == NULL)
    return (CUPS_BACKEND_FAILED);

-  httpSeparateURI(HTTP_URI_CODING_ALL, device_uri,
-                  method, sizeof(method), username, sizeof(username),
-		  hostname, sizeof(hostname), &port,
+  httpSeparateURI(HTTP_URI_CODING_ALL, device_uri, scheme, sizeof(scheme),
+                  username, sizeof(username), hostname, sizeof(hostname), &port,
 		  resource, sizeof(resource));

  if (!port)
@@ -426,10 +425,11 @@ main(int  argc,				/* I - Number of command-line arguments (6 or 7) */

    http_addrlist_t	*addrlist;	/* Address list */
    int			snmp_fd;	/* SNMP socket */
-    char		buffer[8192];	/* Buffer for copying */
-    int			bytes;		/* Number of bytes read */


+    fputs("STATE: +connecting-to-device\n", stderr);
+    fprintf(stderr, "DEBUG: Looking up \"%s\"...\n", hostname);
+
    if ((addrlist = httpAddrGetList(hostname, AF_UNSPEC, "1")) == NULL)
    {
      _cupsLangPrintf(stderr, _("ERROR: Unable to locate printer \'%s\'!\n"),
@@ -447,19 +447,8 @@ main(int  argc,				/* I - Number of command-line arguments (6 or 7) */

    _cupsLangPuts(stderr, _("INFO: Copying print data...\n"));

-    while ((bytes = fread(buffer, 1, sizeof(buffer), stdin)) > 0)
-    {
-      if (write(fd, buffer, bytes) < bytes)
-      {
-        _cupsLangPrintError(_("ERROR: Unable to write to temporary file"));
-	close(fd);
-	unlink(tmpfilename);
-	return (CUPS_BACKEND_FAILED);
-      }
-
-      if (snmp_fd >= 0)
-	backendCheckSideChannel(snmp_fd, &(addrlist->addr));
-    }
+    backendRunLoop(-1, fd, snmp_fd, &(addrlist->addr), 0, 0, 
+		   backendNetworkSideCB);

    if (snmp_fd >= 0)
      _cupsSNMPClose(snmp_fd);
@@ -695,6 +684,7 @@ lpd_queue(const char *hostname,		/* I - Host to connect to */

  sprintf(portname, "%d", port);

+  fputs("STATE: +connecting-to-device\n", stderr);
  fprintf(stderr, "DEBUG: Looking up \"%s\"...\n", hostname);

  if ((addrlist = httpAddrGetList(hostname, AF_UNSPEC, portname)) == NULL)
@@ -721,9 +711,8 @@ lpd_queue(const char *hostname,		/* I - Host to connect to */
    * First try to reserve a port for this connection...
    */

-    fputs("STATE: +connecting-to-device\n", stderr);
-    fprintf(stderr, "DEBUG: Connecting to %s:%d for printer %s\n",
-	    hostname, port, printer);
+    fprintf(stderr, "DEBUG: Connecting to %s:%d for printer %s\n", hostname,
+            port, printer);
    _cupsLangPuts(stderr, _("INFO: Connecting to printer...\n"));

    for (lport = reserve == RESERVE_RFC1179 ? 732 : 1024, addr = addrlist,
@@ -809,7 +798,6 @@ lpd_queue(const char *hostname,		/* I - Host to connect to */

      error = errno;
      close(fd);
-      fd = -1;

      if (addr->next)
        continue;
@@ -61,7 +61,7 @@ backendCheckSideChannel(
 * 'backendNetworkSideCB()' - Handle common network side-channel commands.
 */

-void
+int					/* O - -1 on error, 0 on success */
 backendNetworkSideCB(
    int         print_fd,		/* I - Print file or -1 */
    int         device_fd,		/* I - Device file or -1 */
@@ -79,10 +79,7 @@ backendNetworkSideCB(
  datalen = sizeof(data);

  if (cupsSideChannelRead(&command, &status, data, &datalen, 1.0))
-  {
-    _cupsLangPuts(stderr, _("WARNING: Failed to read side-channel request!\n"));
-    return;
-  }
+    return (-1);

  switch (command)
  {
@@ -173,9 +170,13 @@ backendNetworkSideCB(

 	        case CUPS_ASN1_BIT_STRING :
 	        case CUPS_ASN1_OCTET_STRING :
-		    i = (int)(sizeof(data) - (dataptr - data));
-		    if (packet.object_value.string.num_bytes < i)
+		    if (packet.object_value.string.num_bytes < 0)
+		      i = 0;
+		    else if (packet.object_value.string.num_bytes < 
+			     (sizeof(data) - (dataptr - data)))
 		      i = packet.object_value.string.num_bytes;
+		    else
+		      i = (int)(sizeof(data) - (dataptr - data));

 		    memcpy(dataptr, packet.object_value.string.bytes, i);

@@ -284,7 +285,7 @@ backendNetworkSideCB(
 	break;
  }

-  cupsSideChannelWrite(command, status, data, datalen, 1.0);
+  return (cupsSideChannelWrite(command, status, data, datalen, 1.0));
 }


@@ -1278,7 +1278,7 @@ int papCancelRequest(int sockfd, u_short tid)
 * 'sidechannel_request()' - Handle side-channel requests.
 */

-static void
+static int
 sidechannel_request()
 {
  cups_sc_command_t	command;	/* Request command */
@@ -1289,32 +1289,29 @@ sidechannel_request()
  datalen = sizeof(data);

  if (cupsSideChannelRead(&command, &status, data, &datalen, 1.0))
-  {
-    fputs(_("WARNING: Failed to read side-channel request!\n"), stderr);
-    return;
-  }
+    return (-1);

  switch (command)
  {
    case CUPS_SC_CMD_GET_BIDI:		/* Is the connection bidirectional? */
 	data[0] = 1;
-	cupsSideChannelWrite(command, CUPS_SC_STATUS_OK, data, 1, 1.0);
+	return (cupsSideChannelWrite(command, CUPS_SC_STATUS_OK, data, 1, 1.0));
 	break;

    case CUPS_SC_CMD_GET_STATE:		/* Return device state */
 	data[0] = CUPS_SC_STATE_ONLINE;
-	cupsSideChannelWrite(command, CUPS_SC_STATUS_OK, data, 1, 1.0);
+	return (cupsSideChannelWrite(command, CUPS_SC_STATUS_OK, data, 1, 1.0));
 	break;

    case CUPS_SC_CMD_DRAIN_OUTPUT:	/* Drain all pending output */
    case CUPS_SC_CMD_SOFT_RESET:	/* Do a soft reset */
    case CUPS_SC_CMD_GET_DEVICE_ID:	/* Return IEEE-1284 device ID */
    default:
-	cupsSideChannelWrite(command, CUPS_SC_STATUS_NOT_IMPLEMENTED, 
-			     NULL, 0, 1.0);
+	return (cupsSideChannelWrite(command, CUPS_SC_STATUS_NOT_IMPLEMENTED, 
+			             NULL, 0, 1.0));
 	break;
  }
-  return;
+  return (0);
 }


@@ -59,7 +59,7 @@
 */

 static void	list_devices(void);
-static void	side_cb(int print_fd, int device_fd, int snmp_fd,
+static int	side_cb(int print_fd, int device_fd, int snmp_fd,
 		        http_addr_t *addr, int use_bc);


@@ -284,7 +284,7 @@ main(int  argc,				/* I - Number of command-line arguments (6 or 7) */
      lseek(print_fd, 0, SEEK_SET);
    }

-    tbytes = backendRunLoop(print_fd, device_fd, -1, NULL, use_bc, side_cb);
+    tbytes = backendRunLoop(print_fd, device_fd, -1, NULL, use_bc, 1, side_cb);

    if (print_fd != 0 && tbytes >= 0)
      _cupsLangPrintf(stderr,
@@ -615,7 +615,7 @@ list_devices(void)
 * 'side_cb()' - Handle side-channel requests...
 */

-static void
+static int				/* O - 0 on success, -1 on error */
 side_cb(int         print_fd,		/* I - Print file */
        int         device_fd,		/* I - Device file */
        int         snmp_fd,		/* I - SNMP socket (unused) */
@@ -634,10 +634,7 @@ side_cb(int         print_fd,		/* I - Print file */
  datalen = sizeof(data);

  if (cupsSideChannelRead(&command, &status, data, &datalen, 1.0))
-  {
-    _cupsLangPuts(stderr, _("WARNING: Failed to read side-channel request!\n"));
-    return;
-  }
+    return (-1);

  switch (command)
  {
@@ -680,7 +677,7 @@ side_cb(int         print_fd,		/* I - Print file */
 	break;
  }

-  cupsSideChannelWrite(command, status, data, datalen, 1.0);
+  return (cupsSideChannelWrite(command, status, data, datalen, 1.0));
 }


@@ -147,7 +147,8 @@ backendRunLoop(
    int         snmp_fd,		/* I - SNMP socket or -1 if none */
    http_addr_t *addr,			/* I - Address of device */
    int         use_bc,			/* I - Use back-channel? */
-    void        (*side_cb)(int, int, int, http_addr_t *, int))
+    int         update_state,		/* I - Update printer-state-reasons? */
+    int         (*side_cb)(int, int, int, http_addr_t *, int))
 					/* I - Side-channel callback */
 {
  int		nfds;			/* Maximum file descriptor value + 1 */
@@ -196,6 +197,14 @@ backendRunLoop(
    signal(SIGTERM, SIG_IGN);
 #endif /* HAVE_SIGSET */
  }
+  else if (print_fd < 0)
+  {
+   /*
+    * Copy print data from stdin, but don't mess with the signal handlers...
+    */
+
+    print_fd = 0;
+  }

 /*
  * Figure out the maximum file descriptor value to use with select()...
@@ -237,7 +246,7 @@ backendRunLoop(
 	* Pause printing to clear any pending errors...
 	*/

-	if (errno == ENXIO && offline != 1)
+	if (errno == ENXIO && offline != 1 && update_state)
 	{
 	  fputs("STATE: +offline-report\n", stderr);
 	  _cupsLangPuts(stderr, _("INFO: Printer is currently offline.\n"));
@@ -266,7 +275,8 @@ backendRunLoop(
      * loop since it may have read from print_fd...
      */

-      (*side_cb)(print_fd, device_fd, snmp_fd, addr, use_bc);
+      if ((*side_cb)(print_fd, device_fd, snmp_fd, addr, use_bc))
+        side_cb = NULL;
      continue;
    }

@@ -342,7 +352,7 @@ backendRunLoop(

        if (errno == ENOSPC)
 	{
-	  if (paperout != 1)
+	  if (paperout != 1 && update_state)
 	  {
 	    fputs("STATE: +media-empty-warning\n", stderr);
 	    _cupsLangPuts(stderr, _("ERROR: Out of paper!\n"));
@@ -351,7 +361,7 @@ backendRunLoop(
        }
 	else if (errno == ENXIO)
 	{
-	  if (offline != 1)
+	  if (offline != 1 && update_state)
 	  {
 	    fputs("STATE: +offline-report\n", stderr);
 	    _cupsLangPuts(stderr, _("INFO: Printer is currently off-line.\n"));
@@ -367,13 +377,13 @@ backendRunLoop(
      }
      else
      {
-        if (paperout)
+        if (paperout && update_state)
 	{
 	  fputs("STATE: -media-empty-warning\n", stderr);
 	  paperout = 0;
 	}

-	if (offline)
+	if (offline && update_state)
 	{
 	  fputs("STATE: -offline-report\n", stderr);
 	  _cupsLangPuts(stderr, _("INFO: Printer is now online.\n"));
@@ -84,7 +84,7 @@
 */

 static void	list_devices(void);
-static void	side_cb(int print_fd, int device_fd, int use_bc);
+static int	side_cb(int print_fd, int device_fd, int use_bc);


 /*
@@ -109,7 +109,8 @@ main(int  argc,				/* I - Number of command-line arguments (6 or 7) */
 		sep;			/* Option separator */
  int		port;			/* Port number (not used) */
  int		copies;			/* Number of copies to print */
-  int		print_fd,		/* Print file */
+  int		side_eof = 0,		/* Saw EOF on side-channel? */
+		print_fd,		/* Print file */
 		device_fd;		/* Serial device */
  int		nfds;			/* Maximum file descriptor value + 1 */
  fd_set	input,			/* Input set for reading */
@@ -558,7 +559,7 @@ main(int  argc,				/* I - Number of command-line arguments (6 or 7) */
      if (!print_bytes)
 	FD_SET(print_fd, &input);
      FD_SET(device_fd, &input);
-      if (!print_bytes)
+      if (!print_bytes && !side_eof)
        FD_SET(CUPS_SC_FD, &input);

      FD_ZERO(&output);
@@ -579,7 +580,8 @@ main(int  argc,				/* I - Number of command-line arguments (6 or 7) */
 	* loop since it may have read from print_fd...
 	*/

-        side_cb(print_fd, device_fd, 1);
+        if (side_cb(print_fd, device_fd, 1))
+	  side_eof = 1;
 	continue;
      }

@@ -1278,7 +1280,7 @@ list_devices(void)
 * 'side_cb()' - Handle side-channel requests...
 */

-static void
+static int				/* O - 0 on success, -1 on error */
 side_cb(int print_fd,			/* I - Print file */
        int device_fd,			/* I - Device file */
 	int use_bc)			/* I - Using back-channel? */
@@ -1292,11 +1294,7 @@ side_cb(int print_fd,			/* I - Print file */
  datalen = sizeof(data);

  if (cupsSideChannelRead(&command, &status, data, &datalen, 1.0))
-  {
-    _cupsLangPuts(stderr,
-                  _("WARNING: Failed to read side-channel request!\n"));
-    return;
-  }
+    return (-1);

  switch (command)
  {
@@ -1323,7 +1321,7 @@ side_cb(int print_fd,			/* I - Print file */
 	break;
  }

-  cupsSideChannelWrite(command, status, data, datalen, 1.0);
+  return (cupsSideChannelWrite(command, status, data, datalen, 1.0));
 }


@@ -229,8 +229,13 @@ backendSNMPSupplies(
        packet.object_type != CUPS_ASN1_OCTET_STRING)
      return (-1);

-    new_state = (packet.object_value.string.bytes[0] << 8) |
-		packet.object_value.string.bytes[1];
+    if (packet.object_value.string.num_bytes == 2)
+      new_state = (packet.object_value.string.bytes[0] << 8) |
+		  packet.object_value.string.bytes[1];
+    else if (packet.object_value.string.num_bytes == 1)
+      new_state = (packet.object_value.string.bytes[0] << 8);
+    else
+      new_state = 0;

    if (current_state < 0)
      change_state = 0xffff;
@@ -999,7 +999,7 @@ read_snmp_response(int fd)		/* I - SNMP socket file descriptor */
 		       DEVICE_PRODUCT, LexmarkProductOID2);
 	_cupsSNMPWrite(fd, &(packet.address), CUPS_SNMP_VERSION_1,
 	               packet.community, CUPS_ASN1_GET_REQUEST,
-		       DEVICE_URI, LexmarkDeviceIdOID);
+		       DEVICE_ID, LexmarkDeviceIdOID);
 	_cupsSNMPWrite(fd, &(packet.address), CUPS_SNMP_VERSION_1,
 	               packet.community, CUPS_ASN1_GET_REQUEST,
 		       DEVICE_PRODUCT, XeroxProductOID);
@@ -1054,7 +1054,9 @@ read_snmp_response(int fd)		/* I - SNMP socket file descriptor */
 	break;

    case DEVICE_ID :
-	if (device && packet.object_type == CUPS_ASN1_OCTET_STRING)
+	if (device && packet.object_type == CUPS_ASN1_OCTET_STRING &&
+	    (!device->id ||
+	     strlen(device->id) < packet.object_value.string.num_bytes))
 	{
 	 /*
 	  * Update an existing cache entry...
@@ -1107,7 +1109,7 @@ read_snmp_response(int fd)		/* I - SNMP socket file descriptor */

    case DEVICE_URI :
 	if (device && packet.object_type == CUPS_ASN1_OCTET_STRING &&
-	    !device->uri)
+	    !device->uri && packet.object_value.string.num_bytes > 0)
 	{
 	 /*
 	  * Update an existing cache entry...
@@ -3,7 +3,7 @@
 *
 *   AppSocket backend for the Common UNIX Printing System (CUPS).
 *
- *   Copyright 2007-2008 by Apple Inc.
+ *   Copyright 2007-2010 by Apple Inc.
 *   Copyright 1997-2007 by Easy Software Products, all rights reserved.
 *
 *   These coded instructions, statements, and computer programs are the
@@ -62,7 +62,7 @@ main(int  argc,				/* I - Number of command-line arguments (6 or 7) */
     char *argv[])			/* I - Command-line arguments */
 {
  const char	*device_uri;		/* Device URI */
-  char		method[255],		/* Method in URI */
+  char		scheme[255],		/* Scheme in URI */
 		hostname[1024],		/* Hostname */
 		username[255],		/* Username info (not used) */
 		resource[1024],		/* Resource info (not used) */
@@ -168,9 +168,8 @@ main(int  argc,				/* I - Number of command-line arguments (6 or 7) */
  if ((device_uri = cupsBackendDeviceURI(argv)) == NULL)
    return (CUPS_BACKEND_FAILED);

-  httpSeparateURI(HTTP_URI_CODING_ALL, device_uri,
-                  method, sizeof(method), username, sizeof(username),
-		  hostname, sizeof(hostname), &port,
+  httpSeparateURI(HTTP_URI_CODING_ALL, device_uri, scheme, sizeof(scheme),
+                  username, sizeof(username), hostname, sizeof(hostname), &port,
 		  resource, sizeof(resource));

  if (port == 0)
@@ -261,6 +260,7 @@ main(int  argc,				/* I - Number of command-line arguments (6 or 7) */

  sprintf(portname, "%d", port);

+  fputs("STATE: +connecting-to-device\n", stderr);
  fprintf(stderr, "DEBUG: Looking up \"%s\"...\n", hostname);

  if ((addrlist = httpAddrGetList(hostname, AF_UNSPEC, portname)) == NULL)
@@ -270,12 +270,9 @@ main(int  argc,				/* I - Number of command-line arguments (6 or 7) */
    return (CUPS_BACKEND_STOP);
  }

-  fprintf(stderr, "DEBUG: Connecting to %s:%d\n",
-	  hostname, port);
+  fprintf(stderr, "DEBUG: Connecting to %s:%d\n", hostname, port);
  _cupsLangPuts(stderr, _("INFO: Connecting to printer...\n"));

-  fputs("STATE: +connecting-to-device\n", stderr);
-
  for (delay = 5;;)
  {
    if ((addr = httpAddrConnect(addrlist, &device_fd)) == NULL)
@@ -345,9 +342,8 @@ main(int  argc,				/* I - Number of command-line arguments (6 or 7) */
  if (recoverable)
  {
   /*
-    * If we've shown a recoverable error make sure the printer proxies
-    * have a chance to see the recovered message. Not pretty but
-    * necessary for now...
+    * If we've shown a recoverable error make sure the printer proxies have a
+    * chance to see the recovered message. Not pretty but necessary for now...
    */

    fputs("INFO: recovered: \n", stderr);
@@ -397,7 +393,7 @@ main(int  argc,				/* I - Number of command-line arguments (6 or 7) */
      lseek(print_fd, 0, SEEK_SET);
    }

-    tbytes = backendRunLoop(print_fd, device_fd, snmp_fd, &(addr->addr), 1,
+    tbytes = backendRunLoop(print_fd, device_fd, snmp_fd, &(addr->addr), 1, 0, 
                            backendNetworkSideCB);

    if (print_fd != 0 && tbytes >= 0)
@@ -410,6 +406,7 @@ main(int  argc,				/* I - Number of command-line arguments (6 or 7) */
 		      CUPS_LLCAST tbytes);
  }

+#ifdef __APPLE__
 /*
  * Wait up to 5 seconds to get any pending back-channel data...
  */
@@ -418,6 +415,7 @@ main(int  argc,				/* I - Number of command-line arguments (6 or 7) */
  while (wait_time >= time(&current_time))
    if (wait_bc(device_fd, wait_time - current_time) <= 0)
      break;
+#endif /* __APPLE__ */

  if (waiteof)
  {
@@ -16,9 +16,10 @@
 *
 * Contents:
 *
- *   main()    - Run the named backend.
- *   usage()   - Show usage information.
- *   walk_cb() - Show results of cupsSideChannelSNMPWalk...
+ *   main()            - Run the named backend.
+ *   sigterm_handler() - Flag when we get SIGTERM.
+ *   usage()           - Show usage information.
+ *   walk_cb()         - Show results of cupsSideChannelSNMPWalk...
 */

 /*
@@ -34,12 +35,21 @@
 #include <fcntl.h>
 #include <errno.h>
 #include <sys/wait.h>
+#include <signal.h>
+
+
+/*
+ * Local globals...
+ */
+
+static int	job_canceled = 0;


 /*
 * Local functions...
 */

+static void	sigterm_handler(int sig);
 static void	usage(void);
 static void	walk_cb(const char *oid, const char *data, int datalen,
 		        void *context);
@@ -58,6 +68,7 @@ main(int  argc,				/* I - Number of command-line args */
     char *argv[])			/* I - Command-line arguments */
 {
  int		first_arg,		/* First argument for backend */
+		do_cancel = 0,		/* Simulate a cancel-job via SIGTERM */
 		do_ps = 0,		/* Do PostScript query+test? */
 		do_pcl = 0,		/* Do PCL query+test? */
 		do_side_tests = 0,	/* Test side-channel ops? */
@@ -69,9 +80,12 @@ main(int  argc,				/* I - Number of command-line args */
  char		scheme[255],		/* Scheme in URI == backend */
 		backend[1024];		/* Backend path */
  const char	*serverbin;		/* CUPS_SERVERBIN environment variable */
-  int		back_fds[2],		/* Back-channel pipe */
+  int		fd,			/* Temporary file descriptor */
+		back_fds[2],		/* Back-channel pipe */
 		side_fds[2],		/* Side-channel socket */
 		data_fds[2],		/* Data pipe */
+		back_pid = -1,		/* Backend process ID */
+		data_pid = -1,		/* Trickle process ID */
 		pid,			/* Process ID */
 		status;			/* Exit status */

@@ -85,6 +99,8 @@ main(int  argc,				/* I - Number of command-line args */
       first_arg ++)
    if (!strcmp(argv[first_arg], "-d"))
      show_log = 1;
+    else if (!strcmp(argv[first_arg], "-cancel"))
+      do_cancel = 1;
    else if (!strcmp(argv[first_arg], "-pcl"))
      do_pcl = 1;
    else if (!strcmp(argv[first_arg], "-ps"))
@@ -160,33 +176,44 @@ main(int  argc,				/* I - Number of command-line args */
  * Execute the trickle process as needed...
  */

-  if (do_trickle || do_pcl || do_ps)
+  if (do_trickle || do_pcl || do_ps || do_cancel)
  {
    pipe(data_fds);

-    if ((pid = fork()) == 0)
+    signal(SIGTERM, sigterm_handler);
+
+    if ((data_pid = fork()) == 0)
    {
     /*
      * Trickle/query child comes here.  Rearrange file descriptors so that
      * FD 1, 3, and 4 point to the backend...
      */

-      close(0);
-      open("/dev/null", O_RDONLY);
+      if ((fd = open("/dev/null", O_RDONLY)) != 0)
+      {
+        dup2(fd, 0);
+	close(fd);
+      }

-      close(1);
-      dup(data_fds[1]);
+      if (data_fds[1] != 1)
+      {
+        dup2(data_fds[1], 1);
+	close(data_fds[1]);
+      }
      close(data_fds[0]);
-      close(data_fds[1]);

-      close(3);
-      dup(back_fds[0]);
-      close(back_fds[0]);
+      if (back_fds[0] != 3)
+      {
+        dup2(back_fds[0], 3);
+        close(back_fds[0]);
+      }
      close(back_fds[1]);

-      close(4);
-      dup(side_fds[0]);
-      close(side_fds[0]);
+      if (side_fds[0] != 4)
+      {
+        dup2(side_fds[0], 4);
+        close(side_fds[0]);
+      }
      close(side_fds[1]);

      if (do_trickle)
@@ -203,6 +230,97 @@ main(int  argc,				/* I - Number of command-line args */
 	  sleep(1);
 	}
      }
+      else if (do_cancel)
+      {
+       /*
+        * Write PS or PCL lines until we see SIGTERM...
+	*/
+
+        int	line = 0, page = 0;	/* Current line and page */
+	ssize_t	bytes;			/* Number of bytes of response data */
+	char	buffer[1024];		/* Output buffer */
+
+
+        if (do_pcl)
+	  write(1, "\033E", 2);
+	else
+	  write(1, "%!\n/Courier findfont 12 scalefont setfont 0 setgray\n", 52);
+
+        while (!job_canceled)
+	{
+	  if (line == 0)
+	  {
+	    page ++;
+
+	    if (do_pcl)
+	      snprintf(buffer, sizeof(buffer), "PCL Page %d\r\n\r\n", page);
+	    else
+	      snprintf(buffer, sizeof(buffer),
+	               "18 732 moveto (PS Page %d) show\n", page);
+
+	    write(1, buffer, strlen(buffer));
+	  }
+
+          line ++;
+
+	  if (do_pcl)
+	    snprintf(buffer, sizeof(buffer), "Line %d\r\n", line);
+	  else
+	    snprintf(buffer, sizeof(buffer), "18 %d moveto (Line %d) show\n",
+		     720 - line * 12, line);
+
+	  write(1, buffer, strlen(buffer));
+
+          if (line >= 55)
+	  {
+	   /*
+	    * Eject after 55 lines...
+	    */
+
+	    line = 0;
+	    if (do_pcl)
+	      write(1, "\014", 1);
+	    else
+	      write(1, "showpage\n", 9);
+	  }
+
+	 /*
+	  * Check for back-channel data...
+	  */
+
+	  if ((bytes = cupsBackChannelRead(buffer, sizeof(buffer), 0)) > 0)
+	    write(2, buffer, bytes);
+
+	 /*
+	  * Throttle output to ~100hz...
+	  */
+
+	  usleep(10000);
+	}
+
+       /*
+        * Eject current page with info...
+	*/
+
+        if (do_pcl)
+	  snprintf(buffer, sizeof(buffer),
+		   "Canceled on line %d of page %d\r\n\014\033E", line, page);
+	else
+	  snprintf(buffer, sizeof(buffer),
+	           "\n18 %d moveto (Canceled on line %d of page %d)\nshowpage\n",
+		   720 - line * 12, line, page);
+
+	write(1, buffer, strlen(buffer));
+
+       /*
+        * See if we get any back-channel data...
+	*/
+
+        while ((bytes = cupsBackChannelRead(buffer, sizeof(buffer), 5.0)) > 0)
+	  write(2, buffer, bytes);
+
+	exit(0);
+      }
      else
      {
       /*
@@ -282,7 +400,7 @@ main(int  argc,				/* I - Number of command-line args */

      exit(0);
    }
-    else if (pid < 0)
+    else if (data_pid < 0)
    {
      perror("testbackend: Unable to fork");
      return (1);
@@ -295,34 +413,43 @@ main(int  argc,				/* I - Number of command-line args */
  * Execute the backend...
  */

-  if ((pid = fork()) == 0)
+  if ((back_pid = fork()) == 0)
  {
   /*
    * Child comes here...
    */

-    if (do_trickle || do_ps)
+    if (do_trickle || do_ps || do_pcl || do_cancel)
    {
-      close(0);
-      dup(data_fds[0]);
-      close(data_fds[0]);
+      if (data_fds[0] != 0)
+      {
+        dup2(data_fds[0], 0);
+        close(data_fds[0]);
+      }
      close(data_fds[1]);
    }

    if (!show_log)
    {
-      close(2);
-      open("/dev/null", O_WRONLY);
+      if ((fd = open("/dev/null", O_WRONLY)) != 2)
+      {
+        dup2(fd, 2);
+	close(fd);
+      }
    }

-    close(3);
-    dup(back_fds[1]);
-    close(back_fds[0]);
+    if (back_fds[1] != 3)
+    {
+      dup2(back_fds[1], 3);
+      close(back_fds[0]);
+    }
    close(back_fds[1]);

-    close(4);
-    dup(side_fds[1]);
-    close(side_fds[0]);
+    if (side_fds[1] != 4)
+    {
+      dup2(side_fds[1], 4);
+      close(side_fds[0]);
+    }
    close(side_fds[1]);

    execv(backend, argv + first_arg);
@@ -330,7 +457,7 @@ main(int  argc,				/* I - Number of command-line args */
            strerror(errno));
    return (errno);
  }
-  else if (pid < 0)
+  else if (back_pid < 0)
  {
    perror("testbackend: Unable to fork");
    return (1);
@@ -340,20 +467,24 @@ main(int  argc,				/* I - Number of command-line args */
  * Parent comes here, setup back and side channel file descriptors...
  */

-  if (do_trickle || do_ps)
+  if (do_trickle || do_ps || do_pcl || do_cancel)
  {
    close(data_fds[0]);
    close(data_fds[1]);
  }

-  close(3);
-  dup(back_fds[0]);
-  close(back_fds[0]);
+  if (back_fds[0] != 3)
+  {
+    dup2(back_fds[0], 3);
+    close(back_fds[0]);
+  }
  close(back_fds[1]);

-  close(4);
-  dup(side_fds[0]);
-  close(side_fds[0]);
+  if (side_fds[0] != 4)
+  {
+    dup2(side_fds[0], 4);
+    close(side_fds[0]);
+  }
  close(side_fds[1]);

 /*
@@ -435,14 +566,26 @@ main(int  argc,				/* I - Number of command-line args */
    printf("CUPS_SC_CMD_SOFT_RESET returned %s\n", statuses[scstatus]);
  }

-  while (wait(&status) != pid);
-
-  if (status)
+  if (do_cancel)
  {
-    if (WIFEXITED(status))
-      printf("%s exited with status %d!\n", backend, WEXITSTATUS(status));
-    else
-      printf("%s crashed with signal %d!\n", backend, WTERMSIG(status));
+    sleep(1);
+    kill(data_pid, SIGTERM);
+    kill(back_pid, SIGTERM);
+  }
+  
+  while ((pid = wait(&status)) > 0)
+  {
+    if (status)
+    {
+      if (WIFEXITED(status))
+	printf("%s exited with status %d!\n",
+	       pid == back_pid ? backend : "test",
+	       WEXITSTATUS(status));
+      else
+	printf("%s crashed with signal %d!\n",
+	       pid == back_pid ? backend : "test",
+	       WTERMSIG(status));
+    }
  }

 /*
@@ -453,6 +596,19 @@ main(int  argc,				/* I - Number of command-line args */
 }


+/*
+ * 'sigterm_handler()' - Flag when we get SIGTERM.
+ */
+
+static void
+sigterm_handler(int sig)		/* I - Signal */
+{
+  (void)sig;
+
+  job_canceled = 1;
+}
+
+
 /*
 * 'usage()' - Show usage information.
 */
@@ -460,10 +616,11 @@ main(int  argc,				/* I - Number of command-line args */
 static void
 usage(void)
 {
-  puts("Usage: testbackend [-d] [-ps] [-s [-oid OID] [-walk OID]] [-t] "
-       "device-uri job-id user title copies options [file]");
+  puts("Usage: testbackend [-cancel] [-d] [-ps | -pcl] [-s [-oid OID] "
+       "[-walk OID]] [-t] device-uri job-id user title copies options [file]");
  puts("");
  puts("Options:");
+  puts("  -cancel     Simulate a canceled print job after 2 seconds.");
  puts("  -d          Show log messages from backend.");
  puts("  -oid OID    Lookup the specified SNMP OID.");
  puts("              (.1.3.6.1.2.1.43.10.2.1.4.1.1 is a good one for printers)");
@@ -105,11 +105,13 @@ extern char **environ;


 /*
- * WAIT_EOF_DELAY is number of seconds we'll wait for responses from
- * the printer after we've finished sending all the data
+ * DEBUG_WRITES, if defined, causes the backend to write data to the printer in
+ * 512 byte increments, up to 8192 bytes, to make debugging with a USB bus
+ * analyzer easier.
 */
-#define WAIT_EOF_DELAY			7
-#define WAIT_SIDE_DELAY			3
+
+#define DEBUG_WRITES 0
+
 #define DEFAULT_TIMEOUT			5000L

 #define	USB_INTERFACE_KIND		CFUUIDGetUUIDBytes(kIOUSBInterfaceInterfaceID190)
@@ -232,15 +234,13 @@ typedef struct globals_s

  int			print_fd;	/* File descriptor to print */
  ssize_t		print_bytes;	/* Print bytes read */
+#if DEBUG_WRITES
+  ssize_t		debug_bytes;	/* Current bytes to read */
+#endif /* DEBUG_WRITES */

  Boolean		wait_eof;
  int			drain_output;	/* Drain all pending output */
  int			bidi_flag;	/* 0=unidirectional, 1=bidirectional */
-
-  pthread_mutex_t	sidechannel_thread_mutex;
-  pthread_cond_t	sidechannel_thread_cond;
-  int			sidechannel_thread_stop;
-  int			sidechannel_thread_done;
 } globals_t;


@@ -281,9 +281,8 @@ static void status_timer_cb(CFRunLoopTimerRef timer, void *info);
 #if defined(__i386__) || defined(__x86_64__)
 static pid_t	child_pid;		/* Child PID */
 static void run_legacy_backend(int argc, char *argv[], int fd);	/* Starts child backend process running as a ppc executable */
-#endif /* __i386__ || __x86_64__ */
-static int	job_canceled = 0;	/* Was the job canceled? */
 static void sigterm_handler(int sig);	/* SIGTERM handler */
+#endif /* __i386__ || __x86_64__ */

 #ifdef PARSE_PS_ERRORS
 static const char *next_line (const char *buffer);
@@ -318,8 +317,7 @@ print_device(const char *uri,		/* I - Device URI */
 {
  char		  serial[1024];		/* Serial number buffer */
  OSStatus	  status;		/* Function results */
-  IOReturn	  iostatus,		/* Current IO status */
-		  prev_iostatus = 0;	/* Previous IO status */
+  IOReturn	  iostatus;		/* Current IO status */
  pthread_t	  read_thread_id,	/* Read thread */
 		  sidechannel_thread_id;/* Side-channel thread */
  int		  have_sidechannel = 0;	/* Was the side-channel thread started? */
@@ -335,7 +333,6 @@ print_device(const char *uri,		/* I - Device URI */
  UInt32	  bytes;		/* Bytes written */
  struct timeval  *timeout,		/* Timeout pointer */
 		  stimeout;		/* Timeout for select() */
-  struct timespec cond_timeout;		/* pthread condition timeout */


 /*
@@ -364,12 +361,12 @@ print_device(const char *uri,		/* I - Device URI */

  if (!g.make || !g.model)
  {
-    _cupsLangPuts(stderr, _("ERROR: Fatal USB error!\n"));
+    _cupsLangPuts(stderr, _("ERROR: Fatal USB error\n"));

    if (!g.make)
-      fputs("DEBUG: USB make string is NULL!\n", stderr);
+      fputs("DEBUG: USB make string is NULL\n", stderr);
    if (!g.model)
-      fputs("DEBUG: USB model string is NULL!\n", stderr);
+      fputs("DEBUG: USB model string is NULL\n", stderr);

    return (CUPS_BACKEND_STOP);
  }
@@ -422,7 +419,7 @@ print_device(const char *uri,		/* I - Device URI */
        strlcpy(print_buffer, "USB class driver", sizeof(print_buffer));

      fputs("STATE: +apple-missing-usbclassdriver-error\n", stderr);
-      _cupsLangPuts(stderr, _("ERROR: Fatal USB error!\n"));
+      _cupsLangPuts(stderr, _("ERROR: Fatal USB error\n"));
      fprintf(stderr, "DEBUG: Could not load %s\n", print_buffer);

      if (driverBundlePath)
@@ -451,9 +448,9 @@ print_device(const char *uri,		/* I - Device URI */
  fputs("STATE: -connecting-to-device\n", stderr);

  /*
-   * Now that we are "connected" to the port, catch SIGTERM so that we
+   * Now that we are "connected" to the port, ignore SIGTERM so that we
   * can finish out any page data the driver sends (e.g. to eject the
-   * current page...  Only catch SIGTERM if we are printing data from
+   * current page...  Only ignore SIGTERM if we are printing data from
   * stdin (otherwise you can't cancel raw jobs...)
   */

@@ -465,7 +462,7 @@ print_device(const char *uri,		/* I - Device URI */
    memset(&action, 0, sizeof(action));

    sigemptyset(&action.sa_mask);
-    action.sa_handler = sigterm_handler;
+    action.sa_handler = SIG_IGN;
    sigaction(SIGTERM, &action, NULL);
  }

@@ -479,16 +476,11 @@ print_device(const char *uri,		/* I - Device URI */

  if (have_sidechannel)
  {
-    g.sidechannel_thread_stop = 0;
-    g.sidechannel_thread_done = 0;
-
-    pthread_cond_init(&g.sidechannel_thread_cond, NULL);
-    pthread_mutex_init(&g.sidechannel_thread_mutex, NULL);
-
    if (pthread_create(&sidechannel_thread_id, NULL, sidechannel_thread, NULL))
    {
-      _cupsLangPuts(stderr, _("ERROR: Fatal USB error!\n"));
-      fputs("DEBUG: Couldn't create side-channel thread!\n", stderr);
+      _cupsLangPuts(stderr, _("ERROR: Fatal USB error\n"));
+      fputs("DEBUG: Couldn't create side-channel thread\n", stderr);
+      registry_close();
      return (CUPS_BACKEND_STOP);
    }
  }
@@ -505,8 +497,9 @@ print_device(const char *uri,		/* I - Device URI */

  if (pthread_create(&read_thread_id, NULL, read_thread, NULL))
  {
-    _cupsLangPuts(stderr, _("ERROR: Fatal USB error!\n"));
-    fputs("DEBUG: Couldn't create read thread!\n", stderr);
+    _cupsLangPuts(stderr, _("ERROR: Fatal USB error\n"));
+    fputs("DEBUG: Couldn't create read thread\n", stderr);
+    registry_close();
    return (CUPS_BACKEND_STOP);
  }

@@ -584,14 +577,16 @@ print_device(const char *uri,		/* I - Device URI */
 	if (errno == EINTR && total_bytes == 0)
 	{
 	  fputs("DEBUG: Received an interrupt before any bytes were "
-	        "written, aborting!\n", stderr);
+	        "written, aborting\n", stderr);
+          registry_close();
          return (CUPS_BACKEND_OK);
 	}
 	else if (errno != EAGAIN && errno != EINTR)
 	{
-	  _cupsLangPuts(stderr, _("ERROR: Unable to read print data!\n"));
+	  _cupsLangPuts(stderr, _("ERROR: Unable to read print data\n"));
 	  perror("DEBUG: select");
-	  return (CUPS_BACKEND_FAILED);
+	  registry_close();
+          return (CUPS_BACKEND_FAILED);
 	}
      }

@@ -612,7 +607,16 @@ print_device(const char *uri,		/* I - Device URI */

      if (FD_ISSET(print_fd, &input_set))
      {
+#if DEBUG_WRITES
+	g.debug_bytes += 512;
+        if (g.debug_bytes > sizeof(print_buffer))
+	  g.debug_bytes = 512;
+
+	g.print_bytes = read(print_fd, print_buffer, g.debug_bytes);
+
+#else
 	g.print_bytes = read(print_fd, print_buffer, sizeof(print_buffer));
+#endif /* DEBUG_WRITES */

 	if (g.print_bytes < 0)
 	{
@@ -622,8 +626,9 @@ print_device(const char *uri,		/* I - Device URI */

 	  if (errno != EAGAIN && errno != EINTR)
 	  {
-	    _cupsLangPuts(stderr, _("ERROR: Unable to read print data!\n"));
+	    _cupsLangPuts(stderr, _("ERROR: Unable to read print data\n"));
 	    perror("DEBUG: read");
+	    registry_close();
 	    return (CUPS_BACKEND_FAILED);
 	  }

@@ -646,8 +651,7 @@ print_device(const char *uri,		/* I - Device URI */

      if (g.print_bytes)
      {
-	bytes = g.print_bytes;
-
+	bytes    = g.print_bytes;
 	iostatus = (*g.classdriver)->WritePipe(g.classdriver, (UInt8*)print_ptr, &bytes, 0);

       /*
@@ -656,27 +660,42 @@ print_device(const char *uri,		/* I - Device URI */
 	*/

 	if (iostatus == kIOUSBTransactionTimeout)
-	  iostatus = 0;
-
-       /*
-        * Ignore stall errors, since we clear any stalls in the class driver...
-	*/
-
-	if (iostatus == kIOUSBPipeStalled)
-	  iostatus = 0;
-
-       /*
-	* Ignore the first "aborted" status we get, since we might have
-	* received a signal (<rdar://problem/6860126>)...
-	*/
-
-	if (iostatus == kIOReturnAborted && prev_iostatus != kIOReturnAborted)
 	{
-	  prev_iostatus = iostatus;
-	  iostatus      = 0;
+	  fputs("DEBUG: Got USB transaction timeout during write\n", stderr);
+	  iostatus = 0;
 	}
-	else
-	  prev_iostatus = iostatus;
+
+       /*
+        * If we've stalled, retry the write...
+	*/
+
+	else if (iostatus == kIOUSBPipeStalled)
+	{
+	  fputs("DEBUG: Got USB pipe stalled during write\n", stderr);
+
+	  bytes    = g.print_bytes;
+	  iostatus = (*g.classdriver)->WritePipe(g.classdriver, (UInt8*)print_ptr, &bytes, 0);
+	}
+
+       /*
+	* Retry a write after an aborted write since we probably just got
+	* SIGTERM (<rdar://problem/6860126>)...
+	*/
+
+	else if (iostatus == kIOReturnAborted)
+	{
+	  fputs("DEBUG: Got USB return aborted during write\n", stderr);
+
+	  IOReturn err = (*g.classdriver)->Abort(g.classdriver);
+	  fprintf(stderr, "DEBUG: USB class driver Abort returned %x\n", err);
+
+#if DEBUG_WRITES
+          sleep(5);
+#endif /* DEBUG_WRITES */
+
+	  bytes    = g.print_bytes;
+	  iostatus = (*g.classdriver)->WritePipe(g.classdriver, (UInt8*)print_ptr, &bytes, 0);
+        }

 	if (iostatus || bytes < 0)
 	{
@@ -684,21 +703,25 @@ print_device(const char *uri,		/* I - Device URI */
 	  * Write error - bail if we don't see an error we can retry...
 	  */

-	  IOReturn err = (*g.classdriver)->Abort(g.classdriver);
-	  _cupsLangPuts(stderr, _("ERROR: Unable to send print data!\n"));
+	  _cupsLangPuts(stderr, _("ERROR: Unable to send print data\n"));
 	  fprintf(stderr, "DEBUG: USB class driver WritePipe returned %x\n",
 	          iostatus);
+
+	  IOReturn err = (*g.classdriver)->Abort(g.classdriver);
 	  fprintf(stderr, "DEBUG: USB class driver Abort returned %x\n",
 	          err);
-	  status = job_canceled ? CUPS_BACKEND_FAILED : CUPS_BACKEND_STOP;
+
+	  status = CUPS_BACKEND_FAILED;
 	  break;
 	}
+	else if (bytes > 0)
+	{
+	  fprintf(stderr, "DEBUG: Wrote %d bytes of print data...\n", (int)bytes);

-        fprintf(stderr, "DEBUG: Wrote %d bytes of print data...\n", (int)bytes);
-
-        g.print_bytes -= bytes;
-	print_ptr   += bytes;
-	total_bytes += bytes;
+	  g.print_bytes -= bytes;
+	  print_ptr   += bytes;
+	  total_bytes += bytes;
+	}
      }

      if (print_fd != 0 && status == noErr)
@@ -709,86 +732,6 @@ print_device(const char *uri,		/* I - Device URI */

  fprintf(stderr, "DEBUG: Sent %lld bytes...\n", (off_t)total_bytes);

- /*
-  * Wait for the side channel thread to exit...
-  */
-
-  if (have_sidechannel)
-  {
-    close(CUPS_SC_FD);
-    pthread_mutex_lock(&g.readwrite_lock_mutex);
-    g.readwrite_lock = 0;
-    pthread_cond_signal(&g.readwrite_lock_cond);
-    pthread_mutex_unlock(&g.readwrite_lock_mutex);
-
-    g.sidechannel_thread_stop = 1;
-    pthread_mutex_lock(&g.sidechannel_thread_mutex);
-    if (!g.sidechannel_thread_done)
-    {
-     /*
-      * Wait for the side-channel thread to exit...
-      */
-
-      cond_timeout.tv_sec  = time(NULL) + WAIT_SIDE_DELAY;
-      cond_timeout.tv_nsec = 0;
-      if (pthread_cond_timedwait(&g.sidechannel_thread_cond,
-			         &g.sidechannel_thread_mutex,
-				 &cond_timeout) != 0)
-      {
-       /*
-	* Force the side-channel thread to exit...
-	*/
-
-	pthread_kill(sidechannel_thread_id, SIGTERM);
-      }
-    }
-    pthread_mutex_unlock(&g.sidechannel_thread_mutex);
-
-    pthread_join(sidechannel_thread_id, NULL);
-
-    pthread_cond_destroy(&g.sidechannel_thread_cond);
-    pthread_mutex_destroy(&g.sidechannel_thread_mutex);
-  }
-
-  pthread_cond_destroy(&g.readwrite_lock_cond);
-  pthread_mutex_destroy(&g.readwrite_lock_mutex);
-
- /*
-  * Signal the read thread to stop...
-  */
-
-  g.read_thread_stop = 1;
-
- /*
-  * Give the read thread WAIT_EOF_DELAY seconds to complete all the data. If
-  * we are not signaled in that time then force the thread to exit.
-  */
-
-  pthread_mutex_lock(&g.read_thread_mutex);
-
-  if (!g.read_thread_done)
-  {
-    cond_timeout.tv_sec = time(NULL) + WAIT_EOF_DELAY;
-    cond_timeout.tv_nsec = 0;
-
-    if (pthread_cond_timedwait(&g.read_thread_cond, &g.read_thread_mutex,
-                               &cond_timeout) != 0)
-    {
-     /*
-      * Force the read thread to exit...
-      */
-
-      g.wait_eof = 0;
-      pthread_kill(read_thread_id, SIGTERM);
-    }
-  }
-  pthread_mutex_unlock(&g.read_thread_mutex);
-
-  pthread_join(read_thread_id, NULL);	/* wait for the read thread to return */
-
-  pthread_cond_destroy(&g.read_thread_cond);
-  pthread_mutex_destroy(&g.read_thread_mutex);
-
 /*
  * Close the connection and input file and general clean up...
  */
@@ -844,6 +787,8 @@ static void *read_thread(void *reference)
    readstatus = (*g.classdriver)->ReadPipe(g.classdriver, readbuffer, &rbytes);
    if (readstatus == kIOReturnSuccess && rbytes > 0)
    {
+      fprintf(stderr, "DEBUG: Read %d bytes of back-channel data...\n",
+              (int)rbytes);
      cupsBackChannelWrite((char*)readbuffer, rbytes, 1.0);

      /* cntrl-d is echoed by the printer.
@@ -858,6 +803,12 @@ static void *read_thread(void *reference)
      parse_pserror(readbuffer, rbytes);
 #endif
    }
+    else if (readstatus == kIOUSBTransactionTimeout)
+      fputs("DEBUG: Got USB transaction timeout during read\n", stderr);
+    else if (readstatus == kIOUSBPipeStalled)
+      fputs("DEBUG: Got USB pipe stalled during read\n", stderr);
+    else if (readstatus == kIOReturnAborted)
+      fputs("DEBUG: Got USB return aborted during read\n", stderr);

   /*
    * Make sure this loop executes no more than once every 250 miliseconds...
@@ -899,55 +850,97 @@ sidechannel_thread(void *reference)
    datalen = sizeof(data);

    if (cupsSideChannelRead(&command, &status, data, &datalen, 1.0))
-      continue;
+    {
+      if (status == CUPS_SC_STATUS_TIMEOUT)
+	continue;
+      else
+	break;
+    }

    switch (command)
    {
      case CUPS_SC_CMD_SOFT_RESET:	/* Do a soft reset */
+	  fputs("DEBUG: CUPS_SC_CMD_SOFT_RESET received from driver...\n",
+		stderr);
+
          if ((*g.classdriver)->SoftReset != NULL)
 	  {
 	    soft_reset();
 	    cupsSideChannelWrite(command, CUPS_SC_STATUS_OK, NULL, 0, 1.0);
+	    fputs("DEBUG: Returning status CUPS_STATUS_OK with no bytes...\n",
+	          stderr);
 	  }
 	  else
 	  {
 	    cupsSideChannelWrite(command, CUPS_SC_STATUS_NOT_IMPLEMENTED,
 	                         NULL, 0, 1.0);
+	    fputs("DEBUG: Returning status CUPS_STATUS_NOT_IMPLEMENTED with "
+	          "no bytes...\n", stderr);
 	  }
 	  break;

      case CUPS_SC_CMD_DRAIN_OUTPUT:	/* Drain all pending output */
+	  fputs("DEBUG: CUPS_SC_CMD_DRAIN_OUTPUT received from driver...\n",
+		stderr);
+
 	  g.drain_output = 1;
 	  break;

      case CUPS_SC_CMD_GET_BIDI:		/* Is the connection bidirectional? */
+	  fputs("DEBUG: CUPS_SC_CMD_GET_BIDI received from driver...\n",
+		stderr);
+
 	  data[0] = g.bidi_flag;
 	  cupsSideChannelWrite(command, CUPS_SC_STATUS_OK, data, 1, 1.0);
+
+	  fprintf(stderr,
+	          "DEBUG: Returned CUPS_SC_STATUS_OK with 1 byte (%02X)...\n",
+		  data[0]);
 	  break;

      case CUPS_SC_CMD_GET_DEVICE_ID:	/* Return IEEE-1284 device ID */
+	  fputs("DEBUG: CUPS_SC_CMD_GET_DEVICE_ID received from driver...\n",
+		stderr);
+
 	  datalen = sizeof(data);
 	  get_device_id(&status, data, &datalen);
 	  cupsSideChannelWrite(command, CUPS_SC_STATUS_OK, data, datalen, 1.0);
+
+          if (datalen < sizeof(data))
+	    data[datalen] = '\0';
+	  else
+	    data[sizeof(data) - 1] = '\0';
+
+	  fprintf(stderr,
+	          "DEBUG: Returning CUPS_SC_STATUS_OK with %d bytes (%s)...\n",
+		  datalen, data);
 	  break;

      case CUPS_SC_CMD_GET_STATE:		/* Return device state */
+	  fputs("DEBUG: CUPS_SC_CMD_GET_STATE received from driver...\n",
+		stderr);
+
 	  data[0] = CUPS_SC_STATE_ONLINE;
 	  cupsSideChannelWrite(command, CUPS_SC_STATUS_OK, data, 1, 1.0);
+
+	  fprintf(stderr,
+	          "DEBUG: Returned CUPS_SC_STATUS_OK with 1 byte (%02X)...\n",
+		  data[0]);
 	  break;

      default:
+	  fprintf(stderr, "DEBUG: Unknown side-channel command (%d) received "
+			  "from driver...\n", command);
+
 	  cupsSideChannelWrite(command, CUPS_SC_STATUS_NOT_IMPLEMENTED,
 			       NULL, 0, 1.0);
+
+	  fputs("DEBUG: Returned CUPS_SC_STATUS_NOT_IMPLEMENTED with no bytes...\n",
+		stderr);
 	  break;
    }
  }
-  while (!g.sidechannel_thread_stop);
-
-  pthread_mutex_lock(&g.sidechannel_thread_mutex);
-  g.sidechannel_thread_done = 1;
-  pthread_cond_signal(&g.sidechannel_thread_cond);
-  pthread_mutex_unlock(&g.sidechannel_thread_mutex);
+  while (1);

  return NULL;
 }
@@ -1078,7 +1071,7 @@ static Boolean list_device_cb(void *refcon,
 	snprintf(optionsstr, sizeof(optionsstr), "?location=%x", (unsigned)deviceLocation);

      httpAssembleURI(HTTP_URI_CODING_ALL, uristr, sizeof(uristr), "usb", NULL, makestr, 0, modelstr);
-      strncat(uristr, optionsstr, sizeof(uristr));
+      strlcat(uristr, optionsstr, sizeof(uristr));

      cupsBackendReport("direct", uristr, make_modelstr, make_modelstr, idstr,
                        NULL);
@@ -1815,6 +1808,7 @@ static void run_legacy_backend(int argc,
    * Setup a SIGTERM handler then block it before forking...
    */

+    int			err;		/* posix_spawn result */
    struct sigaction	action;		/* POSIX signal action */
    sigset_t		newmask,	/* New signal mask */
 			oldmask;	/* Old signal mask */
@@ -1863,7 +1857,7 @@ static void run_legacy_backend(int argc,
 #  else
 	perror("DEBUG: Unable to set binary preference to ppc");
 #  endif /* __x86_64__ */
-	_cupsLangPrintf(stderr, _("Unable to use legacy USB class driver!\n"));
+	_cupsLangPrintf(stderr, _("Unable to use legacy USB class driver\n"));
 	exit(CUPS_BACKEND_STOP);
      }
    }
@@ -1881,11 +1875,12 @@ static void run_legacy_backend(int argc,

    my_argv[i] = NULL;

-    if (posix_spawn(&child_pid, usbpath, NULL, &attrs, my_argv, environ))
+    if ((err = posix_spawn(&child_pid, usbpath, NULL, &attrs, my_argv,
+                           environ)) != 0)
    {
      fprintf(stderr, "DEBUG: Unable to exec %s: %s\n", usbpath,
-              strerror(errno));
-      _cupsLangPrintf(stderr, _("Unable to use legacy USB class driver!\n"));
+              strerror(err));
+      _cupsLangPrintf(stderr, _("Unable to use legacy USB class driver\n"));
      exit(CUPS_BACKEND_STOP);
    }

@@ -1911,14 +1906,14 @@ static void run_legacy_backend(int argc,
    if (WIFSIGNALED(childstatus))
    {
      exitstatus = CUPS_BACKEND_STOP;
-      fprintf(stderr, "DEBUG: usb(legacy) backend %d crashed on signal %d!\n",
+      fprintf(stderr, "DEBUG: usb(legacy) backend %d crashed on signal %d\n",
              child_pid, WTERMSIG(childstatus));
    }
    else
    {
      if ((exitstatus = WEXITSTATUS(childstatus)) != 0)
 	fprintf(stderr,
-	        "DEBUG: usb(legacy) backend %d stopped with status %d!\n",
+	        "DEBUG: usb(legacy) backend %d stopped with status %d\n",
 		child_pid, exitstatus);
      else
 	fprintf(stderr, "DEBUG: usb(legacy) backend %d exited with no errors\n",
@@ -1933,8 +1928,6 @@ static void run_legacy_backend(int argc,

  exit(exitstatus);
 }
-#endif /* __i386__ || __x86_64__ */
-

 /*
 * 'sigterm_handler()' - SIGTERM handler.
@@ -1943,7 +1936,8 @@ static void run_legacy_backend(int argc,
 static void
 sigterm_handler(int sig)		/* I - Signal */
 {
-#if defined(__i386__) || defined(__x86_64__)
+  /* If we started a child process pass the signal on to it...
+   */
  if (child_pid)
  {
   /*
@@ -1961,19 +1955,14 @@ sigterm_handler(int sig)		/* I - Signal */
      exit(0);
    else
    {
-      fprintf(stderr, "DEBUG: Child crashed on signal %d!\n", status);
+      fprintf(stderr, "DEBUG: Child crashed on signal %d\n", status);
      exit(CUPS_BACKEND_STOP);
    }
  }
-#endif /* __i386__ || __x86_64__ */
-
- /*
-  * Otherwise just flag that the job has been canceled...
-  */
-
-  job_canceled = 1;
 }

+#endif /* __i386__ || __x86_64__ */
+

 #ifdef PARSE_PS_ERRORS
 /*
@@ -2123,12 +2112,11 @@ static void get_device_id(cups_sc_status_t *status,
 			  char *data,
 			  int *datalen)
 {
-  UInt32 deviceLocation = 0;
-  UInt8	interfaceNum = 0;
  CFStringRef deviceIDString = NULL;

  /* GetDeviceID */
-  copy_devicestring(g.printer_obj, &deviceIDString, &deviceLocation, &interfaceNum);
+  copy_deviceid(g.classdriver, &deviceIDString);
+
  if (deviceIDString)
  {
    CFStringGetCString(deviceIDString, data, *datalen, kCFStringEncodingUTF8);
@@ -158,7 +158,16 @@ print_device(const char *uri,		/* I - Device URI */

    while (poll(pfds, 2, -1) > 0)
    {
-      if (pfds[0].revents & POLLIN)
+     /*
+      * CUPS STR #3318: USB process hangs on end-of-file, making further
+      *                 printing impossible
+      *
+      * From a strict interpretation of POSIX poll(), POLLHUP should never be
+      * set without POLLIN, since POLLIN is the event you request.  That said,
+      * it appears that some versions of Linux break this.
+      */
+
+      if (pfds[0].revents & (POLLIN | POLLHUP))
      {
 	if ((bytes = read(print_fd, buffer, sizeof(buffer))) > 0)
 	{
@@ -178,8 +187,13 @@ print_device(const char *uri,		/* I - Device URI */
 	  break;
      }

-      if (pfds[1].revents & POLLIN)
-        tbytes += side_cb(printer, print_fd);
+      if (pfds[1].revents & (POLLIN | POLLHUP))
+      {
+        if ((bytes = side_cb(printer, print_fd)) < 0)
+	  pfds[1].events = 0;		/* Filter has gone away... */
+	else
+          tbytes += bytes;
+      }
    }
  }

@@ -418,12 +432,14 @@ get_device_id(usb_printer_t *printer,	/* I - Printer */
  * and then limit the length to the size of our buffer...
  */

-  if (length > (bufsize - 2))
+  if (length > bufsize)
    length = (((unsigned)buffer[1] & 255) << 8) +
 	     ((unsigned)buffer[0] & 255);

-  if (length > (bufsize - 2))
-    length = bufsize - 2;
+  if (length > bufsize)
+    length = bufsize;
+
+  length -= 2;

 /*
  * Copy the device ID text to the beginning of the buffer and
@@ -743,10 +759,7 @@ side_cb(usb_printer_t *printer,		/* I - Printer */
  datalen = sizeof(data);

  if (cupsSideChannelRead(&command, &status, data, &datalen, 1.0))
-  {
-    _cupsLangPuts(stderr, _("WARNING: Failed to read side-channel request!\n"));
-    return (0);
-  }
+    return (-1);

  switch (command)
  {
@@ -5,7 +5,7 @@
 *
 *   This file is included from "usb.c" when compiled on UNIX/Linux.
 *
- *   Copyright 2007-2008 by Apple Inc.
+ *   Copyright 2007-2009 by Apple Inc.
 *   Copyright 1997-2007 by Easy Software Products, all rights reserved.
 *
 *   These coded instructions, statements, and computer programs are the
@@ -36,7 +36,7 @@
 */

 static int	open_device(const char *uri, int *use_bc);
-static void	side_cb(int print_fd, int device_fd, int snmp_fd,
+static int	side_cb(int print_fd, int device_fd, int snmp_fd,
 		        http_addr_t *addr, int use_bc);


@@ -187,10 +187,10 @@ print_device(const char *uri,		/* I - Device URI */
    * select() or poll(), so we can't support the sidechannel either...
    */

-    tbytes = backendRunLoop(print_fd, device_fd, -1, NULL, use_bc, NULL);
+    tbytes = backendRunLoop(print_fd, device_fd, -1, NULL, use_bc, 1, NULL);

 #else
-    tbytes = backendRunLoop(print_fd, device_fd, -1, NULL, use_bc, side_cb);
+    tbytes = backendRunLoop(print_fd, device_fd, -1, NULL, use_bc, 1, side_cb);
 #endif /* __sun */

    if (print_fd != 0 && tbytes >= 0)
@@ -560,7 +560,7 @@ open_device(const char *uri,		/* I - Device URI */
 * 'side_cb()' - Handle side-channel requests...
 */

-static void
+static int				/* O - 0 on success, -1 on error */
 side_cb(int         print_fd,		/* I - Print file */
        int         device_fd,		/* I - Device file */
        int         snmp_fd,		/* I - SNMP socket (unused) */
@@ -579,10 +579,7 @@ side_cb(int         print_fd,		/* I - Print file */
  datalen = sizeof(data);

  if (cupsSideChannelRead(&command, &status, data, &datalen, 1.0))
-  {
-    _cupsLangPuts(stderr, _("WARNING: Failed to read side-channel request!\n"));
-    return;
-  }
+    return (-1);

  switch (command)
  {
@@ -625,7 +622,7 @@ side_cb(int         print_fd,		/* I - Print file */
 	break;
  }

-  cupsSideChannelWrite(command, status, data, datalen, 1.0);
+  return (cupsSideChannelWrite(command, status, data, datalen, 1.0));
 }


@@ -340,7 +340,18 @@ show_jobs(const char *command,		/* I - Command name */
  char		resource[1024];		/* Resource string */
  char		rankstr[255];		/* Rank string */
  char		namestr[1024];		/* Job name string */
-  static const char *ranks[10] =	/* Ranking strings */
+  static const char * const jobattrs[] =/* Job attributes we want to see */
+		{
+		  "copies",
+		  "job-id",
+		  "job-k-octets",
+		  "job-name",
+		  "job-originating-user-name",
+		  "job-printer-uri",
+		  "job-priority",
+		  "job-state"
+		};
+  static const char * const ranks[10] =	/* Ranking strings */
 		{
 		  "th",
 		  "st",
@@ -368,6 +379,7 @@ show_jobs(const char *command,		/* I - Command name */
  *    attributes-charset
  *    attributes-natural-language
  *    job-uri or printer-uri
+  *    requested-attributes
  */

  request = ippNewRequest(id ? IPP_GET_JOB_ATTRIBUTES : IPP_GET_JOBS);
@@ -397,6 +409,10 @@ show_jobs(const char *command,		/* I - Command name */
    ippAddBoolean(request, IPP_TAG_OPERATION, "my-jobs", 1);
  }

+  ippAddStrings(request, IPP_TAG_OPERATION, IPP_TAG_KEYWORD,
+                "requested-attributes",
+                (int)(sizeof(jobattrs) / sizeof(jobattrs[0])), NULL, jobattrs);
+
 /*
  * Do the request and get back a response...
  */
@@ -1,9 +1,9 @@
 #
 # "$Id$"
 #
-#   CGI makefile for the Common UNIX Printing System (CUPS).
+#   CGI makefile for CUPS.
 #
-#   Copyright 2007-2009 by Apple Inc.
+#   Copyright 2007-2010 by Apple Inc.
 #   Copyright 1997-2006 by Easy Software Products.
 #
 #   These coded instructions, statements, and computer programs are the
@@ -118,7 +118,7 @@ install-exec:
 	done
 	if test "x$(SYMROOT)" != "x"; then \
 		$(INSTALL_DIR) $(SYMROOT); \
-		for file in $(TARGETS); do \
+		for file in $(CGIS); do \
 			cp $$file $(SYMROOT); \
 		done \
 	fi
@@ -158,8 +158,9 @@ install-libs: $(INSTALLSTATIC)

 installstatic:
 	$(INSTALL_DIR) -m 755 $(LIBDIR)
-	$(INSTALL_LIB) libcupscgi.a $(LIBDIR)
+	$(INSTALL_LIB) -m 755 libcupscgi.a $(LIBDIR)
 	$(RANLIB) $(LIBDIR)/libcupscgi.a
+	$(CHMOD) 555 $(LIBDIR)/libcupscgi.a


 #
@@ -3,7 +3,7 @@
 *
 *   Administration CGI for the Common UNIX Printing System (CUPS).
 *
- *   Copyright 2007-2009 by Apple Inc.
+ *   Copyright 2007-2010 by Apple Inc.
 *   Copyright 1997-2007 by Easy Software Products.
 *
 *   These coded instructions, statements, and computer programs are the
@@ -52,8 +52,7 @@
 * Local globals...
 */

-static int	current_device;		/* Current device for add/modify */
-static time_t	last_device_time;	/* Last update time for device list */
+static int	current_device = 0;	/* Current device shown */


 /*
@@ -122,6 +121,7 @@ main(int  argc,				/* I - Number of command-line arguments */
  */

  cgiSetVariable("SECTION", "admin");
+  cgiSetVariable("REFRESH_PAGE", "");

 /*
  * See if we have form data...
@@ -191,7 +191,7 @@ main(int  argc,				/* I - Number of command-line arguments */
  }
  else if (op && !strcmp(op, "redirect"))
  {
-    const char *url;			/* Redirection URL... */
+    const char	*url;			/* Redirection URL... */
    char	prefix[1024];		/* URL prefix */


@@ -205,7 +205,50 @@ main(int  argc,				/* I - Number of command-line arguments */
    fprintf(stderr, "DEBUG: redirecting with prefix %s!\n", prefix);

    if ((url = cgiGetVariable("URL")) != NULL)
-      printf("Location: %s%s\n\n", prefix, url);
+    {
+      char	encoded[1024],		/* Encoded URL string */
+      		*ptr;			/* Pointer into encoded string */
+
+
+      ptr = encoded;
+      if (*url != '/')
+        *ptr++ = '/';
+
+      for (; *url && ptr < (encoded + sizeof(encoded) - 4); url ++)
+      {
+        if (strchr("%@&+ <>#=", *url) || *url < ' ' || *url & 128)
+	{
+	 /*
+	  * Percent-encode this character; safe because we have at least 4
+	  * bytes left in the array...
+	  */
+
+	  sprintf(ptr, "%%%02X", *url & 255);
+	  ptr += 3;
+	}
+	else
+	  *ptr++ = *url;
+      }
+
+      *ptr = '\0';
+
+      if (*url)
+      {
+       /*
+        * URL was too long, just redirect to the admin page...
+	*/
+
+	printf("Location: %s/admin\n\n", prefix);
+      }
+      else
+      {
+       /*
+        * URL is OK, redirect there...
+	*/
+
+        printf("Location: %s%s\n\n", prefix, encoded);
+      }
+    }
    else
      printf("Location: %s/admin\n\n", prefix);
  }
@@ -248,6 +291,21 @@ choose_device_cb(
    const char *device_location,	/* I - Location */
    const char *title)			/* I - Page title */
 {
+ /*
+  * For modern browsers, start a multi-part page so we can show that something
+  * is happening.  Non-modern browsers just get everything at the end...
+  */
+
+  if (current_device == 0 && cgiSupportsMultipart())
+  {
+    cgiStartMultipart();
+    cgiStartHTML(title);
+    cgiCopyTemplateLang("choose-device.tmpl");
+    cgiEndHTML();
+    fflush(stdout);
+  }
+
+
 /*
  * Add the device to the array...
  */
@@ -260,23 +318,6 @@ choose_device_cb(
  cgiSetArray("device_location", current_device, device_location);

  current_device ++;
-
-  if (time(NULL) > last_device_time && cgiSupportsMultipart())
-  {
-   /*
-    * Update the page...
-    */
-
-    if (!last_device_time)
-      cgiStartMultipart();
-
-    cgiStartHTML(title);
-    cgiCopyTemplateLang("choose-device.tmpl");
-    cgiEndHTML();
-    fflush(stdout);
-
-    time(&last_device_time);
-  }
 }


@@ -345,6 +386,31 @@ do_add_rss_subscription(http_t *http)	/* I - HTTP connection */
    * and classes and (re)show the add page...
    */

+    if (cgiGetVariable("EVENT_JOB_CREATED"))
+      cgiSetVariable("EVENT_JOB_CREATED", "CHECKED");
+    if (cgiGetVariable("EVENT_JOB_COMPLETED"))
+      cgiSetVariable("EVENT_JOB_COMPLETED", "CHECKED");
+    if (cgiGetVariable("EVENT_JOB_STOPPED"))
+      cgiSetVariable("EVENT_JOB_STOPPED", "CHECKED");
+    if (cgiGetVariable("EVENT_JOB_CONFIG_CHANGED"))
+      cgiSetVariable("EVENT_JOB_CONFIG_CHANGED", "CHECKED");
+    if (cgiGetVariable("EVENT_PRINTER_STOPPED"))
+      cgiSetVariable("EVENT_PRINTER_STOPPED", "CHECKED");
+    if (cgiGetVariable("EVENT_PRINTER_ADDED"))
+      cgiSetVariable("EVENT_PRINTER_ADDED", "CHECKED");
+    if (cgiGetVariable("EVENT_PRINTER_MODIFIED"))
+      cgiSetVariable("EVENT_PRINTER_MODIFIED", "CHECKED");
+    if (cgiGetVariable("EVENT_PRINTER_DELETED"))
+      cgiSetVariable("EVENT_PRINTER_DELETED", "CHECKED");
+    if (cgiGetVariable("EVENT_SERVER_STARTED"))
+      cgiSetVariable("EVENT_SERVER_STARTED", "CHECKED");
+    if (cgiGetVariable("EVENT_SERVER_STOPPED"))
+      cgiSetVariable("EVENT_SERVER_STOPPED", "CHECKED");
+    if (cgiGetVariable("EVENT_SERVER_RESTARTED"))
+      cgiSetVariable("EVENT_SERVER_RESTARTED", "CHECKED");
+    if (cgiGetVariable("EVENT_SERVER_AUDIT"))
+      cgiSetVariable("EVENT_SERVER_AUDIT", "CHECKED");
+
    request  = ippNewRequest(CUPS_GET_PRINTERS);
    response = cupsDoRequest(http, request, "/");

@@ -467,6 +533,7 @@ do_am_class(http_t *http,		/* I - HTTP connection */
  ipp_attribute_t *attr;		/* member-uris attribute */
  char		uri[HTTP_MAX_URI];	/* Device or printer URI */
  const char	*name,			/* Pointer to class name */
+		*op,			/* Operation name */
 		*ptr;			/* Pointer to CGI variable */
  const char	*title;			/* Title of page */
  static const char * const pattrs[] =	/* Requested printer attributes */
@@ -478,6 +545,7 @@ do_am_class(http_t *http,		/* I - HTTP connection */


  title = cgiText(modify ? _("Modify Class") : _("Add Class"));
+  op    = cgiGetVariable("OP");
  name  = cgiGetVariable("PRINTER_NAME");

  if (cgiGetVariable("PRINTER_LOCATION") == NULL)
@@ -492,10 +560,22 @@ do_am_class(http_t *http,		/* I - HTTP connection */

    request = ippNewRequest(CUPS_GET_PRINTERS);

+    ippAddInteger(request, IPP_TAG_OPERATION, IPP_TAG_ENUM, "printer-type",
+		  CUPS_PRINTER_LOCAL);
+    ippAddInteger(request, IPP_TAG_OPERATION, IPP_TAG_ENUM, "printer-type-mask",
+		  CUPS_PRINTER_CLASS | CUPS_PRINTER_REMOTE |
+		      CUPS_PRINTER_IMPLICIT);
+
   /*
    * Do the request and get back a response...
    */

+    cgiClearVariables();
+    if (op)
+      cgiSetVariable("OP", op);
+    if (name)
+      cgiSetVariable("PRINTER_NAME", name);
+
    if ((response = cupsDoRequest(http, request, "/")) != NULL)
    {
     /*
@@ -628,6 +708,15 @@ do_am_class(http_t *http,		/* I - HTTP connection */
    return;
  }

+  if (!name)
+  {
+    cgiStartHTML(title);
+    cgiSetVariable("ERROR", cgiText(_("Missing form variable!")));
+    cgiCopyTemplateLang("error.tmpl");
+    cgiEndHTML();
+    return;
+  }
+
  for (ptr = name; *ptr; ptr ++)
    if ((*ptr >= 0 && *ptr <= ' ') || *ptr == 127 || *ptr == '/' || *ptr == '#')
      break;
@@ -662,8 +751,7 @@ do_am_class(http_t *http,		/* I - HTTP connection */
  request = ippNewRequest(CUPS_ADD_CLASS);

  httpAssembleURIf(HTTP_URI_CODING_ALL, uri, sizeof(uri), "ipp", NULL,
-                   "localhost", 0, "/classes/%s",
-		   cgiGetVariable("PRINTER_NAME"));
+                   "localhost", 0, "/classes/%s", name);
  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, "printer-uri",
               NULL, uri);

@@ -683,7 +771,7 @@ do_am_class(http_t *http,		/* I - HTTP connection */
    attr = ippAddStrings(request, IPP_TAG_PRINTER, IPP_TAG_URI, "member-uris",
                         num_printers, NULL, NULL);
    for (i = 0; i < num_printers; i ++)
-      attr->values[i].string.text = strdup(cgiGetArray("MEMBER_URIS", i));
+      attr->values[i].string.text = _cupsStrAlloc(cgiGetArray("MEMBER_URIS", i));
  }

 /*
@@ -881,7 +969,8 @@ do_am_printer(http_t *http,		/* I - HTTP connection */
 	  if (isalnum(*uriptr & 255) || *uriptr == '_' || *uriptr == '-' ||
 	      *uriptr == '.')
 	    *tptr++ = *uriptr;
-	  else if ((*uriptr == ' ' || *uriptr == '/') && tptr[-1] != '_')
+	  else if ((*uriptr == ' ' || *uriptr == '/') && tptr > template &&
+	           tptr[-1] != '_')
 	    *tptr++ = '_';
 	  else if (*uriptr == '?' || *uriptr == '(')
 	    break;
@@ -910,31 +999,28 @@ do_am_printer(http_t *http,		/* I - HTTP connection */
    }

   /*
-    * Scan for devices for up to 30 seconds, updating the page as we find
-    * them...
+    * Scan for devices for up to 30 seconds...
    */

    fputs("DEBUG: Getting list of devices...\n", stderr);

-    last_device_time = 0;
-    current_device   = 0;
+    current_device = 0;
    if (cupsGetDevices(http, 30, CUPS_INCLUDE_ALL, CUPS_EXCLUDE_NONE,
                       (cups_device_cb_t)choose_device_cb,
 		       (void *)title) == IPP_OK)
    {
      fputs("DEBUG: Got device list!\n", stderr);

-      if (!cgiSupportsMultipart())
-      {
-       /*
-        * Non-modern browsers that don't support multi-part documents get
-	* everything at the end...
-	*/
+      if (cgiSupportsMultipart())
+        cgiStartMultipart();

-	cgiStartHTML(title);
-	cgiCopyTemplateLang("choose-device.tmpl");
-	cgiEndHTML();
-      }
+      cgiSetVariable("CUPS_GET_DEVICES_DONE", "1");
+      cgiStartHTML(title);
+      cgiCopyTemplateLang("choose-device.tmpl");
+      cgiEndHTML();
+
+      if (cgiSupportsMultipart())
+        cgiEndMultipart();
    }
    else
    {
@@ -955,16 +1041,6 @@ do_am_printer(http_t *http,		/* I - HTTP connection */
        return;
      }
    }
-
-   /*
-    * Show the final selection page...
-    */
-
-    cgiSetVariable("CUPS_GET_DEVICES_DONE", "1");
-    cgiStartHTML(title);
-    cgiCopyTemplateLang("choose-device.tmpl");
-    cgiEndHTML();
-    cgiEndMultipart();
  }
  else if (strchr(var, '/') == NULL)
  {
@@ -1030,6 +1106,11 @@ do_am_printer(http_t *http,		/* I - HTTP connection */
        if ((attr = ippFindAttribute(oldinfo, "printer-location",
 	                             IPP_TAG_TEXT)) != NULL)
          cgiSetVariable("PRINTER_LOCATION", attr->values[0].string.text);
+
+	if ((attr = ippFindAttribute(oldinfo, "printer-is-shared",
+				     IPP_TAG_BOOLEAN)) != NULL)
+	  cgiSetVariable("PRINTER_IS_SHARED",
+			 attr->values[0].boolean ? "1" : "0");
      }

      cgiCopyTemplateLang("modify-printer.tmpl");
@@ -1165,7 +1246,7 @@ do_am_printer(http_t *http,		/* I - HTTP connection */
      * Got the list of PPDs, see if the user has selected a make...
      */

-      if (cgiSetIPPVars(response, NULL, NULL, NULL, 0) == 0)
+      if (cgiSetIPPVars(response, NULL, NULL, NULL, 0) == 0 && !modify)
      {
       /*
        * No PPD files with this make, try again with all makes...
@@ -1201,8 +1282,11 @@ do_am_printer(http_t *http,		/* I - HTTP connection */
 	*/

        cgiStartHTML(title);
-	cgiSetVariable("CURRENT_MAKE_AND_MODEL",
-	               cgiGetArray("PPD_MAKE_AND_MODEL", 0));
+	if (!cgiGetVariable("PPD_MAKE"))
+	  cgiSetVariable("PPD_MAKE", cgiGetVariable("CURRENT_MAKE"));
+	if (!modify)
+	  cgiSetVariable("CURRENT_MAKE_AND_MODEL",
+	                 cgiGetArray("PPD_MAKE_AND_MODEL", 0));
 	cgiCopyTemplateLang("choose-model.tmpl");
        cgiEndHTML();
      }
@@ -1494,7 +1578,7 @@ do_config_server(http_t *http)		/* I - HTTP connection */
 #ifdef HAVE_GSSAPI
    char		default_auth_type[255];
 					/* DefaultAuthType value */
-    const char		*val;		/* Setting value */ 
+    const char		*val;		/* Setting value */
 #endif /* HAVE_GSSAPI */


@@ -1566,7 +1650,7 @@ do_config_server(http_t *http)		/* I - HTTP connection */
 	  strcat(local_protocols, "slp");
      }
 #endif /* HAVE_SLP */
-      
+
      if (cgiGetVariable("BROWSE_REMOTE_CUPS"))
 	strcpy(remote_protocols, "cups");
      else
@@ -1819,7 +1903,7 @@ do_config_server(http_t *http)		/* I - HTTP connection */
      cgiSetVariable("ERROR", strerror(errno));
      cgiCopyTemplateLang("error.tmpl");
      cgiEndHTML();
-      
+
      perror(tempfile);
      return;
    }
@@ -1831,7 +1915,7 @@ do_config_server(http_t *http)		/* I - HTTP connection */
      cgiSetVariable("ERROR", strerror(errno));
      cgiCopyTemplateLang("error.tmpl");
      cgiEndHTML();
-      
+
      perror(tempfile);
      close(tempfd);
      unlink(tempfile);
@@ -2397,7 +2481,7 @@ do_list_printers(http_t *http)		/* I - HTTP connection */
         attr;
 	 attr = ippFindNextAttribute(response, "device-uri", IPP_TAG_URI))
    {
-      cupsArrayAdd(printer_devices, strdup(attr->values[0].string.text));
+      cupsArrayAdd(printer_devices, _cupsStrAlloc(attr->values[0].string.text));
    }

   /*
@@ -2534,7 +2618,7 @@ do_list_printers(http_t *http)		/* I - HTTP connection */
      for (printer_device = (char *)cupsArrayFirst(printer_devices);
           printer_device;
 	   printer_device = (char *)cupsArrayNext(printer_devices))
-        free(printer_device);
+        _cupsStrFree(printer_device);

      cupsArrayDelete(printer_devices);
    }
@@ -2607,7 +2691,9 @@ do_menu(http_t *http)			/* I - HTTP connection */
  if ((val = cupsGetOption("DefaultAuthType", num_settings,
                           settings)) != NULL && !strcasecmp(val, "Negotiate"))
    cgiSetVariable("KERBEROS", "CHECKED");
+  else
 #endif /* HAVE_GSSAPI */
+  cgiSetVariable("KERBEROS", "");

 #ifdef HAVE_DNSSD
  cgiSetVariable("HAVE_DNSSD", "1");
@@ -2973,7 +3059,7 @@ do_set_allowed_users(http_t *http)	/* I - HTTP connection */
        * Add the name...
 	*/

-        attr->values[i].string.text = strdup(ptr);
+        attr->values[i].string.text = _cupsStrAlloc(ptr);

       /*
        * Advance to the next name...
@@ -3219,11 +3305,16 @@ do_set_options(http_t *http,		/* I - HTTP connection */
    for (option = ppdFirstOption(ppd);
         option;
 	 option = ppdNextOption(ppd))
+    {
      if ((var = cgiGetVariable(option->keyword)) != NULL)
      {
 	have_options = 1;
 	ppdMarkOption(ppd, option->keyword, var);
+	fprintf(stderr, "DEBUG: Set %s to %s...\n", option->keyword, var);
      }
+      else
+        fprintf(stderr, "DEBUG: Didn't find %s...\n", option->keyword);
+    }
  }

  if (!have_options || ppdConflicts(ppd))
@@ -3244,7 +3335,7 @@ do_set_options(http_t *http,		/* I - HTTP connection */
          ((ppdattr = ppdFindAttr(ppd, "cupsCommands", NULL)) != NULL &&
           ppdattr->value && strstr(ppdattr->value, "AutoConfigure")))
        cgiSetVariable("HAVE_AUTOCONFIGURE", "YES");
-      else 
+      else
      {
        for (i = 0; i < ppd->num_filters; i ++)
 	  if (!strncmp(ppd->filters[i], "application/vnd.cups-postscript", 31))
@@ -3330,6 +3421,16 @@ do_set_options(http_t *http,		/* I - HTTP connection */
 	    {
 	      cgiSetArray("ckeyword", k, option->keyword);
 	      cgiSetArray("ckeytext", k, option->text);
+
+	      for (m = 0; m < option->num_choices; m ++)
+	      {
+	        if (option->choices[m].marked)
+	        {
+	          cgiSetArray("cchoice", k, option->choices[m].text);
+	          break;
+	        }
+              }
+
 	      k ++;
 	    }

@@ -3348,7 +3449,7 @@ do_set_options(http_t *http,		/* I - HTTP connection */
 	  cgiSetVariable("GROUP", group->text);

 	cgiCopyTemplateLang("option-header.tmpl");
-	
+
 	for (j = group->num_options, option = group->options;
 	     j > 0;
 	     j --, option ++)
@@ -3992,7 +4093,7 @@ get_option_value(

    snprintf(buffer, bufsize, "Custom.%gx%g%s", width, length, uval);
  }
-  else if (cupsArrayCount(coption->params) == 1) 
+  else if (cupsArrayCount(coption->params) == 1)
  {
    cparam = ppdFirstCustomParam(coption);
    snprintf(keyword, sizeof(keyword), "%s.%s", coption->keyword, cparam->name);
@@ -1,9 +1,9 @@
 /*
 * "$Id$"
 *
- *   CGI support library definitions.
+ *   CGI support library definitions for CUPS.
 *
- *   Copyright 2007-2009 by Apple Inc.
+ *   Copyright 2007-2010 by Apple Inc.
 *   Copyright 1997-2006 by Easy Software Products.
 *
 *   These coded instructions, statements, and computer programs are the
@@ -33,6 +33,14 @@
 #  include "help-index.h"


+/*
+ * C++ magic...
+ */
+
+#  ifdef __cplusplus
+extern "C" {
+#  endif /* __cplusplus */
+
 /*
 * Types...
 */
@@ -54,17 +62,19 @@ typedef struct cgi_file_s		/**** Uploaded file data ****/
 extern void		cgiAbort(const char *title, const char *stylesheet,
 			         const char *format, ...);
 extern int		cgiCheckVariables(const char *names);
+extern void		cgiClearVariables(void);
 extern void		*cgiCompileSearch(const char *query);
 extern void		cgiCopyTemplateFile(FILE *out, const char *tmpl);
 extern void		cgiCopyTemplateLang(const char *tmpl);
 extern int		cgiDoSearch(void *search, const char *text);
 extern void		cgiEndHTML(void);
 extern void		cgiEndMultipart(void);
-extern char		*cgiFormEncode(char *dst, const char *src, size_t dstsize);
+extern char		*cgiFormEncode(char *dst, const char *src,
+			               size_t dstsize);
 extern void		cgiFreeSearch(void *search);
 extern const char	*cgiGetArray(const char *name, int element);
 extern void		cgiGetAttributes(ipp_t *request, const char *tmpl);
-extern char		*cgiGetCookie(const char *name, char *buf, int buflen);
+extern const char	*cgiGetCookie(const char *name);
 extern const cgi_file_t	*cgiGetFile(void);
 extern cups_array_t	*cgiGetIPPObjects(ipp_t *response, void *search);
 extern int		cgiGetSize(const char *name);
@@ -98,6 +108,10 @@ extern void		cgiStartMultipart(void);
 extern int		cgiSupportsMultipart(void);
 extern const char	*cgiText(const char *message);

+#  ifdef __cplusplus
+}
+#  endif /* __cplusplus */
+
 #endif /* !_CUPS_CGI_H_ */

 /*
@@ -72,6 +72,7 @@ main(int  argc,				/* I - Number of command-line arguments */
  */

  cgiSetVariable("SECTION", "classes");
+  cgiSetVariable("REFRESH_PAGE", "");

 /*
  * See if we are displaying a printer or all classes...
@@ -23,6 +23,14 @@
 #  include <cups/array.h>


+/*
+ * C++ magic...
+ */
+
+#  ifdef __cplusplus
+extern "C" {
+#  endif /* __cplusplus */
+
 /*
 * Data structures...
 */
@@ -68,6 +76,10 @@ extern help_index_t	*helpSearchIndex(help_index_t *hi, const char *query,
 					 const char *filename);


+#  ifdef __cplusplus
+}
+#  endif /* __cplusplus */
+
 #endif /* !_CUPS_HELP_INDEX_H_ */

 /*
@@ -3,7 +3,7 @@
 *
 *   Online help CGI for the Common UNIX Printing System (CUPS).
 *
- *   Copyright 2007-2008 by Apple Inc.
+ *   Copyright 2007-2009 by Apple Inc.
 *   Copyright 1997-2006 by Easy Software Products.
 *
 *   These coded instructions, statements, and computer programs are the
@@ -63,6 +63,7 @@ main(int  argc,				/* I - Number of command-line arguments */
  */

  cgiSetVariable("SECTION", "help");
+  cgiSetVariable("REFRESH_PAGE", "");

 /*
  * Load the help index...
@@ -102,7 +103,7 @@ main(int  argc,				/* I - Number of command-line arguments */
  */

  for (i = 0; i < argc; i ++)
-    fprintf(stderr, "argv[%d]=\"%s\"\n", i, argv[i]);
+    fprintf(stderr, "DEBUG: argv[%d]=\"%s\"\n", i, argv[i]);

  if ((helpfile = getenv("PATH_INFO")) != NULL)
  {
@@ -182,6 +183,12 @@ main(int  argc,				/* I - Number of command-line arguments */
  topic = cgiGetVariable("TOPIC");
  si    = helpSearchIndex(hi, query, topic, helpfile);

+  cgiClearVariables();
+  if (query)
+    cgiSetVariable("QUERY", query);
+  if (topic)
+    cgiSetVariable("TOPIC", topic);
+
  fprintf(stderr, "DEBUG: query=\"%s\", topic=\"%s\"\n",
          query ? query : "(null)", topic ? topic : "(null)");

@@ -333,7 +333,7 @@ cgiMoveJobs(http_t     *http,		/* I - Connection to server */
                   NULL, job_uri);
      ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_KEYWORD,
                   "requested-attributes", NULL, "job-printer-uri");
-      
+
      if ((response = cupsDoRequest(http, request, "/")) != NULL)
      {
        if ((attr = ippFindAttribute(response, "job-printer-uri",
@@ -650,7 +650,8 @@ cgiPrintCommand(http_t     *http,	/* I - Connection to server */
 	cgiSetIPPVars(response, NULL, NULL, NULL, 0);

      attr = ippFindAttribute(response, "job-state", IPP_TAG_ENUM);
-      if (!attr || attr->values[0].integer >= IPP_JOB_STOPPED)
+      if (!attr || attr->values[0].integer >= IPP_JOB_STOPPED ||
+          attr->values[0].integer == IPP_JOB_HELD)
      {
 	ippDelete(response);
 	break;
@@ -925,7 +926,7 @@ cgiRewriteURL(const char *uri,		/* I - Current URI */
 		 ishttps ? "https" : "http",
 		 userpass, hostname, port, resource);
      else
-	snprintf(url, urlsize, "%s://%s:%d%s", 
+	snprintf(url, urlsize, "%s://%s:%d%s",
 		 ishttps ? "https" : "http",
 		 hostname, port, resource);
    }
@@ -1397,7 +1398,9 @@ cgiShowJobs(http_t     *http,		/* I - Connection to server */
  int			ascending,	/* Order of jobs (0 = descending) */
 			first,		/* First job to show */
 			count;		/* Number of jobs */
-  const char		*var;		/* Form variable */
+  const char		*var,		/* Form variable */
+			*query,		/* Query string */
+			*section;	/* Section in web interface */
  void			*search;	/* Search data */
  char			url[1024],	/* Printer URI */
 			val[1024];	/* Form variable */
@@ -1441,11 +1444,14 @@ cgiShowJobs(http_t     *http,		/* I - Connection to server */
    * Get a list of matching job objects.
    */

-    if ((var = cgiGetVariable("QUERY")) != NULL &&
+    if ((query = cgiGetVariable("QUERY")) != NULL &&
        !cgiGetVariable("CLEAR"))
-      search = cgiCompileSearch(var);
+      search = cgiCompileSearch(query);
    else
+    {
+      query  = NULL;
      search = NULL;
+    }

    jobs  = cgiGetIPPObjects(response, search);
    count = cupsArrayCount(jobs);
@@ -1470,16 +1476,27 @@ cgiShowJobs(http_t     *http,		/* I - Connection to server */
    if (first < 0)
      first = 0;

-    sprintf(val, "%d", count);
-    cgiSetVariable("TOTAL", val);
-
    if ((var = cgiGetVariable("ORDER")) != NULL)
      ascending = !strcasecmp(var, "asc");
    else
-    {
      ascending = !which_jobs || !strcasecmp(which_jobs, "not-completed");
-      cgiSetVariable("ORDER", ascending ? "asc" : "dec");
-    }
+
+    section = cgiGetVariable("SECTION");
+
+    cgiClearVariables();
+
+    if (query)
+      cgiSetVariable("QUERY", query);
+
+    cgiSetVariable("ORDER", ascending ? "asc" : "dec");
+
+    cgiSetVariable("SECTION", section);
+
+    sprintf(val, "%d", count);
+    cgiSetVariable("TOTAL", val);
+
+    if (which_jobs)
+      cgiSetVariable("WHICH_JOBS", which_jobs);

    if (ascending)
    {
@@ -1501,7 +1518,11 @@ cgiShowJobs(http_t     *http,		/* I - Connection to server */
    */

    if (dest)
-      snprintf(val, sizeof(val), "/%s/%s",  cgiGetVariable("SECTION"), dest);
+    {
+      snprintf(val, sizeof(val), "/%s/%s", section, dest);
+      cgiSetVariable("PRINTER_NAME", dest);
+      cgiSetVariable("PRINTER_URI_SUPPORTED", val);
+    }
    else
      strlcpy(val, "/jobs/", sizeof(val));

@@ -57,6 +57,7 @@ main(int  argc,				/* I - Number of command-line arguments */
  */

  cgiSetVariable("SECTION", "jobs");
+  cgiSetVariable("REFRESH_PAGE", "");

 /*
  * Connect to the HTTP server...
@@ -1,4 +1,5 @@
 _cgiCheckVariables
+_cgiClearVariables
 _cgiCompileSearch
 _cgiCopyTemplateFile
 _cgiCopyTemplateLang
@@ -9,6 +10,7 @@ _cgiFormEncode
 _cgiFreeSearch
 _cgiGetArray
 _cgiGetAttributes
+_cgiGetCookie
 _cgiGetFile
 _cgiGetIPPObjects
 _cgiGetSize
@@ -23,6 +25,7 @@ _cgiRewriteURL
 _cgiSetArray
 _cgiSetIPPObjectVars
 _cgiSetIPPVars
+_cgiSetCookie
 _cgiSetServerVersion
 _cgiSetSize
 _cgiSetVariable
@@ -357,7 +357,7 @@ write_index(const char   *path,		/* I - File to write */

 static void
 write_info(const char *path,		/* I - File to write */
-           const char *revision)	/* I - Version number */
+           const char *revision)	/* I - Subversion revision number */
 {
  cups_file_t	*fp;			/* File */

@@ -379,14 +379,22 @@ write_info(const char *path,		/* I - File to write */
 		     "\t<key>CFBundleName</key>\n"
 		     "\t<string>CUPS Documentation</string>\n"
 		     "\t<key>CFBundleVersion</key>\n"
-		     "\t<string>1.4.%s</string>\n"
+		     "\t<string>%d.%d.%s</string>\n"
+		     "\t<key>CFBundleShortVersionString</key>\n"
+		     "\t<string>%d.%d.%d</string>\n"
 		     "\t<key>DocSetFeedName</key>\n"
 		     "\t<string>cups.org</string>\n"
 		     "\t<key>DocSetFeedURL</key>\n"
-		     "\t<string>http://www.cups.org/org.cups.docset.xar"
+		     "\t<string>http://www.cups.org/org.cups.docset.atom"
 		     "</string>\n"
+		     "\t<key>DocSetPublisherIdentifier</key>\n"
+		     "\t<string>org.cups</string>\n"
+		     "\t<key>DocSetPublisherName</key>\n"
+		     "\t<string>CUPS</string>\n"
 		     "</dict>\n"
-		     "</plist>\n", revision);
+		     "</plist>\n",
+		     CUPS_VERSION_MAJOR, CUPS_VERSION_MINOR, revision,
+		     CUPS_VERSION_MAJOR, CUPS_VERSION_MINOR, CUPS_VERSION_PATCH);

  cupsFileClose(fp);
 }
@@ -73,6 +73,7 @@ main(int  argc,				/* I - Number of command-line arguments */
  */

  cgiSetVariable("SECTION", "printers");
+  cgiSetVariable("REFRESH_PAGE", "");

 /*
  * See if we are displaying a printer or all printers...
@@ -3,7 +3,7 @@
 *
 *   CGI template function.
 *
- *   Copyright 2007-2008 by Apple Inc.
+ *   Copyright 2007-2010 by Apple Inc.
 *   Copyright 1997-2006 by Easy Software Products.
 *
 *   These coded instructions, statements, and computer programs are the
@@ -119,7 +119,7 @@ cgiCopyTemplateLang(const char *tmpl)	/* I - Base filename */
      *locptr = '\0';			/* Strip charset */
  }

-  fprintf(stderr, "DEBUG: lang=\"%s\", locale=\"%s\"...\n",
+  fprintf(stderr, "DEBUG2: lang=\"%s\", locale=\"%s\"...\n",
          lang ? lang : "(null)", locale);

 /*
@@ -369,6 +369,20 @@ cgi_copy(FILE *out,			/* I - Output file */

        continue;
      }
+      else if (name[0] == '$')
+      {
+       /*
+        * Insert cookie value or nothing if not defined.
+	*/
+
+        if ((value = cgiGetCookie(name + 1)) != NULL)
+	  outptr = value;
+	else
+	{
+	  outval[0] = '\0';
+	  outptr    = outval;
+	}
+      }
      else
      {
       /*
@@ -437,7 +451,14 @@ cgi_copy(FILE *out,			/* I - Output file */
        * Test for existance...
 	*/

-        result     = cgiGetArray(name, element) != NULL && outptr[0];
+        if (name[0] == '?')
+	  result = cgiGetArray(name + 1, element) != NULL;
+	else if (name[0] == '#')
+	  result = cgiGetVariable(name + 1) != NULL;
+        else
+          result = cgiGetArray(name, element) != NULL;
+
+	result     = result && outptr[0];
 	compare[0] = '\0';
      }
      else
@@ -675,6 +696,8 @@ cgi_puts(const char *s,			/* I - String to output */
      fputs("&gt;", out);
    else if (*s == '\"')
      fputs("&quot;", out);
+    else if (*s == '\'')
+      fputs("&#39;", out);
    else if (*s == '&')
      fputs("&amp;", out);
    else
@@ -695,7 +718,7 @@ cgi_puturi(const char *s,		/* I - String to output */
 {
  while (*s)
  {
-    if (strchr("%&+ <>#=", *s) || *s & 128)
+    if (strchr("%@&+ <>#=", *s) || *s < ' ' || *s & 128)
      fprintf(out, "%%%02X", *s & 255);
    else
      putc(*s, out);
@@ -1,9 +1,9 @@
 /*
 * "$Id$"
 *
- *   CGI form variable and array functions.
+ *   CGI form variable and array functions for CUPS.
 *
- *   Copyright 2007-2009 by Apple Inc.
+ *   Copyright 2007-2010 by Apple Inc.
 *   Copyright 1997-2005 by Easy Software Products.
 *
 *   These coded instructions, statements, and computer programs are the
@@ -14,24 +14,34 @@
 *
 * Contents:
 *
- *   cgiCheckVariables()        - Check for the presence of "required" variables.
- *   cgiGetArray()              - Get an element from a form array...
- *   cgiGetFile()               - Get the file (if any) that was submitted in the form.
+ *   cgiCheckVariables()        - Check for the presence of "required"
+ *                                variables.
+ *   cgiClearVariables()        - Clear all form variables.
+ *   cgiGetArray()              - Get an element from a form array.
+ *   cgiGetCookie()             - Get a cookie value.
+ *   cgiGetFile()               - Get the file (if any) that was submitted in
+ *                                the form.
 *   cgiGetSize()               - Get the size of a form array value.
- *   cgiGetVariable()           - Get a CGI variable from the database...
- *   cgiInitialize()            - Initialize the CGI variable "database"...
+ *   cgiGetVariable()           - Get a CGI variable from the database.
+ *   cgiInitialize()            - Initialize the CGI variable "database".
 *   cgiIsPOST()                - Determine whether this page was POSTed.
 *   cgiSetArray()              - Set array element N to the specified string.
+ *   cgiSetCookie()             - Set a cookie value.
 *   cgiSetSize()               - Set the array size.
- *   cgiSetVariable()           - Set a CGI variable in the database...
+ *   cgiSetVariable()           - Set a CGI variable in the database.
 *   cgi_add_variable()         - Add a form variable.
 *   cgi_compare_variables()    - Compare two variables.
- *   cgi_find_variable()        - Find a variable...
- *   cgi_initialize_get()       - Initialize form variables using the GET method.
- *   cgi_initialize_multipart() - Initialize variables and file using the POST method.
+ *   cgi_find_variable()        - Find a variable.
+ *   cgi_initialize_cookies()   - Initialize cookies.
+ *   cgi_initialize_get()       - Initialize form variables using the GET
+ *                                method.
+ *   cgi_initialize_multipart() - Initialize variables and file using the POST
+ *                                method.
 *   cgi_initialize_post()      - Initialize variables using the POST method.
 *   cgi_initialize_string()    - Initialize form variables from a string.
- *   cgi_passwd()               - Catch authentication requests and notify the server.
+ *   cgi_passwd()               - Catch authentication requests and notify the
+ *                                server.
+ *   cgi_set_sid()              - Set the CUPS session ID.
 *   cgi_sort_variables()       - Sort all form variables for faster lookup.
 *   cgi_unlink_file()          - Remove the uploaded form.
 */
@@ -39,6 +49,15 @@
 /*#define DEBUG*/
 #include "cgi-private.h"
 #include <errno.h>
+#include <cups/http.h>
+#include <cups/md5.h>
+
+
+/*
+ * Session ID name
+ */
+
+#define CUPS_SID	"org.cups.sid"


 /*
@@ -58,6 +77,8 @@ typedef struct				/**** Form variable structure ****/
 * Local globals...
 */

+static int		num_cookies = 0;/* Number of cookies */
+static cups_option_t	*cookies = NULL;/* Cookies */
 static int		form_count = 0,	/* Form variable count */
 			form_alloc = 0;	/* Number of variables allocated */
 static _cgi_var_t	*form_vars = NULL;
@@ -75,11 +96,13 @@ static void		cgi_add_variable(const char *name, int element,
 static int		cgi_compare_variables(const _cgi_var_t *v1,
 			                      const _cgi_var_t *v2);
 static _cgi_var_t	*cgi_find_variable(const char *name);
+static void		cgi_initialize_cookies(void);
 static int		cgi_initialize_get(void);
 static int		cgi_initialize_multipart(const char *boundary);
 static int		cgi_initialize_post(void);
 static int		cgi_initialize_string(const char *data);
 static const char	*cgi_passwd(const char *prompt);
+static const char	*cgi_set_sid(void);
 static void		cgi_sort_variables(void);
 static void		cgi_unlink_file(void);

@@ -135,7 +158,32 @@ cgiCheckVariables(const char *names)	/* I - Variables to look for */


 /*
- * 'cgiGetArray()' - Get an element from a form array...
+ * 'cgiClearVariables()' - Clear all form variables.
+ */
+
+void
+cgiClearVariables(void)
+{
+  int		i, j;			/* Looping vars */
+  _cgi_var_t	*v;			/* Current variable */
+
+
+  for (v = form_vars, i = form_count; i > 0; v ++, i --)
+  {
+    _cupsStrFree(v->name);
+    for (j = 0; j < v->nvalues; j ++)
+      if (v->values[j])
+        _cupsStrFree(v->values[j]);
+  }
+
+  form_count = 0;
+
+  cgi_unlink_file();
+}
+
+
+/*
+ * 'cgiGetArray()' - Get an element from a form array.
 */

 const char *				/* O - Element value or NULL */
@@ -151,7 +199,18 @@ cgiGetArray(const char *name,		/* I - Name of array variable */
  if (element < 0 || element >= var->nvalues)
    return (NULL);

-  return (var->values[element]);
+  return (_cupsStrRetain(var->values[element]));
+}
+
+
+/*
+ * 'cgiGetCookie()' - Get a cookie value.
+ */
+
+const char *				/* O - Value or NULL */
+cgiGetCookie(const char *name)		/* I - Name of cookie */
+{
+  return (cupsGetOption(name, num_cookies, cookies));
 }


@@ -184,10 +243,10 @@ cgiGetSize(const char *name)		/* I - Name of variable */


 /*
- * 'cgiGetVariable()' - Get a CGI variable from the database...
+ * 'cgiGetVariable()' - Get a CGI variable from the database.
 *
 * Returns NULL if the variable doesn't exist.  If the variable is an
- * array of values, returns the last element...
+ * array of values, returns the last element.
 */

 const char *				/* O - Value of variable */
@@ -206,19 +265,21 @@ cgiGetVariable(const char *name)	/* I - Name of variable */
 		  var->values[var->nvalues - 1]));
 #endif /* DEBUG */

-  return ((var == NULL) ? NULL : var->values[var->nvalues - 1]);
+  return ((var == NULL) ? NULL : _cupsStrRetain(var->values[var->nvalues - 1]));
 }


 /*
- * 'cgiInitialize()' - Initialize the CGI variable "database"...
+ * 'cgiInitialize()' - Initialize the CGI variable "database".
 */

 int					/* O - Non-zero if there was form data */
 cgiInitialize(void)
 {
-  const char	*method;		/* Form posting method */
-  const char	*content_type;		/* Content-Type of post data */
+  const char	*method,		/* Form posting method */
+		*content_type,		/* Content-Type of post data */
+		*cups_sid_cookie,	/* SID cookie */
+		*cups_sid_form;		/* SID form variable */


 /*
@@ -241,6 +302,20 @@ cgiInitialize(void)
  setbuf(stdout, NULL);
 #endif /* DEBUG */

+ /*
+  * Get cookies...
+  */
+
+  cgi_initialize_cookies();
+
+  if ((cups_sid_cookie = cgiGetCookie(CUPS_SID)) == NULL)
+  {
+    fputs("DEBUG: " CUPS_SID " cookie not found, initializing!\n", stderr);
+    cups_sid_cookie = cgi_set_sid();
+  }
+
+  fprintf(stderr, "DEBUG: " CUPS_SID " cookie is \"%s\"\n", cups_sid_cookie);
+
 /*
  * Get the request method (GET or POST)...
  */
@@ -264,9 +339,27 @@ cgiInitialize(void)
      boundary += 9;

    if (content_type && !strncmp(content_type, "multipart/form-data; ", 21))
-      return (cgi_initialize_multipart(boundary));
+    {
+      if (!cgi_initialize_multipart(boundary))
+        return (0);
+    }
+    else if (!cgi_initialize_post())
+      return (0);
+
+    if ((cups_sid_form = cgiGetVariable(CUPS_SID)) == NULL ||
+	strcmp(cups_sid_cookie, cups_sid_form))
+    {
+      if (cups_sid_form)
+	fprintf(stderr, "DEBUG: " CUPS_SID " form variable is \"%s\"\n",
+	        cups_sid_form);
+      else
+	fputs("DEBUG: " CUPS_SID " form variable is not present.\n", stderr);
+
+      cgiClearVariables();
+      return (0);
+    }
    else
-      return (cgi_initialize_post());
+      return (1);
  }
  else
    return (0);
@@ -337,13 +430,45 @@ cgiSetArray(const char *name,		/* I - Name of variable */
      var->nvalues = element + 1;
    }
    else if (var->values[element])
-      free((char *)var->values[element]);
+      _cupsStrFree((char *)var->values[element]);

-    var->values[element] = strdup(value);
+    var->values[element] = _cupsStrAlloc(value);
  }
 }


+/*
+ * 'cgiSetCookie()' - Set a cookie value.
+ */
+
+void
+cgiSetCookie(const char *name,		/* I - Name */
+             const char *value,		/* I - Value */
+             const char *path,		/* I - Path (typically "/") */
+	     const char *domain,	/* I - Domain name */
+	     time_t     expires,	/* I - Expiration date (0 for session) */
+	     int        secure)		/* I - Require SSL */
+{
+  num_cookies = cupsAddOption(name, value, num_cookies, &cookies);
+
+  printf("Set-Cookie: %s=%s;", name, value);
+  if (path)
+    printf("; path=%s", path);
+  if (domain)
+    printf("; domain=%s", domain);
+  if (expires)
+  {
+    char	date[256];		/* Date string */
+
+    printf("; expires=%s", httpGetDateString2(expires, date, sizeof(date)));
+  }
+  if (secure)
+    puts("; secure;");
+  else
+    puts(";");
+}
+
+
 /*
 * 'cgiSetSize()' - Set the array size.
 */
@@ -384,7 +509,7 @@ cgiSetSize(const char *name,		/* I - Name of variable */
  {
    for (i = size; i < var->nvalues; i ++)
      if (var->values[i])
-        free((void *)(var->values[i]));
+        _cupsStrFree((void *)(var->values[i]));
  }

  var->nvalues = size;
@@ -392,7 +517,7 @@ cgiSetSize(const char *name,		/* I - Name of variable */


 /*
- * 'cgiSetVariable()' - Set a CGI variable in the database...
+ * 'cgiSetVariable()' - Set a CGI variable in the database.
 *
 * If the variable is an array, this truncates the array to a single element.
 */
@@ -417,9 +542,9 @@ cgiSetVariable(const char *name,	/* I - Name of variable */
  {
    for (i = 0; i < var->nvalues; i ++)
      if (var->values[i])
-        free((char *)var->values[i]);
+        _cupsStrFree((char *)var->values[i]);

-    var->values[0] = strdup(value);
+    var->values[0] = _cupsStrAlloc(value);
    var->nvalues   = 1;
  }
 }
@@ -465,10 +590,10 @@ cgi_add_variable(const char *name,	/* I - Variable name */
  if ((var->values = calloc(element + 1, sizeof(char *))) == NULL)
    return;

-  var->name            = strdup(name);
+  var->name            = _cupsStrAlloc(name);
  var->nvalues         = element + 1;
  var->avalues         = element + 1;
-  var->values[element] = strdup(value);
+  var->values[element] = _cupsStrAlloc(value);

  form_count ++;
 }
@@ -488,7 +613,7 @@ cgi_compare_variables(


 /*
- * 'cgi_find_variable()' - Find a variable...
+ * 'cgi_find_variable()' - Find a variable.
 */

 static _cgi_var_t *			/* O - Variable pointer or NULL */
@@ -507,6 +632,91 @@ cgi_find_variable(const char *name)	/* I - Name of variable */
 }


+/*
+ * 'cgi_initialize_cookies()' - Initialize cookies.
+ */
+
+static void
+cgi_initialize_cookies(void)
+{
+  const char	*cookie;		/* HTTP_COOKIE environment variable */
+  char		name[128],		/* Name string */
+		value[512],		/* Value string */
+		*ptr;			/* Pointer into name/value */
+
+
+  if ((cookie = getenv("HTTP_COOKIE")) == NULL)
+    return;
+
+  while (*cookie)
+  {
+   /*
+    * Skip leading whitespace...
+    */
+
+    while (isspace(*cookie & 255))
+      cookie ++;
+    if (!*cookie)
+      break;
+
+   /*
+    * Copy the name...
+    */
+
+    for (ptr = name; *cookie && *cookie != '=';)
+      if (ptr < (name + sizeof(name) - 1))
+        *ptr++ = *cookie++;
+      else
+        break;
+
+    if (*cookie != '=')
+      break;
+
+    *ptr = '\0';
+    cookie ++;
+
+   /*
+    * Then the value...
+    */
+
+    if (*cookie == '\"')
+    {
+      for (cookie ++, ptr = value; *cookie && *cookie != '\"';)
+        if (ptr < (value + sizeof(value) - 1))
+	  *ptr++ = *cookie++;
+	else
+	  break;
+
+      if (*cookie == '\"')
+        cookie ++;
+    }
+    else
+    {
+      for (ptr = value; *cookie && *cookie != ';';)
+        if (ptr < (value + sizeof(value) - 1))
+	  *ptr++ = *cookie++;
+	else
+	  break;
+    }
+
+    if (*cookie == ';')
+      cookie ++;
+    else if (*cookie)
+      break;
+
+    *ptr = '\0';
+
+   /*
+    * Then add the cookie to an array as long as the name doesn't start with
+    * "$"...
+    */
+
+    if (name[0] != '$')
+      num_cookies = cupsAddOption(name, value, num_cookies, &cookies);
+  }
+}
+
+
 /*
 * 'cgi_initialize_get()' - Initialize form variables using the GET method.
 */
@@ -536,7 +746,8 @@ cgi_initialize_get(void)


 /*
- * 'cgi_initialize_multipart()' - Initialize variables and file using the POST method.
+ * 'cgi_initialize_multipart()' - Initialize variables and file using the POST
+ *                                method.
 *
 * TODO: Update to support files > 2GB.
 */
@@ -848,7 +1059,7 @@ cgi_initialize_string(const char *data)	/* I - Form data string */
  char	*s,				/* Pointer to current form string */
 	ch,				/* Temporary character */
 	name[255],			/* Name of form variable */
-	value[65536];			/* Variable value... */
+	value[65536];			/* Variable value */


 /*
@@ -901,6 +1112,9 @@ cgi_initialize_string(const char *data)	/* I - Form data string */
 	    * Read the hex code...
 	    */

+            if (!isxdigit(data[1] & 255) || !isxdigit(data[2] & 255))
+	      return (0);
+
            if (s < (value + sizeof(value) - 1))
 	    {
              data ++;
@@ -988,6 +1202,46 @@ cgi_passwd(const char *prompt)		/* I - Prompt (not used) */
 }


+/*
+ * 'cgi_set_sid()' - Set the CUPS session ID.
+ */
+
+static const char *			/* O - New session ID */
+cgi_set_sid(void)
+{
+  char			buffer[512],	/* SID data */
+			sid[33];	/* SID string */
+  _cups_md5_state_t	md5;		/* MD5 state */
+  unsigned char		sum[16];	/* MD5 sum */
+  const char		*remote_addr,	/* REMOTE_ADDR */
+			*server_name,	/* SERVER_NAME */
+			*server_port;	/* SERVER_PORT */
+
+
+  if ((remote_addr = getenv("REMOTE_ADDR")) == NULL)
+    remote_addr = "REMOTE_ADDR";
+  if ((server_name = getenv("SERVER_NAME")) == NULL)
+    server_name = "SERVER_NAME";
+  if ((server_port = getenv("SERVER_PORT")) == NULL)
+    server_port = "SERVER_PORT";
+
+  CUPS_SRAND(time(NULL));
+  snprintf(buffer, sizeof(buffer), "%s:%s:%s:%02X%02X%02X%02X%02X%02X%02X%02X",
+           remote_addr, server_name, server_port,
+	   (unsigned)CUPS_RAND() & 255, (unsigned)CUPS_RAND() & 255,
+	   (unsigned)CUPS_RAND() & 255, (unsigned)CUPS_RAND() & 255,
+	   (unsigned)CUPS_RAND() & 255, (unsigned)CUPS_RAND() & 255,
+	   (unsigned)CUPS_RAND() & 255, (unsigned)CUPS_RAND() & 255);
+  _cupsMD5Init(&md5);
+  _cupsMD5Append(&md5, (unsigned char *)buffer, (int)strlen(buffer));
+  _cupsMD5Finish(&md5, sum);
+  
+  cgiSetCookie(CUPS_SID, httpMD5String(sum, sid), "/", NULL, 0, 0);
+
+  return (cupsGetOption(CUPS_SID, num_cookies, cookies));
+}
+
+
 /*
 * 'cgi_sort_variables()' - Sort all form variables for faster lookup.
 */
@@ -3,7 +3,7 @@
 *
 *   Web search program for www.cups.org.
 *
- *   Copyright 2007-2008 by Apple Inc.
+ *   Copyright 2007-2009 by Apple Inc.
 *   Copyright 1997-2007 by Easy Software Products.
 *
 *   These coded instructions, statements, and computer programs are the
@@ -33,7 +33,8 @@
 * Local functions...
 */

-static void	list_nodes(const char *title, cups_array_t *nodes);
+static void	list_nodes(help_index_t *hi, const char *title,
+		           cups_array_t *nodes);


 /*
@@ -69,7 +70,7 @@ main(int  argc,				/* I - Number of command-line args */
  search = helpSearchIndex(hi, argv[2], NULL, NULL);

  if (search)
-    list_nodes(argv[1], search->sorted);
+    list_nodes(hi, argv[1], search->sorted);

 /*
  * Return with no errors...
@@ -84,10 +85,12 @@ main(int  argc,				/* I - Number of command-line args */
 */

 static void
-list_nodes(const char   *title,		/* I - Title string */
+list_nodes(help_index_t *hi,		/* I - Help index */
+           const char   *title,		/* I - Title string */
 	   cups_array_t *nodes)		/* I - Nodes */
 {
-  help_node_t	*node;			/* Current node */
+  help_node_t	*node,			/* Current node */
+		*file;			/* File node */


  printf("%d\n", cupsArrayCount(nodes));
@@ -96,10 +99,14 @@ list_nodes(const char   *title,		/* I - Title string */
       node = (help_node_t *)cupsArrayNext(nodes))
  {
    if (node->anchor)
-      printf("%d|%s#%s|%s\n", node->score, node->filename, node->anchor,
-             node->text);
+    {
+      file = helpFindNode(hi, node->filename, NULL);
+      printf("%d|%s#%s|%s|%s\n", node->score, node->filename, node->anchor,
+             node->text, file ? file->text : node->filename);
+    }
    else
-      printf("%d|%s|%s\n", node->score, node->filename, node->text);
+      printf("%d|%s|%s|%s\n", node->score, node->filename, node->text,
+             node->text);
  }
 }

@@ -90,7 +90,7 @@ install-data:
 	done
 	-if test x$(PAMDIR) != x; then \
 		$(INSTALL_DIR) -m 755 $(BUILDROOT)$(PAMDIR); \
-		if test -r $(BUILDROOT)$(PAMDIR)/cups/$(PAMFILE) ; then \
+		if test -r $(BUILDROOT)$(PAMDIR)/cups ; then \
 			$(INSTALL_DATA) $(PAMFILE) $(BUILDROOT)$(PAMDIR)/cups.N ; \
 		else \
 			$(INSTALL_DATA) $(PAMFILE) $(BUILDROOT)$(PAMDIR)/cups ; \
@@ -1,9 +1,8 @@
 #
 # "$Id$"
 #
-#   Sample configuration file for the Common UNIX Printing System (CUPS)
-#   scheduler.  See "man cupsd.conf" for a complete description of this
-#   file.
+# Sample configuration file for the CUPS scheduler.  See "man cupsd.conf" for a
+# complete description of this file.
 #

 # Log general information in error_log - change "@CUPS_LOG_LEVEL@" to "debug"
@@ -7,7 +7,7 @@
 #
 #   MIME converts file for the Common UNIX Printing System (CUPS).
 #
-#   Copyright 2007-2008 by Apple Inc.
+#   Copyright 2007-2009 by Apple Inc.
 #   Copyright 1997-2007 by Easy Software Products.
 #
 #   These coded instructions, statements, and computer programs are the
@@ -38,7 +38,7 @@
 # PostScript filters
 #

-application/pdf			application/postscript		33	pdftops
+application/pdf			application/vnd.cups-postscript	66	pdftops
 application/postscript		application/vnd.cups-postscript	66	pstops
 application/vnd.hp-HPGL		application/postscript		66	hpgltops
 application/x-cshell		application/postscript		33	texttops
@@ -46,6 +46,7 @@ application/x-csource		application/postscript		33	texttops
 application/x-perl		application/postscript		33	texttops
 application/x-shell		application/postscript		33	texttops
 text/plain			application/postscript		33	texttops
+text/css			application/postscript		33	texttops
 text/html			application/postscript		33	texttops
 image/gif			application/vnd.cups-postscript	66	imagetops
 image/png			application/vnd.cups-postscript	66	imagetops
@@ -1,5 +1,5 @@
 #
-# "$Id: mime.types 8652 2009-05-16 23:48:35Z mike $"
+# "$Id: mime.types 8783 2009-08-28 17:51:05Z mike $"
 #
 #   MIME types file for the Common UNIX Printing System (CUPS).
 #
@@ -95,7 +95,7 @@ application/vnd.hp-HPGL		hpgl \

 image/gif			gif string(0,GIF87a) string(0,GIF89a)
 image/png			png string(0,<89>PNG)
-image/jpeg			jpeg jpg jpe string(0,<FFD8FF>) &&\
+image/jpeg			jpeg jpg jpe string(0,<FFD8FF>) +\
 				(char(3,0xe0) char(3,0xe1) char(3,0xe2) char(3,0xe3)\
 				 char(3,0xe4) char(3,0xe5) char(3,0xe6) char(3,0xe7)\
 				 char(3,0xe8) char(3,0xe9) char(3,0xea) char(3,0xeb)\
@@ -114,7 +114,7 @@ image/x-sun-raster		ras string(0,<59a66a95>)

 #image/fpx			fpx
 image/x-alias			pix short(8,8) short(8,24)
-image/x-bitmap			bmp string(0,BM) && !printable(2,14)
+image/x-bitmap			bmp string(0,BM) + !printable(2,14)
 image/x-icon			ico

 ########################################################################
@@ -177,5 +177,5 @@ application/vnd.cups-raw	(string(0,<1B>E) + !string(2,<1B>%0B)) \
 application/octet-stream

 #
-# End of "$Id: mime.types 8652 2009-05-16 23:48:35Z mike $".
+# End of "$Id: mime.types 8783 2009-08-28 17:51:05Z mike $".
 #
@@ -1,3 +0,0 @@
-#%PAM-1.0
-auth	required	pam_unix.so shadow nodelay nullok
-account	required	pam_unix.so
@@ -1,2 +1,2 @@
-auth	required	@PAMMOD@ nullok shadow
+auth	required	@PAMMODAUTH@
 account	required	@PAMMOD@
@@ -1,7 +1,7 @@
 #
 # "$Id$"
 #
-#   Sample SNMP configuration file for CUPS.  See "man cups-smnp.conf" for a
+#   Sample SNMP configuration file for CUPS.  See "man cups-snmp.conf" for a
 #   complete description of this file.
 #

@@ -1,9 +1,9 @@
 dnl
-dnl "$Id: cups-common.m4 8613 2009-05-11 22:39:39Z mike $"
+dnl "$Id: cups-common.m4 9160 2010-06-16 20:25:12Z mike $"
 dnl
-dnl   Common configuration stuff for the Common UNIX Printing System (CUPS).
+dnl   Common configuration stuff for CUPS.
 dnl
-dnl   Copyright 2007-2009 by Apple Inc.
+dnl   Copyright 2007-2010 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
@@ -20,7 +20,7 @@ dnl Set the name of the config header file...
 AC_CONFIG_HEADER(config.h)

 dnl Version number information...
-CUPS_VERSION="1.4b3"
+CUPS_VERSION="1.4.4"
 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'`"
@@ -49,6 +49,7 @@ AC_PROG_CPP
 AC_PROG_CXX
 AC_PROG_RANLIB
 AC_PATH_PROG(AR,ar)
+AC_PATH_PROG(CHMOD,chmod)
 AC_PATH_PROG(HTMLDOC,htmldoc)
 AC_PATH_PROG(LD,ld)
 AC_PATH_PROG(LN,ln)
@@ -141,10 +142,7 @@ else
 fi

 dnl Check for random number functions...
-AC_CHECK_FUNCS(random mrand48 lrand48)
-
-dnl Checks for mkstemp and mkstemps functions.
-AC_CHECK_FUNCS(mkstemp mkstemps)
+AC_CHECK_FUNCS(random lrand48 arc4random)

 dnl Check for geteuid function.
 AC_CHECK_FUNCS(geteuid)
@@ -176,6 +174,14 @@ AC_TRY_COMPILE([#include <time.h>],[struct tm t;
 	AC_DEFINE(HAVE_TM_GMTOFF),
 	AC_MSG_RESULT(no))

+dnl See if the stat structure has the st_gen member...
+AC_MSG_CHECKING(for st_gen member in stat structure)
+AC_TRY_COMPILE([#include <sys/stat.h>],[struct stat t;
+	int o = t.st_gen;],
+	AC_MSG_RESULT(yes)
+	AC_DEFINE(HAVE_ST_GEN),
+	AC_MSG_RESULT(no))
+
 dnl See if we have the removefile(3) function for securely removing files
 AC_CHECK_FUNCS(removefile)

@@ -264,15 +270,12 @@ if test "x$enable_dbus" != xno; then
 			AC_DEFINE(HAVE_DBUS)
 			CFLAGS="$CFLAGS `$PKGCONFIG --cflags dbus-1` -DDBUS_API_SUBJECT_TO_CHANGE"
 			CUPSDLIBS="$CUPSDLIBS `$PKGCONFIG --libs dbus-1`"
+			DBUS_NOTIFIER="dbus"
+			DBUS_NOTIFIERLIBS="`$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`)
-			if $PKGCONFIG --exists glib-2.0 && $PKGCONFIG --exists dbus-glib-1; then
-				DBUS_NOTIFIER="dbus"
-				DBUS_NOTIFIERLIBS="`$PKGCONFIG --libs glib-2.0` `$PKGCONFIG --libs dbus-glib-1` `$PKGCONFIG --libs dbus-1`"
-				CFLAGS="$CFLAGS `$PKGCONFIG --cflags glib-2.0`"
-			fi
 		else
 			AC_MSG_RESULT(no)
 		fi
@@ -291,17 +294,19 @@ LEGACY_BACKENDS="parallel scsi"

 case $uname in
        Darwin*)
-#		FONTS=""
 		LEGACY_BACKENDS=""
                BACKLIBS="$BACKLIBS -framework IOKit"
                CUPSDLIBS="$CUPSDLIBS -sectorder __TEXT __text cupsd.order -e start -framework IOKit -framework SystemConfiguration -weak_framework ApplicationServices"
-                LIBS="-framework SystemConfiguration -framework CoreFoundation $LIBS"
+                LIBS="-framework SystemConfiguration -framework CoreFoundation -framework Security $LIBS"

 		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))
 		AC_CHECK_HEADER(CoreFoundation/CFBundlePriv.h,AC_DEFINE(HAVE_CFBUNDLEPRIV_H))

+		dnl Check for dynamic store function...
+		AC_CHECK_FUNCS(SCDynamicStoreCopyComputerName)
+
 		dnl Check for the new membership functions in MacOSX 10.4...
 		AC_CHECK_HEADER(membership.h,AC_DEFINE(HAVE_MEMBERSHIP_H))
 		AC_CHECK_HEADER(membershipPriv.h,AC_DEFINE(HAVE_MEMBERSHIPPRIV_H))
@@ -357,5 +362,5 @@ AC_SUBST(FONTS)
 AC_SUBST(LEGACY_BACKENDS)

 dnl
-dnl End of "$Id: cups-common.m4 8613 2009-05-11 22:39:39Z mike $".
+dnl End of "$Id: cups-common.m4 9160 2010-06-16 20:25:12Z mike $".
 dnl
@@ -1,5 +1,5 @@
 dnl
-dnl "$Id: cups-defaults.m4 8344 2009-02-10 17:05:35Z mike $"
+dnl "$Id: cups-defaults.m4 8929 2009-12-15 22:40:37Z mike $"
 dnl
 dnl   Default cupsd configuration settings for the Common UNIX Printing System
 dnl   (CUPS).
@@ -208,6 +208,10 @@ AC_ARG_WITH(cups_user, [  --with-cups-user        set default user for CUPS],
 		AC_MSG_RESULT(no password file, using "$CUPS_USER")
 	fi)

+if test "x$CUPS_USER" = "xroot" -o "x$CUPS_USER" = "x0"; then
+	AC_MSG_ERROR([The default user for CUPS cannot be root!])
+fi
+
 AC_ARG_WITH(cups_group, [  --with-cups-group       set default group for CUPS],
 	CUPS_GROUP="$withval",
 	AC_MSG_CHECKING(for default print group)
@@ -238,6 +242,10 @@ AC_ARG_WITH(cups_group, [  --with-cups-group       set default group for CUPS],
 		AC_MSG_RESULT(no group file, using "$CUPS_GROUP")
 	fi)

+if test "x$CUPS_GROUP" = "xroot" -o "x$CUPS_GROUP" = "xwheel" -o "x$CUPS_GROUP" = "x0"; then
+	AC_MSG_ERROR([The default group for CUPS cannot be root!])
+fi
+
 AC_ARG_WITH(system_groups, [  --with-system-groups    set default system groups for CUPS],
 	CUPS_SYSTEM_GROUPS="$withval",
 	if test x$uname = xDarwin; then
@@ -269,9 +277,14 @@ AC_ARG_WITH(system_groups, [  --with-system-groups    set default system groups
 		fi
 	fi)

-
 CUPS_PRIMARY_SYSTEM_GROUP="`echo $CUPS_SYSTEM_GROUPS | awk '{print $1}'`"

+for group in $CUPS_SYSTEM_GROUPS; do
+	if test "x$CUPS_GROUP" = "x$group"; then
+		AC_MSG_ERROR([The default system groups cannot contain the default CUPS group!])
+	fi
+done
+
 AC_SUBST(CUPS_USER)
 AC_SUBST(CUPS_GROUP)
 AC_SUBST(CUPS_SYSTEM_GROUPS)
@@ -325,8 +338,8 @@ if test x$default_lpdconfigfile != xno; then
 				CUPS_DEFAULT_LPD_CONFIG_FILE="launchd:///System/Library/LaunchDaemons/org.cups.cups-lpd.plist"
 				;;
 			*)
-				if test -d /etc/xinetd.d; then
-					CUPS_DEFAULT_LPD_CONFIG_FILE="xinetd:///etc/xinetd.d/cups-lpd"
+				if test "x$XINETD" != x; then
+					CUPS_DEFAULT_LPD_CONFIG_FILE="xinetd://$XINETD/cups-lpd"
 				else
 					CUPS_DEFAULT_LPD_CONFIG_FILE=""
 				fi
@@ -435,5 +448,5 @@ AC_SUBST(BANNERTOPS)
 AC_SUBST(TEXTTOPS)

 dnl
-dnl End of "$Id: cups-defaults.m4 8344 2009-02-10 17:05:35Z mike $".
+dnl End of "$Id: cups-defaults.m4 8929 2009-12-15 22:40:37Z mike $".
 dnl
@@ -1,5 +1,5 @@
 dnl
-dnl "$Id: cups-dnssd.m4 8344 2009-02-10 17:05:35Z mike $"
+dnl "$Id: cups-dnssd.m4 8789 2009-08-28 22:54:34Z mike $"
 dnl
 dnl   DNS Service Discovery (aka Bonjour) stuff for the Common UNIX Printing System (CUPS).
 dnl
@@ -43,7 +43,7 @@ if test x$enable_dnssd != xno; then
 				AC_MSG_CHECKING(for current version of dns_sd library)
 				SAVELIBS="$LIBS"
 				LIBS="$LIBS -ldns_sd"
-				AC_TRY_COMPILE([#include <dns_sd.h],
+				AC_TRY_COMPILE([#include <dns_sd.h>],
 					[int constant = kDNSServiceFlagsShareConnection;
 					unsigned char txtRecord[100];
 					uint8_t valueLen;
@@ -64,5 +64,5 @@ AC_SUBST(DNSSDLIBS)
 AC_SUBST(DNSSD_BACKEND)

 dnl
-dnl End of "$Id: cups-dnssd.m4 8344 2009-02-10 17:05:35Z mike $".
+dnl End of "$Id: cups-dnssd.m4 8789 2009-08-28 22:54:34Z mike $".
 dnl
@@ -1,9 +1,9 @@
 dnl
-dnl "$Id: cups-launchd.m4 8344 2009-02-10 17:05:35Z mike $"
+dnl "$Id: cups-launchd.m4 9120 2010-04-23 18:56:34Z mike $"
 dnl
-dnl   launchd stuff for the Common UNIX Printing System (CUPS).
+dnl   launchd stuff for CUPS.
 dnl
-dnl   Copyright 2007-2009 by Apple Inc.
+dnl   Copyright 2007-2010 by Apple Inc.
 dnl   Copyright 1997-2005 by Easy Software Products, all rights reserved.
 dnl
 dnl   These coded instructions, statements, and computer programs are the
@@ -35,10 +35,9 @@ if test x$enable_launchd != xno; then
 	esac
 fi

-AC_DEFINE_UNQUOTED(CUPS_DEFAULT_LAUNCHD_CONF, "$DEFAULT_LAUNCHD_CONF")
 AC_SUBST(DEFAULT_LAUNCHD_CONF)
 AC_SUBST(LAUNCHDLIBS)

 dnl
-dnl End of "$Id: cups-launchd.m4 8344 2009-02-10 17:05:35Z mike $".
+dnl End of "$Id: cups-launchd.m4 9120 2010-04-23 18:56:34Z mike $".
 dnl
@@ -1,5 +1,5 @@
 dnl
-dnl "$Id: cups-pam.m4 8344 2009-02-10 17:05:35Z mike $"
+dnl "$Id: cups-pam.m4 8825 2009-09-22 21:53:31Z mike $"
 dnl
 dnl   PAM stuff for the Common UNIX Printing System (CUPS).
 dnl
@@ -22,9 +22,10 @@ if test $uname = AIX; then
 fi

 PAMDIR=""
-PAMFILE=""
+PAMFILE="pam.std"
 PAMLIBS=""
 PAMMOD="pam_unknown.so"
+PAMMODAUTH="pam_unknown.so"

 if test x$enable_pam != xno; then
 	SAVELIBS="$LIBS"
@@ -60,7 +61,7 @@ if test x$enable_pam != xno; then

 	case "$uname" in
 		Darwin*)
-			# Darwin, MacOS X
+			# Darwin/Mac OS X
 			if test "x$with_pam_module" != x; then
 				PAMFILE="pam.$with_pam_module"
 			elif test -f /usr/lib/pam/pam_opendirectory.so.2; then
@@ -70,26 +71,22 @@ if test x$enable_pam != xno; then
 			fi
 			;;

-		IRIX)
-			# SGI IRIX
-			PAMFILE="pam.irix"
-			;;
-
 		*)
 			# All others; this test might need to be updated
 			# as Linux distributors move things around...
 			if test "x$with_pam_module" != x; then
 				PAMMOD="pam_${with_pam_module}.so"
-			else
-				for mod in pam_unix2.so pam_unix.so pam_pwdb.so; do
-					if test -f /lib/security/$mod; then
-						PAMMOD="$mod"
-						break;
-					fi
-				done
+			elif test -f /lib/security/pam_unix2.so; then
+				PAMMOD="pam_unix2.so"
+			elif test -f /lib/security/pam_unix.so; then
+				PAMMOD="pam_unix.so"
 			fi

-			PAMFILE="pam.std"
+			if test "x$PAMMOD" = xpam_unix.so; then
+				PAMMODAUTH="$PAMMOD shadow nodelay"
+			else
+				PAMMODAUTH="$PAMMOD nodelay"
+			fi
 			;;
 	esac
 fi
@@ -98,7 +95,8 @@ AC_SUBST(PAMDIR)
 AC_SUBST(PAMFILE)
 AC_SUBST(PAMLIBS)
 AC_SUBST(PAMMOD)
+AC_SUBST(PAMMODAUTH)

 dnl
-dnl End of "$Id: cups-pam.m4 8344 2009-02-10 17:05:35Z mike $".
+dnl End of "$Id: cups-pam.m4 8825 2009-09-22 21:53:31Z mike $".
 dnl
@@ -1,5 +1,5 @@
 dnl
-dnl "$Id: cups-pdf.m4 8430 2009-03-12 21:50:44Z mike $"
+dnl "$Id: cups-pdf.m4 8760 2009-08-07 22:30:30Z mike $"
 dnl
 dnl   PDF filter configuration stuff for the Common UNIX Printing System (CUPS).
 dnl
@@ -13,7 +13,7 @@ dnl   which should have been included with this file.  If this file is
 dnl   file is missing or damaged, see the license at "http://www.cups.org/".
 dnl

-AC_ARG_WITH(pdftops, [  --with-pdftops          set pdftops filter (gs,pdftops,none), default=pdftops ])
+AC_ARG_WITH(pdftops, [  --with-pdftops          set pdftops filter (gs,/path/to/gs,pdftops,/path/to/pdftops,none), default=pdftops ])

 PDFTOPS=""
 CUPS_PDFTOPS=""
@@ -47,6 +47,12 @@ case "x$with_pdftops" in
 	fi
 	;;

+	x/*/gs) # Use /path/to/gs without any check:
+	CUPS_GHOSTSCRIPT="$with_pdftops"
+	AC_DEFINE(HAVE_GHOSTSCRIPT)
+	PDFTOPS="pdftops"
+	;;
+
 	xpdftops)
 	AC_PATH_PROG(CUPS_PDFTOPS, pdftops)
 	if test "x$CUPS_PDFTOPS" != x; then
@@ -57,6 +63,20 @@ case "x$with_pdftops" in
 		exit 1
 	fi
 	;;
+
+	x/*/pdftops) # Use /path/to/pdftops without any check:
+	CUPS_PDFTOPS="$with_pdftops"
+	AC_DEFINE(HAVE_PDFTOPS)
+	PDFTOPS="pdftops"
+	;;
+
+	xnone) # Make no pdftops filter if with_pdftops=none:
+	;;
+
+	*) # Invalid with_pdftops value:
+	AC_MSG_ERROR(Invalid with_pdftops value!)
+	exit 1
+	;;
 esac

 AC_DEFINE_UNQUOTED(CUPS_PDFTOPS, "$CUPS_PDFTOPS")
@@ -64,5 +84,5 @@ AC_DEFINE_UNQUOTED(CUPS_GHOSTSCRIPT, "$CUPS_GHOSTSCRIPT")
 AC_SUBST(PDFTOPS)

 dnl
-dnl End of "$Id: cups-pdf.m4 8430 2009-03-12 21:50:44Z mike $".
+dnl End of "$Id: cups-pdf.m4 8760 2009-08-07 22:30:30Z mike $".
 dnl
@@ -1,5 +1,5 @@
 dnl
-dnl "$Id: cups-sharedlibs.m4 8344 2009-02-10 17:05:35Z mike $"
+dnl "$Id: cups-sharedlibs.m4 9154 2010-06-16 00:49:01Z mike $"
 dnl
 dnl   Shared library support for the Common UNIX Printing System (CUPS).
 dnl
@@ -158,16 +158,31 @@ AC_SUBST(LIBCUPSPPDC)
 if test x$enable_shared = xno; then
 	LINKCUPS="../cups/libcups.a"
 	LINKCUPSIMAGE="../filter/libcupsimage.a"
+
+	EXTLINKCUPS="-lcups"
+	EXTLINKCUPSDRIVER="-lcupsdriver"
+	EXTLINKCUPSIMAGE="-lcupsimage"
 else
 	if test $uname = AIX; then
 		LINKCUPS="-lcups_s"
 		LINKCUPSIMAGE="-lcupsimage_s"
+
+		EXTLINKCUPS="-lcups_s"
+		EXTLINKCUPSDRIVER="-lcupsdriver_s"
+		EXTLINKCUPSIMAGE="-lcupsimage_s"
 	else
 		LINKCUPS="-lcups"
 		LINKCUPSIMAGE="-lcupsimage"
+
+		EXTLINKCUPS="-lcups"
+		EXTLINKCUPSDRIVER="-lcupsdriver"
+		EXTLINKCUPSIMAGE="-lcupsimage"
 	fi
 fi

+AC_SUBST(EXTLINKCUPS)
+AC_SUBST(EXTLINKCUPSDRIVER)
+AC_SUBST(EXTLINKCUPSIMAGE)
 AC_SUBST(LINKCUPS)
 AC_SUBST(LINKCUPSIMAGE)

@@ -244,5 +259,5 @@ AC_SUBST(IMGLIBS)
 AC_SUBST(EXPORT_LDFLAGS)

 dnl
-dnl End of "$Id: cups-sharedlibs.m4 8344 2009-02-10 17:05:35Z mike $".
+dnl End of "$Id: cups-sharedlibs.m4 9154 2010-06-16 00:49:01Z mike $".
 dnl
@@ -1,9 +1,9 @@
 dnl
-dnl "$Id: cups-ssl.m4 8591 2009-05-04 23:40:10Z mike $"
+dnl "$Id: cups-ssl.m4 9165 2010-06-17 18:20:39Z mike $"
 dnl
-dnl   OpenSSL/GNUTLS stuff for the Common UNIX Printing System (CUPS).
+dnl   OpenSSL/GNUTLS stuff for CUPS.
 dnl
-dnl   Copyright 2007-2009 by Apple Inc.
+dnl   Copyright 2007-2010 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
@@ -26,13 +26,14 @@ AC_ARG_WITH(openssl-includes, [  --with-openssl-includes set directory for OpenS

 SSLFLAGS=""
 SSLLIBS=""
+have_ssl=0

 if test x$enable_ssl != xno; then
    dnl Look for CDSA...
-    if test "x${SSLLIBS}" = "x" -a "x${enable_cdsassl}" != "xno"; then
+    if test $have_ssl = 0 -a "x${enable_cdsassl}" != "xno"; then
 	if test $uname = Darwin; then
 	    AC_CHECK_HEADER(Security/SecureTransport.h, [
-		SSLLIBS="-framework CoreFoundation -framework Security"
+	    	have_ssl=1
 		AC_DEFINE(HAVE_SSL)
 		AC_DEFINE(HAVE_CDSASSL)

@@ -58,18 +59,44 @@ if test x$enable_ssl != xno; then
    fi

    dnl Then look for GNU TLS...
-    if test "x${SSLLIBS}" = "x" -a "x${enable_gnutls}" != "xno" -a "x$PKGCONFIG" != x; then
+    if test $have_ssl = 0 -a "x${enable_gnutls}" != "xno" -a "x$PKGCONFIG" != x; then
    	AC_PATH_PROG(LIBGNUTLSCONFIG,libgnutls-config)
+    	AC_PATH_PROG(LIBGCRYPTCONFIG,libgcrypt-config)
 	if $PKGCONFIG --exists gnutls; then
-	    SSLLIBS=`$PKGCONFIG --libs gnutls`
-	    SSLFLAGS=`$PKGCONFIG --cflags gnutls`
-	    AC_DEFINE(HAVE_SSL)
-	    AC_DEFINE(HAVE_GNUTLS)
+	    if test "x$have_pthread" = xyes; then
+		AC_MSG_WARN([The current version of GNU TLS cannot be made thread-safe.])
+	    else
+	        have_ssl=1
+	        SSLLIBS=`$PKGCONFIG --libs gnutls`
+	        SSLFLAGS=`$PKGCONFIG --cflags gnutls`
+	        AC_DEFINE(HAVE_SSL)
+	        AC_DEFINE(HAVE_GNUTLS)
+	    fi
+	elif test "x$LIBGNUTLSCONFIG" != x; then
+	    if test "x$have_pthread" = xyes; then
+		AC_MSG_WARN([The current version of GNU TLS cannot be made thread-safe.])
+	    else
+	        have_ssl=1
+	        SSLLIBS=`$LIBGNUTLSCONFIG --libs`
+	        SSLFLAGS=`$LIBGNUTLSCONFIG --cflags`
+	        AC_DEFINE(HAVE_SSL)
+	        AC_DEFINE(HAVE_GNUTLS)
+	    fi
+	fi
+
+	if test $have_ssl = 1; then
+            if $PKGCONFIG --exists gcrypt; then
+	        SSLLIBS="$SSLLIBS `$PKGCONFIG --libs gcrypt`"
+	        SSLFLAGS="$SSLFLAGS `$PKGCONFIG --cflags gcrypt`"
+	    elif test "x$LIBGCRYPTCONFIG" != x; then
+	        SSLLIBS="$SSLLIBS `$LIBGCRYPTCONFIG --libs`"
+	        SSLFLAGS="$SSLFLAGS `$LIBGCRYPTCONFIG --cflags`"
+	    fi
 	fi
    fi

    dnl Check for the OpenSSL library last...
-    if test "x${SSLLIBS}" = "x" -a "x${enable_openssl}" != "xno"; then
+    if test $have_ssl = 0 -a "x${enable_openssl}" != "xno"; then
 	AC_CHECK_HEADER(openssl/ssl.h,
 	    dnl Save the current libraries so the crypto stuff isn't always
 	    dnl included...
@@ -87,7 +114,8 @@ if test x$enable_ssl != xno; then
 	        "-lcrypto -lRSAglue -lrsaref"
 	    do
 		AC_CHECK_LIB(ssl,SSL_new,
-		    [SSLFLAGS="-DOPENSSL_DISABLE_OLD_DES_SUPPORT"
+		    [have_ssl=1
+		     SSLFLAGS="-DOPENSSL_DISABLE_OLD_DES_SUPPORT"
 		     SSLLIBS="-lssl $libcrypto"
 		     AC_DEFINE(HAVE_SSL)
 		     AC_DEFINE(HAVE_LIBSSL)],,
@@ -102,7 +130,7 @@ if test x$enable_ssl != xno; then
    fi
 fi

-if test "x$SSLLIBS" != x; then
+if test $have_ssl = 1; then
    AC_MSG_RESULT([    Using SSLLIBS="$SSLLIBS"])
    AC_MSG_RESULT([    Using SSLFLAGS="$SSLFLAGS"])
 fi
@@ -115,5 +143,5 @@ AC_SUBST(EXPORT_SSLLIBS)


 dnl
-dnl End of "$Id: cups-ssl.m4 8591 2009-05-04 23:40:10Z mike $".
+dnl End of "$Id: cups-ssl.m4 9165 2010-06-17 18:20:39Z mike $".
 dnl
@@ -1,9 +1,9 @@
 /*
 * "$Id$"
 *
- *   Configuration file for the Common UNIX Printing System (CUPS).
+ *   Configuration file for CUPS.
 *
- *   Copyright 2007-2009 by Apple Inc.
+ *   Copyright 2007-2010 by Apple Inc.
 *   Copyright 1997-2007 by Easy Software Products.
 *
 *   These coded instructions, statements, and computer programs are the
@@ -335,14 +335,6 @@
 #undef HAVE_DNSSD


-/*
- * Do we have Darwin's CoreFoundation and SystemConfiguration frameworks?
- */
-
-#undef HAVE_COREFOUNDATION
-#undef HAVE_SYSTEMCONFIGURATION
-
-
 /*
 * Do we have <sys/ioctl.h>?
 */
@@ -351,11 +343,10 @@


 /*
- * Do we have mkstemp() and/or mkstemps()?
+ * Does the "stat" structure contain the "st_gen" member?
 */

-#undef HAVE_MKSTEMP
-#undef HAVE_MKSTEMPS
+#undef HAVE_ST_GEN


 /*
@@ -448,7 +439,6 @@

 #undef HAVE_LAUNCH_H
 #undef HAVE_LAUNCHD
-#define CUPS_DEFAULT_LAUNCHD_CONF ""


 /*
@@ -499,7 +489,14 @@


 /*
- * Do we have MacOSX 10.4's mbr_XXX functions()?
+ * Do we have the SCDynamicStoreCopyComputerName function?
+ */
+
+#undef HAVE_SCDYNAMICSTORECOPYCOMPUTERNAME
+
+
+/*
+ * Do we have MacOSX 10.4's mbr_XXX functions?
 */

 #undef HAVE_MEMBERSHIP_H
@@ -508,7 +505,7 @@


 /*
- * Do we have Darwin's notify_post() header and function?
+ * Do we have Darwin's notify_post header and function?
 */

 #undef HAVE_NOTIFY_H
@@ -602,10 +599,24 @@
 * Which random number generator function to use...
 */

+#undef HAVE_ARC4RANDOM
 #undef HAVE_RANDOM
-#undef HAVE_MRAND48
 #undef HAVE_LRAND48

+#ifdef HAVE_ARC4RANDOM
+#  define CUPS_RAND() arc4random()
+#  define CUPS_SRAND(v) arc4random_stir()
+#elif defined(HAVE_RANDOM)
+#  define CUPS_RAND() random()
+#  define CUPS_SRAND(v) srandom(v)
+#elif defined(HAVE_LRAND48)
+#  define CUPS_RAND() lrand48()
+#  define CUPS_SRAND(v) srand48(v)
+#else
+#  define CUPS_RAND() rand()
+#  define CUPS_SRAND(v) srand(v)
+#endif /* HAVE_ARC4RANDOM */
+

 /*
 * Do we have vproc_transaction_begin/end?
@@ -31,9 +31,9 @@ sinclude(config-scripts/cups-poll.m4)
 sinclude(config-scripts/cups-slp.m4)
 sinclude(config-scripts/cups-gssapi.m4)
 sinclude(config-scripts/cups-ldap.m4)
+sinclude(config-scripts/cups-threads.m4)
 sinclude(config-scripts/cups-ssl.m4)
 sinclude(config-scripts/cups-pam.m4)
-sinclude(config-scripts/cups-threads.m4)
 sinclude(config-scripts/cups-largefile.m4)
 sinclude(config-scripts/cups-dnssd.m4)
 sinclude(config-scripts/cups-launchd.m4)
@@ -4,7 +4,7 @@
 # 
 #   CUPS configuration utility.
 #
-#   Copyright 2007-2008 by Apple Inc.
+#   Copyright 2007-2010 by Apple Inc.
 #   Copyright 2001-2006 by Easy Software Products, all rights reserved.
 #
 #   These coded instructions, statements, and computer programs are the
@@ -113,12 +113,12 @@ while test $# -gt 0; do
 	    ;;
 	--libs)
 	    if test $static = no; then
-	        libs="-lcups $LIBS";
+	        libs="@EXTLINKCUPS@ $LIBS";
 	        if test $image = yes; then
- 	            libs="-lcupsimage $libs"
+ 	            libs="@EXTLINKCUPSIMAGE@ $libs"
 		fi
 	        if test $driver = yes; then
- 	            libs="-lcupsdriver $libs"
+ 	            libs="@EXTLINKCUPSDRIVER@ $libs"
 		fi
 	    else
 	        libs="$libdir/libcups.a $LIBS";
@@ -2,112 +2,131 @@

 adminutil.o: adminutil.h cups.h ipp.h http.h versioning.h ppd.h array.h
 adminutil.o: file.h language.h globals.h string.h ../config.h http-private.h
-adminutil.o: md5.h ipp-private.h i18n.h transcode.h debug.h
+adminutil.o: md5.h ipp-private.h i18n.h transcode.h pwg-private.h
+adminutil.o: ../cups/cups.h debug.h
 array.o: array.h versioning.h string.h ../config.h debug.h
 attr.o: ppd-private.h cups.h ipp.h http.h versioning.h ppd.h array.h file.h
 attr.o: language.h debug.h string.h ../config.h
 auth.o: globals.h string.h ../config.h http-private.h http.h versioning.h
 auth.o: md5.h ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h
-auth.o: i18n.h transcode.h debug.h
+auth.o: i18n.h transcode.h pwg-private.h ../cups/cups.h debug.h
 backchannel.o: cups.h ipp.h http.h versioning.h ppd.h array.h file.h
 backchannel.o: language.h
 backend.o: backend.h versioning.h globals.h string.h ../config.h
 backend.o: http-private.h http.h md5.h ipp-private.h ipp.h cups.h ppd.h
-backend.o: array.h file.h language.h i18n.h transcode.h
+backend.o: array.h file.h language.h i18n.h transcode.h pwg-private.h
+backend.o: ../cups/cups.h
 conflicts.o: ppd-private.h cups.h ipp.h http.h versioning.h ppd.h array.h
 conflicts.o: file.h language.h string.h ../config.h debug.h
 custom.o: globals.h string.h ../config.h http-private.h http.h versioning.h
 custom.o: md5.h ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h
-custom.o: i18n.h transcode.h debug.h
+custom.o: i18n.h transcode.h pwg-private.h ../cups/cups.h debug.h
 debug.o: globals.h string.h ../config.h http-private.h http.h versioning.h
 debug.o: md5.h ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h
-debug.o: i18n.h transcode.h debug.h
+debug.o: i18n.h transcode.h pwg-private.h ../cups/cups.h debug.h
 dest.o: debug.h globals.h string.h ../config.h http-private.h http.h
 dest.o: versioning.h md5.h ipp-private.h ipp.h cups.h ppd.h array.h file.h
-dest.o: language.h i18n.h transcode.h pwgmedia.h
+dest.o: language.h i18n.h transcode.h pwg-private.h ../cups/cups.h
 dir.o: dir.h versioning.h string.h ../config.h debug.h
 emit.o: ppd.h array.h versioning.h file.h string.h ../config.h debug.h
 encode.o: cups.h ipp.h http.h versioning.h ppd.h array.h file.h language.h
 encode.o: ipp-private.h string.h ../config.h debug.h
 file.o: file-private.h http-private.h ../config.h http.h versioning.h md5.h
 file.o: ipp-private.h ipp.h globals.h string.h cups.h ppd.h array.h file.h
-file.o: language.h i18n.h transcode.h debug.h
+file.o: language.h i18n.h transcode.h pwg-private.h ../cups/cups.h debug.h
 getdevices.o: globals.h string.h ../config.h http-private.h http.h
 getdevices.o: versioning.h md5.h ipp-private.h ipp.h cups.h ppd.h array.h
-getdevices.o: file.h language.h i18n.h transcode.h debug.h
+getdevices.o: file.h language.h i18n.h transcode.h pwg-private.h
+getdevices.o: ../cups/cups.h debug.h
 getifaddrs.o: http-private.h ../config.h http.h versioning.h md5.h
 getifaddrs.o: ipp-private.h ipp.h
 getputfile.o: globals.h string.h ../config.h http-private.h http.h
 getputfile.o: versioning.h md5.h ipp-private.h ipp.h cups.h ppd.h array.h
-getputfile.o: file.h language.h i18n.h transcode.h debug.h
+getputfile.o: file.h language.h i18n.h transcode.h pwg-private.h
+getputfile.o: ../cups/cups.h debug.h
 globals.o: http-private.h ../config.h http.h versioning.h md5.h ipp-private.h
 globals.o: ipp.h globals.h string.h cups.h ppd.h array.h file.h language.h
-globals.o: i18n.h transcode.h
+globals.o: i18n.h transcode.h pwg-private.h ../cups/cups.h
 http.o: http-private.h ../config.h http.h versioning.h md5.h ipp-private.h
 http.o: ipp.h globals.h string.h cups.h ppd.h array.h file.h language.h
-http.o: i18n.h transcode.h debug.h
+http.o: i18n.h transcode.h pwg-private.h ../cups/cups.h debug.h
 http-addr.o: http-private.h ../config.h http.h versioning.h md5.h
 http-addr.o: ipp-private.h ipp.h globals.h string.h cups.h ppd.h array.h
-http-addr.o: file.h language.h i18n.h transcode.h debug.h
+http-addr.o: file.h language.h i18n.h transcode.h pwg-private.h
+http-addr.o: ../cups/cups.h debug.h
 http-addrlist.o: http-private.h ../config.h http.h versioning.h md5.h
 http-addrlist.o: ipp-private.h ipp.h globals.h string.h cups.h ppd.h array.h
-http-addrlist.o: file.h language.h i18n.h transcode.h debug.h
+http-addrlist.o: file.h language.h i18n.h transcode.h pwg-private.h
+http-addrlist.o: ../cups/cups.h debug.h
 http-support.o: debug.h globals.h string.h ../config.h http-private.h http.h
 http-support.o: versioning.h md5.h ipp-private.h ipp.h cups.h ppd.h array.h
-http-support.o: file.h language.h i18n.h transcode.h
+http-support.o: file.h language.h i18n.h transcode.h pwg-private.h
+http-support.o: ../cups/cups.h
 ipp.o: http-private.h ../config.h http.h versioning.h md5.h ipp-private.h
 ipp.o: ipp.h globals.h string.h cups.h ppd.h array.h file.h language.h i18n.h
-ipp.o: transcode.h debug.h
+ipp.o: transcode.h pwg-private.h ../cups/cups.h debug.h
 ipp-support.o: globals.h string.h ../config.h http-private.h http.h
 ipp-support.o: versioning.h md5.h ipp-private.h ipp.h cups.h ppd.h array.h
-ipp-support.o: file.h language.h i18n.h transcode.h debug.h
+ipp-support.o: file.h language.h i18n.h transcode.h pwg-private.h
+ipp-support.o: ../cups/cups.h debug.h
 langprintf.o: globals.h string.h ../config.h http-private.h http.h
 langprintf.o: versioning.h md5.h ipp-private.h ipp.h cups.h ppd.h array.h
-langprintf.o: file.h language.h i18n.h transcode.h
+langprintf.o: file.h language.h i18n.h transcode.h pwg-private.h
+langprintf.o: ../cups/cups.h
 language.o: globals.h string.h ../config.h http-private.h http.h versioning.h
 language.o: md5.h ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h
-language.o: i18n.h transcode.h debug.h
+language.o: i18n.h transcode.h pwg-private.h ../cups/cups.h debug.h
 localize.o: globals.h string.h ../config.h http-private.h http.h versioning.h
 localize.o: md5.h ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h
-localize.o: i18n.h transcode.h ppd-private.h debug.h
+localize.o: i18n.h transcode.h pwg-private.h ../cups/cups.h ppd-private.h
+localize.o: debug.h
 mark.o: cups.h ipp.h http.h versioning.h ppd.h array.h file.h language.h
-mark.o: string.h ../config.h debug.h pwgmedia.h
+mark.o: string.h ../config.h debug.h pwg-private.h ../cups/cups.h
 md5.o: md5.h string.h ../config.h
 md5passwd.o: http-private.h ../config.h http.h versioning.h md5.h
 md5passwd.o: ipp-private.h ipp.h string.h
 notify.o: globals.h string.h ../config.h http-private.h http.h versioning.h
 notify.o: md5.h ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h
-notify.o: i18n.h transcode.h
+notify.o: i18n.h transcode.h pwg-private.h ../cups/cups.h
 options.o: cups.h ipp.h http.h versioning.h ppd.h array.h file.h language.h
 options.o: string.h ../config.h debug.h
 page.o: ppd.h array.h versioning.h file.h string.h ../config.h debug.h
 ppd.o: ppd-private.h cups.h ipp.h http.h versioning.h ppd.h array.h file.h
-ppd.o: language.h globals.h string.h ../config.h http-private.h md5.h
-ppd.o: ipp-private.h i18n.h transcode.h debug.h
-pwgmedia.o: pwgmedia.h globals.h string.h ../config.h http-private.h http.h
-pwgmedia.o: versioning.h md5.h ipp-private.h ipp.h cups.h ppd.h array.h
-pwgmedia.o: file.h language.h i18n.h transcode.h debug.h
+ppd.o: language.h pwg-private.h ../cups/cups.h globals.h string.h ../config.h
+ppd.o: http-private.h md5.h ipp-private.h i18n.h transcode.h debug.h
+pwg-file.o: pwg-private.h ../cups/cups.h globals.h string.h ../config.h
+pwg-file.o: http-private.h http.h versioning.h md5.h ipp-private.h ipp.h
+pwg-file.o: cups.h ppd.h array.h file.h language.h i18n.h transcode.h debug.h
+pwg-media.o: pwg-private.h ../cups/cups.h globals.h string.h ../config.h
+pwg-media.o: http-private.h http.h versioning.h md5.h ipp-private.h ipp.h
+pwg-media.o: cups.h ppd.h array.h file.h language.h i18n.h transcode.h
+pwg-media.o: debug.h
+pwg-ppd.o: pwg-private.h ../cups/cups.h globals.h string.h ../config.h
+pwg-ppd.o: http-private.h http.h versioning.h md5.h ipp-private.h ipp.h
+pwg-ppd.o: cups.h ppd.h array.h file.h language.h i18n.h transcode.h debug.h
 request.o: globals.h string.h ../config.h http-private.h http.h versioning.h
 request.o: md5.h ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h
-request.o: i18n.h transcode.h debug.h
+request.o: i18n.h transcode.h pwg-private.h ../cups/cups.h debug.h
 sidechannel.o: sidechannel.h versioning.h string.h ../config.h debug.h
 snmp.o: globals.h string.h ../config.h http-private.h http.h versioning.h
 snmp.o: md5.h ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h
-snmp.o: i18n.h transcode.h debug.h snmp-private.h
+snmp.o: i18n.h transcode.h pwg-private.h ../cups/cups.h debug.h
+snmp.o: snmp-private.h
 snprintf.o: string.h ../config.h
 string.o: array.h versioning.h debug.h string.h ../config.h
 tempfile.o: globals.h string.h ../config.h http-private.h http.h versioning.h
 tempfile.o: md5.h ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h
-tempfile.o: i18n.h transcode.h debug.h
+tempfile.o: i18n.h transcode.h pwg-private.h ../cups/cups.h debug.h
 transcode.o: globals.h string.h ../config.h http-private.h http.h
 transcode.o: versioning.h md5.h ipp-private.h ipp.h cups.h ppd.h array.h
-transcode.o: file.h language.h i18n.h transcode.h debug.h
+transcode.o: file.h language.h i18n.h transcode.h pwg-private.h
+transcode.o: ../cups/cups.h debug.h
 usersys.o: http-private.h ../config.h http.h versioning.h md5.h ipp-private.h
 usersys.o: ipp.h globals.h string.h cups.h ppd.h array.h file.h language.h
-usersys.o: i18n.h transcode.h debug.h
+usersys.o: i18n.h transcode.h pwg-private.h ../cups/cups.h debug.h
 util.o: globals.h string.h ../config.h http-private.h http.h versioning.h
 util.o: md5.h ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h
-util.o: i18n.h transcode.h debug.h
+util.o: i18n.h transcode.h pwg-private.h ../cups/cups.h debug.h
 testadmin.o: adminutil.h cups.h ipp.h http.h versioning.h ppd.h array.h
 testadmin.o: file.h language.h string.h ../config.h
 testarray.o: ../cups/string.h ../config.h string.h array.h versioning.h dir.h
@@ -127,119 +146,138 @@ testoptions.o: string.h ../config.h cups.h ipp.h http.h versioning.h ppd.h
 testoptions.o: array.h file.h language.h
 testlang.o: i18n.h transcode.h language.h array.h versioning.h string.h
 testlang.o: ../config.h
-testppd.o: ../cups/string.h ../config.h string.h cups.h ipp.h http.h
-testppd.o: versioning.h ppd.h array.h file.h language.h pwgmedia.h
+testppd.o: ../cups/cups.h ../cups/string.h ../config.h string.h
+testpwg.o: pwg-private.h ../cups/cups.h
 testsnmp.o: string.h ../config.h snmp-private.h http.h versioning.h
 # DO NOT DELETE

 adminutil.32.o: adminutil.c  adminutil.h cups.h ipp.h http.h versioning.h ppd.h array.h
 adminutil.32.o: adminutil.c  file.h language.h globals.h string.h ../config.h http-private.h
-adminutil.32.o: adminutil.c  md5.h ipp-private.h i18n.h transcode.h debug.h
+adminutil.32.o: adminutil.c  md5.h ipp-private.h i18n.h transcode.h pwg-private.h
+adminutil.32.o: adminutil.c  ../cups/cups.h debug.h
 array.32.o: array.c  array.h versioning.h string.h ../config.h debug.h
 attr.32.o: attr.c  ppd-private.h cups.h ipp.h http.h versioning.h ppd.h array.h file.h
 attr.32.o: attr.c  language.h debug.h string.h ../config.h
 auth.32.o: auth.c  globals.h string.h ../config.h http-private.h http.h versioning.h
 auth.32.o: auth.c  md5.h ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h
-auth.32.o: auth.c  i18n.h transcode.h debug.h
+auth.32.o: auth.c  i18n.h transcode.h pwg-private.h ../cups/cups.h debug.h
 backchannel.32.o: backchannel.c  cups.h ipp.h http.h versioning.h ppd.h array.h file.h
 backchannel.32.o: backchannel.c  language.h
 backend.32.o: backend.c  backend.h versioning.h globals.h string.h ../config.h
 backend.32.o: backend.c  http-private.h http.h md5.h ipp-private.h ipp.h cups.h ppd.h
-backend.32.o: backend.c  array.h file.h language.h i18n.h transcode.h
+backend.32.o: backend.c  array.h file.h language.h i18n.h transcode.h pwg-private.h
+backend.32.o: backend.c  ../cups/cups.h
 conflicts.32.o: conflicts.c  ppd-private.h cups.h ipp.h http.h versioning.h ppd.h array.h
 conflicts.32.o: conflicts.c  file.h language.h string.h ../config.h debug.h
 custom.32.o: custom.c  globals.h string.h ../config.h http-private.h http.h versioning.h
 custom.32.o: custom.c  md5.h ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h
-custom.32.o: custom.c  i18n.h transcode.h debug.h
+custom.32.o: custom.c  i18n.h transcode.h pwg-private.h ../cups/cups.h debug.h
 debug.32.o: debug.c  globals.h string.h ../config.h http-private.h http.h versioning.h
 debug.32.o: debug.c  md5.h ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h
-debug.32.o: debug.c  i18n.h transcode.h debug.h
+debug.32.o: debug.c  i18n.h transcode.h pwg-private.h ../cups/cups.h debug.h
 dest.32.o: dest.c  debug.h globals.h string.h ../config.h http-private.h http.h
 dest.32.o: dest.c  versioning.h md5.h ipp-private.h ipp.h cups.h ppd.h array.h file.h
-dest.32.o: dest.c  language.h i18n.h transcode.h pwgmedia.h
+dest.32.o: dest.c  language.h i18n.h transcode.h pwg-private.h ../cups/cups.h
 dir.32.o: dir.c  dir.h versioning.h string.h ../config.h debug.h
 emit.32.o: emit.c  ppd.h array.h versioning.h file.h string.h ../config.h debug.h
 encode.32.o: encode.c  cups.h ipp.h http.h versioning.h ppd.h array.h file.h language.h
 encode.32.o: encode.c  ipp-private.h string.h ../config.h debug.h
 file.32.o: file.c  file-private.h http-private.h ../config.h http.h versioning.h md5.h
 file.32.o: file.c  ipp-private.h ipp.h globals.h string.h cups.h ppd.h array.h file.h
-file.32.o: file.c  language.h i18n.h transcode.h debug.h
+file.32.o: file.c  language.h i18n.h transcode.h pwg-private.h ../cups/cups.h debug.h
 getdevices.32.o: getdevices.c  globals.h string.h ../config.h http-private.h http.h
 getdevices.32.o: getdevices.c  versioning.h md5.h ipp-private.h ipp.h cups.h ppd.h array.h
-getdevices.32.o: getdevices.c  file.h language.h i18n.h transcode.h debug.h
+getdevices.32.o: getdevices.c  file.h language.h i18n.h transcode.h pwg-private.h
+getdevices.32.o: getdevices.c  ../cups/cups.h debug.h
 getifaddrs.32.o: getifaddrs.c  http-private.h ../config.h http.h versioning.h md5.h
 getifaddrs.32.o: getifaddrs.c  ipp-private.h ipp.h
 getputfile.32.o: getputfile.c  globals.h string.h ../config.h http-private.h http.h
 getputfile.32.o: getputfile.c  versioning.h md5.h ipp-private.h ipp.h cups.h ppd.h array.h
-getputfile.32.o: getputfile.c  file.h language.h i18n.h transcode.h debug.h
+getputfile.32.o: getputfile.c  file.h language.h i18n.h transcode.h pwg-private.h
+getputfile.32.o: getputfile.c  ../cups/cups.h debug.h
 globals.32.o: globals.c  http-private.h ../config.h http.h versioning.h md5.h ipp-private.h
 globals.32.o: globals.c  ipp.h globals.h string.h cups.h ppd.h array.h file.h language.h
-globals.32.o: globals.c  i18n.h transcode.h
+globals.32.o: globals.c  i18n.h transcode.h pwg-private.h ../cups/cups.h
 http.32.o: http.c  http-private.h ../config.h http.h versioning.h md5.h ipp-private.h
 http.32.o: http.c  ipp.h globals.h string.h cups.h ppd.h array.h file.h language.h
-http.32.o: http.c  i18n.h transcode.h debug.h
+http.32.o: http.c  i18n.h transcode.h pwg-private.h ../cups/cups.h debug.h
 http-addr.32.o: http-addr.c  http-private.h ../config.h http.h versioning.h md5.h
 http-addr.32.o: http-addr.c  ipp-private.h ipp.h globals.h string.h cups.h ppd.h array.h
-http-addr.32.o: http-addr.c  file.h language.h i18n.h transcode.h debug.h
+http-addr.32.o: http-addr.c  file.h language.h i18n.h transcode.h pwg-private.h
+http-addr.32.o: http-addr.c  ../cups/cups.h debug.h
 http-addrlist.32.o: http-addrlist.c  http-private.h ../config.h http.h versioning.h md5.h
 http-addrlist.32.o: http-addrlist.c  ipp-private.h ipp.h globals.h string.h cups.h ppd.h array.h
-http-addrlist.32.o: http-addrlist.c  file.h language.h i18n.h transcode.h debug.h
+http-addrlist.32.o: http-addrlist.c  file.h language.h i18n.h transcode.h pwg-private.h
+http-addrlist.32.o: http-addrlist.c  ../cups/cups.h debug.h
 http-support.32.o: http-support.c  debug.h globals.h string.h ../config.h http-private.h http.h
 http-support.32.o: http-support.c  versioning.h md5.h ipp-private.h ipp.h cups.h ppd.h array.h
-http-support.32.o: http-support.c  file.h language.h i18n.h transcode.h
+http-support.32.o: http-support.c  file.h language.h i18n.h transcode.h pwg-private.h
+http-support.32.o: http-support.c  ../cups/cups.h
 ipp.32.o: ipp.c  http-private.h ../config.h http.h versioning.h md5.h ipp-private.h
 ipp.32.o: ipp.c  ipp.h globals.h string.h cups.h ppd.h array.h file.h language.h i18n.h
-ipp.32.o: ipp.c  transcode.h debug.h
+ipp.32.o: ipp.c  transcode.h pwg-private.h ../cups/cups.h debug.h
 ipp-support.32.o: ipp-support.c  globals.h string.h ../config.h http-private.h http.h
 ipp-support.32.o: ipp-support.c  versioning.h md5.h ipp-private.h ipp.h cups.h ppd.h array.h
-ipp-support.32.o: ipp-support.c  file.h language.h i18n.h transcode.h debug.h
+ipp-support.32.o: ipp-support.c  file.h language.h i18n.h transcode.h pwg-private.h
+ipp-support.32.o: ipp-support.c  ../cups/cups.h debug.h
 langprintf.32.o: langprintf.c  globals.h string.h ../config.h http-private.h http.h
 langprintf.32.o: langprintf.c  versioning.h md5.h ipp-private.h ipp.h cups.h ppd.h array.h
-langprintf.32.o: langprintf.c  file.h language.h i18n.h transcode.h
+langprintf.32.o: langprintf.c  file.h language.h i18n.h transcode.h pwg-private.h
+langprintf.32.o: langprintf.c  ../cups/cups.h
 language.32.o: language.c  globals.h string.h ../config.h http-private.h http.h versioning.h
 language.32.o: language.c  md5.h ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h
-language.32.o: language.c  i18n.h transcode.h debug.h
+language.32.o: language.c  i18n.h transcode.h pwg-private.h ../cups/cups.h debug.h
 localize.32.o: localize.c  globals.h string.h ../config.h http-private.h http.h versioning.h
 localize.32.o: localize.c  md5.h ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h
-localize.32.o: localize.c  i18n.h transcode.h ppd-private.h debug.h
+localize.32.o: localize.c  i18n.h transcode.h pwg-private.h ../cups/cups.h ppd-private.h
+localize.32.o: localize.c  debug.h
 mark.32.o: mark.c  cups.h ipp.h http.h versioning.h ppd.h array.h file.h language.h
-mark.32.o: mark.c  string.h ../config.h debug.h pwgmedia.h
+mark.32.o: mark.c  string.h ../config.h debug.h pwg-private.h ../cups/cups.h
 md5.32.o: md5.c  md5.h string.h ../config.h
 md5passwd.32.o: md5passwd.c  http-private.h ../config.h http.h versioning.h md5.h
 md5passwd.32.o: md5passwd.c  ipp-private.h ipp.h string.h
 notify.32.o: notify.c  globals.h string.h ../config.h http-private.h http.h versioning.h
 notify.32.o: notify.c  md5.h ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h
-notify.32.o: notify.c  i18n.h transcode.h
+notify.32.o: notify.c  i18n.h transcode.h pwg-private.h ../cups/cups.h
 options.32.o: options.c  cups.h ipp.h http.h versioning.h ppd.h array.h file.h language.h
 options.32.o: options.c  string.h ../config.h debug.h
 page.32.o: page.c  ppd.h array.h versioning.h file.h string.h ../config.h debug.h
 ppd.32.o: ppd.c  ppd-private.h cups.h ipp.h http.h versioning.h ppd.h array.h file.h
-ppd.32.o: ppd.c  language.h globals.h string.h ../config.h http-private.h md5.h
-ppd.32.o: ppd.c  ipp-private.h i18n.h transcode.h debug.h
-pwgmedia.32.o: pwgmedia.c  pwgmedia.h globals.h string.h ../config.h http-private.h http.h
-pwgmedia.32.o: pwgmedia.c  versioning.h md5.h ipp-private.h ipp.h cups.h ppd.h array.h
-pwgmedia.32.o: pwgmedia.c  file.h language.h i18n.h transcode.h debug.h
+ppd.32.o: ppd.c  language.h pwg-private.h ../cups/cups.h globals.h string.h ../config.h
+ppd.32.o: ppd.c  http-private.h md5.h ipp-private.h i18n.h transcode.h debug.h
+pwg-file.32.o: pwg-file.c  pwg-private.h ../cups/cups.h globals.h string.h ../config.h
+pwg-file.32.o: pwg-file.c  http-private.h http.h versioning.h md5.h ipp-private.h ipp.h
+pwg-file.32.o: pwg-file.c  cups.h ppd.h array.h file.h language.h i18n.h transcode.h debug.h
+pwg-media.32.o: pwg-media.c  pwg-private.h ../cups/cups.h globals.h string.h ../config.h
+pwg-media.32.o: pwg-media.c  http-private.h http.h versioning.h md5.h ipp-private.h ipp.h
+pwg-media.32.o: pwg-media.c  cups.h ppd.h array.h file.h language.h i18n.h transcode.h
+pwg-media.32.o: pwg-media.c  debug.h
+pwg-ppd.32.o: pwg-ppd.c  pwg-private.h ../cups/cups.h globals.h string.h ../config.h
+pwg-ppd.32.o: pwg-ppd.c  http-private.h http.h versioning.h md5.h ipp-private.h ipp.h
+pwg-ppd.32.o: pwg-ppd.c  cups.h ppd.h array.h file.h language.h i18n.h transcode.h debug.h
 request.32.o: request.c  globals.h string.h ../config.h http-private.h http.h versioning.h
 request.32.o: request.c  md5.h ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h
-request.32.o: request.c  i18n.h transcode.h debug.h
+request.32.o: request.c  i18n.h transcode.h pwg-private.h ../cups/cups.h debug.h
 sidechannel.32.o: sidechannel.c  sidechannel.h versioning.h string.h ../config.h debug.h
 snmp.32.o: snmp.c  globals.h string.h ../config.h http-private.h http.h versioning.h
 snmp.32.o: snmp.c  md5.h ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h
-snmp.32.o: snmp.c  i18n.h transcode.h debug.h snmp-private.h
+snmp.32.o: snmp.c  i18n.h transcode.h pwg-private.h ../cups/cups.h debug.h
+snmp.32.o: snmp.c  snmp-private.h
 snprintf.32.o: snprintf.c  string.h ../config.h
 string.32.o: string.c  array.h versioning.h debug.h string.h ../config.h
 tempfile.32.o: tempfile.c  globals.h string.h ../config.h http-private.h http.h versioning.h
 tempfile.32.o: tempfile.c  md5.h ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h
-tempfile.32.o: tempfile.c  i18n.h transcode.h debug.h
+tempfile.32.o: tempfile.c  i18n.h transcode.h pwg-private.h ../cups/cups.h debug.h
 transcode.32.o: transcode.c  globals.h string.h ../config.h http-private.h http.h
 transcode.32.o: transcode.c  versioning.h md5.h ipp-private.h ipp.h cups.h ppd.h array.h
-transcode.32.o: transcode.c  file.h language.h i18n.h transcode.h debug.h
+transcode.32.o: transcode.c  file.h language.h i18n.h transcode.h pwg-private.h
+transcode.32.o: transcode.c  ../cups/cups.h debug.h
 usersys.32.o: usersys.c  http-private.h ../config.h http.h versioning.h md5.h ipp-private.h
 usersys.32.o: usersys.c  ipp.h globals.h string.h cups.h ppd.h array.h file.h language.h
-usersys.32.o: usersys.c  i18n.h transcode.h debug.h
+usersys.32.o: usersys.c  i18n.h transcode.h pwg-private.h ../cups/cups.h debug.h
 util.32.o: util.c  globals.h string.h ../config.h http-private.h http.h versioning.h
 util.32.o: util.c  md5.h ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h
-util.32.o: util.c  i18n.h transcode.h debug.h
+util.32.o: util.c  i18n.h transcode.h pwg-private.h ../cups/cups.h debug.h
 testadmin.32.o: testadmin.c  adminutil.h cups.h ipp.h http.h versioning.h ppd.h array.h
 testadmin.32.o: testadmin.c  file.h language.h string.h ../config.h
 testarray.32.o: testarray.c  ../cups/string.h ../config.h string.h array.h versioning.h dir.h
@@ -259,119 +297,138 @@ testoptions.32.o: testoptions.c  string.h ../config.h cups.h ipp.h http.h versio
 testoptions.32.o: testoptions.c  array.h file.h language.h
 testlang.32.o: testlang.c  i18n.h transcode.h language.h array.h versioning.h string.h
 testlang.32.o: testlang.c  ../config.h
-testppd.32.o: testppd.c  ../cups/string.h ../config.h string.h cups.h ipp.h http.h
-testppd.32.o: testppd.c  versioning.h ppd.h array.h file.h language.h pwgmedia.h
+testppd.32.o: testppd.c  ../cups/cups.h ../cups/string.h ../config.h string.h
+testpwg.32.o: testpwg.c  pwg-private.h ../cups/cups.h
 testsnmp.32.o: testsnmp.c  string.h ../config.h snmp-private.h http.h versioning.h
 # DO NOT DELETE

 adminutil.64.o: adminutil.c  adminutil.h cups.h ipp.h http.h versioning.h ppd.h array.h
 adminutil.64.o: adminutil.c  file.h language.h globals.h string.h ../config.h http-private.h
-adminutil.64.o: adminutil.c  md5.h ipp-private.h i18n.h transcode.h debug.h
+adminutil.64.o: adminutil.c  md5.h ipp-private.h i18n.h transcode.h pwg-private.h
+adminutil.64.o: adminutil.c  ../cups/cups.h debug.h
 array.64.o: array.c  array.h versioning.h string.h ../config.h debug.h
 attr.64.o: attr.c  ppd-private.h cups.h ipp.h http.h versioning.h ppd.h array.h file.h
 attr.64.o: attr.c  language.h debug.h string.h ../config.h
 auth.64.o: auth.c  globals.h string.h ../config.h http-private.h http.h versioning.h
 auth.64.o: auth.c  md5.h ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h
-auth.64.o: auth.c  i18n.h transcode.h debug.h
+auth.64.o: auth.c  i18n.h transcode.h pwg-private.h ../cups/cups.h debug.h
 backchannel.64.o: backchannel.c  cups.h ipp.h http.h versioning.h ppd.h array.h file.h
 backchannel.64.o: backchannel.c  language.h
 backend.64.o: backend.c  backend.h versioning.h globals.h string.h ../config.h
 backend.64.o: backend.c  http-private.h http.h md5.h ipp-private.h ipp.h cups.h ppd.h
-backend.64.o: backend.c  array.h file.h language.h i18n.h transcode.h
+backend.64.o: backend.c  array.h file.h language.h i18n.h transcode.h pwg-private.h
+backend.64.o: backend.c  ../cups/cups.h
 conflicts.64.o: conflicts.c  ppd-private.h cups.h ipp.h http.h versioning.h ppd.h array.h
 conflicts.64.o: conflicts.c  file.h language.h string.h ../config.h debug.h
 custom.64.o: custom.c  globals.h string.h ../config.h http-private.h http.h versioning.h
 custom.64.o: custom.c  md5.h ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h
-custom.64.o: custom.c  i18n.h transcode.h debug.h
+custom.64.o: custom.c  i18n.h transcode.h pwg-private.h ../cups/cups.h debug.h
 debug.64.o: debug.c  globals.h string.h ../config.h http-private.h http.h versioning.h
 debug.64.o: debug.c  md5.h ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h
-debug.64.o: debug.c  i18n.h transcode.h debug.h
+debug.64.o: debug.c  i18n.h transcode.h pwg-private.h ../cups/cups.h debug.h
 dest.64.o: dest.c  debug.h globals.h string.h ../config.h http-private.h http.h
 dest.64.o: dest.c  versioning.h md5.h ipp-private.h ipp.h cups.h ppd.h array.h file.h
-dest.64.o: dest.c  language.h i18n.h transcode.h pwgmedia.h
+dest.64.o: dest.c  language.h i18n.h transcode.h pwg-private.h ../cups/cups.h
 dir.64.o: dir.c  dir.h versioning.h string.h ../config.h debug.h
 emit.64.o: emit.c  ppd.h array.h versioning.h file.h string.h ../config.h debug.h
 encode.64.o: encode.c  cups.h ipp.h http.h versioning.h ppd.h array.h file.h language.h
 encode.64.o: encode.c  ipp-private.h string.h ../config.h debug.h
 file.64.o: file.c  file-private.h http-private.h ../config.h http.h versioning.h md5.h
 file.64.o: file.c  ipp-private.h ipp.h globals.h string.h cups.h ppd.h array.h file.h
-file.64.o: file.c  language.h i18n.h transcode.h debug.h
+file.64.o: file.c  language.h i18n.h transcode.h pwg-private.h ../cups/cups.h debug.h
 getdevices.64.o: getdevices.c  globals.h string.h ../config.h http-private.h http.h
 getdevices.64.o: getdevices.c  versioning.h md5.h ipp-private.h ipp.h cups.h ppd.h array.h
-getdevices.64.o: getdevices.c  file.h language.h i18n.h transcode.h debug.h
+getdevices.64.o: getdevices.c  file.h language.h i18n.h transcode.h pwg-private.h
+getdevices.64.o: getdevices.c  ../cups/cups.h debug.h
 getifaddrs.64.o: getifaddrs.c  http-private.h ../config.h http.h versioning.h md5.h
 getifaddrs.64.o: getifaddrs.c  ipp-private.h ipp.h
 getputfile.64.o: getputfile.c  globals.h string.h ../config.h http-private.h http.h
 getputfile.64.o: getputfile.c  versioning.h md5.h ipp-private.h ipp.h cups.h ppd.h array.h
-getputfile.64.o: getputfile.c  file.h language.h i18n.h transcode.h debug.h
+getputfile.64.o: getputfile.c  file.h language.h i18n.h transcode.h pwg-private.h
+getputfile.64.o: getputfile.c  ../cups/cups.h debug.h
 globals.64.o: globals.c  http-private.h ../config.h http.h versioning.h md5.h ipp-private.h
 globals.64.o: globals.c  ipp.h globals.h string.h cups.h ppd.h array.h file.h language.h
-globals.64.o: globals.c  i18n.h transcode.h
+globals.64.o: globals.c  i18n.h transcode.h pwg-private.h ../cups/cups.h
 http.64.o: http.c  http-private.h ../config.h http.h versioning.h md5.h ipp-private.h
 http.64.o: http.c  ipp.h globals.h string.h cups.h ppd.h array.h file.h language.h
-http.64.o: http.c  i18n.h transcode.h debug.h
+http.64.o: http.c  i18n.h transcode.h pwg-private.h ../cups/cups.h debug.h
 http-addr.64.o: http-addr.c  http-private.h ../config.h http.h versioning.h md5.h
 http-addr.64.o: http-addr.c  ipp-private.h ipp.h globals.h string.h cups.h ppd.h array.h
-http-addr.64.o: http-addr.c  file.h language.h i18n.h transcode.h debug.h
+http-addr.64.o: http-addr.c  file.h language.h i18n.h transcode.h pwg-private.h
+http-addr.64.o: http-addr.c  ../cups/cups.h debug.h
 http-addrlist.64.o: http-addrlist.c  http-private.h ../config.h http.h versioning.h md5.h
 http-addrlist.64.o: http-addrlist.c  ipp-private.h ipp.h globals.h string.h cups.h ppd.h array.h
-http-addrlist.64.o: http-addrlist.c  file.h language.h i18n.h transcode.h debug.h
+http-addrlist.64.o: http-addrlist.c  file.h language.h i18n.h transcode.h pwg-private.h
+http-addrlist.64.o: http-addrlist.c  ../cups/cups.h debug.h
 http-support.64.o: http-support.c  debug.h globals.h string.h ../config.h http-private.h http.h
 http-support.64.o: http-support.c  versioning.h md5.h ipp-private.h ipp.h cups.h ppd.h array.h
-http-support.64.o: http-support.c  file.h language.h i18n.h transcode.h
+http-support.64.o: http-support.c  file.h language.h i18n.h transcode.h pwg-private.h
+http-support.64.o: http-support.c  ../cups/cups.h
 ipp.64.o: ipp.c  http-private.h ../config.h http.h versioning.h md5.h ipp-private.h
 ipp.64.o: ipp.c  ipp.h globals.h string.h cups.h ppd.h array.h file.h language.h i18n.h
-ipp.64.o: ipp.c  transcode.h debug.h
+ipp.64.o: ipp.c  transcode.h pwg-private.h ../cups/cups.h debug.h
 ipp-support.64.o: ipp-support.c  globals.h string.h ../config.h http-private.h http.h
 ipp-support.64.o: ipp-support.c  versioning.h md5.h ipp-private.h ipp.h cups.h ppd.h array.h
-ipp-support.64.o: ipp-support.c  file.h language.h i18n.h transcode.h debug.h
+ipp-support.64.o: ipp-support.c  file.h language.h i18n.h transcode.h pwg-private.h
+ipp-support.64.o: ipp-support.c  ../cups/cups.h debug.h
 langprintf.64.o: langprintf.c  globals.h string.h ../config.h http-private.h http.h
 langprintf.64.o: langprintf.c  versioning.h md5.h ipp-private.h ipp.h cups.h ppd.h array.h
-langprintf.64.o: langprintf.c  file.h language.h i18n.h transcode.h
+langprintf.64.o: langprintf.c  file.h language.h i18n.h transcode.h pwg-private.h
+langprintf.64.o: langprintf.c  ../cups/cups.h
 language.64.o: language.c  globals.h string.h ../config.h http-private.h http.h versioning.h
 language.64.o: language.c  md5.h ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h
-language.64.o: language.c  i18n.h transcode.h debug.h
+language.64.o: language.c  i18n.h transcode.h pwg-private.h ../cups/cups.h debug.h
 localize.64.o: localize.c  globals.h string.h ../config.h http-private.h http.h versioning.h
 localize.64.o: localize.c  md5.h ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h
-localize.64.o: localize.c  i18n.h transcode.h ppd-private.h debug.h
+localize.64.o: localize.c  i18n.h transcode.h pwg-private.h ../cups/cups.h ppd-private.h
+localize.64.o: localize.c  debug.h
 mark.64.o: mark.c  cups.h ipp.h http.h versioning.h ppd.h array.h file.h language.h
-mark.64.o: mark.c  string.h ../config.h debug.h pwgmedia.h
+mark.64.o: mark.c  string.h ../config.h debug.h pwg-private.h ../cups/cups.h
 md5.64.o: md5.c  md5.h string.h ../config.h
 md5passwd.64.o: md5passwd.c  http-private.h ../config.h http.h versioning.h md5.h
 md5passwd.64.o: md5passwd.c  ipp-private.h ipp.h string.h
 notify.64.o: notify.c  globals.h string.h ../config.h http-private.h http.h versioning.h
 notify.64.o: notify.c  md5.h ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h
-notify.64.o: notify.c  i18n.h transcode.h
+notify.64.o: notify.c  i18n.h transcode.h pwg-private.h ../cups/cups.h
 options.64.o: options.c  cups.h ipp.h http.h versioning.h ppd.h array.h file.h language.h
 options.64.o: options.c  string.h ../config.h debug.h
 page.64.o: page.c  ppd.h array.h versioning.h file.h string.h ../config.h debug.h
 ppd.64.o: ppd.c  ppd-private.h cups.h ipp.h http.h versioning.h ppd.h array.h file.h
-ppd.64.o: ppd.c  language.h globals.h string.h ../config.h http-private.h md5.h
-ppd.64.o: ppd.c  ipp-private.h i18n.h transcode.h debug.h
-pwgmedia.64.o: pwgmedia.c  pwgmedia.h globals.h string.h ../config.h http-private.h http.h
-pwgmedia.64.o: pwgmedia.c  versioning.h md5.h ipp-private.h ipp.h cups.h ppd.h array.h
-pwgmedia.64.o: pwgmedia.c  file.h language.h i18n.h transcode.h debug.h
+ppd.64.o: ppd.c  language.h pwg-private.h ../cups/cups.h globals.h string.h ../config.h
+ppd.64.o: ppd.c  http-private.h md5.h ipp-private.h i18n.h transcode.h debug.h
+pwg-file.64.o: pwg-file.c  pwg-private.h ../cups/cups.h globals.h string.h ../config.h
+pwg-file.64.o: pwg-file.c  http-private.h http.h versioning.h md5.h ipp-private.h ipp.h
+pwg-file.64.o: pwg-file.c  cups.h ppd.h array.h file.h language.h i18n.h transcode.h debug.h
+pwg-media.64.o: pwg-media.c  pwg-private.h ../cups/cups.h globals.h string.h ../config.h
+pwg-media.64.o: pwg-media.c  http-private.h http.h versioning.h md5.h ipp-private.h ipp.h
+pwg-media.64.o: pwg-media.c  cups.h ppd.h array.h file.h language.h i18n.h transcode.h
+pwg-media.64.o: pwg-media.c  debug.h
+pwg-ppd.64.o: pwg-ppd.c  pwg-private.h ../cups/cups.h globals.h string.h ../config.h
+pwg-ppd.64.o: pwg-ppd.c  http-private.h http.h versioning.h md5.h ipp-private.h ipp.h
+pwg-ppd.64.o: pwg-ppd.c  cups.h ppd.h array.h file.h language.h i18n.h transcode.h debug.h
 request.64.o: request.c  globals.h string.h ../config.h http-private.h http.h versioning.h
 request.64.o: request.c  md5.h ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h
-request.64.o: request.c  i18n.h transcode.h debug.h
+request.64.o: request.c  i18n.h transcode.h pwg-private.h ../cups/cups.h debug.h
 sidechannel.64.o: sidechannel.c  sidechannel.h versioning.h string.h ../config.h debug.h
 snmp.64.o: snmp.c  globals.h string.h ../config.h http-private.h http.h versioning.h
 snmp.64.o: snmp.c  md5.h ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h
-snmp.64.o: snmp.c  i18n.h transcode.h debug.h snmp-private.h
+snmp.64.o: snmp.c  i18n.h transcode.h pwg-private.h ../cups/cups.h debug.h
+snmp.64.o: snmp.c  snmp-private.h
 snprintf.64.o: snprintf.c  string.h ../config.h
 string.64.o: string.c  array.h versioning.h debug.h string.h ../config.h
 tempfile.64.o: tempfile.c  globals.h string.h ../config.h http-private.h http.h versioning.h
 tempfile.64.o: tempfile.c  md5.h ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h
-tempfile.64.o: tempfile.c  i18n.h transcode.h debug.h
+tempfile.64.o: tempfile.c  i18n.h transcode.h pwg-private.h ../cups/cups.h debug.h
 transcode.64.o: transcode.c  globals.h string.h ../config.h http-private.h http.h
 transcode.64.o: transcode.c  versioning.h md5.h ipp-private.h ipp.h cups.h ppd.h array.h
-transcode.64.o: transcode.c  file.h language.h i18n.h transcode.h debug.h
+transcode.64.o: transcode.c  file.h language.h i18n.h transcode.h pwg-private.h
+transcode.64.o: transcode.c  ../cups/cups.h debug.h
 usersys.64.o: usersys.c  http-private.h ../config.h http.h versioning.h md5.h ipp-private.h
 usersys.64.o: usersys.c  ipp.h globals.h string.h cups.h ppd.h array.h file.h language.h
-usersys.64.o: usersys.c  i18n.h transcode.h debug.h
+usersys.64.o: usersys.c  i18n.h transcode.h pwg-private.h ../cups/cups.h debug.h
 util.64.o: util.c  globals.h string.h ../config.h http-private.h http.h versioning.h
 util.64.o: util.c  md5.h ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h
-util.64.o: util.c  i18n.h transcode.h debug.h
+util.64.o: util.c  i18n.h transcode.h pwg-private.h ../cups/cups.h debug.h
 testadmin.64.o: testadmin.c  adminutil.h cups.h ipp.h http.h versioning.h ppd.h array.h
 testadmin.64.o: testadmin.c  file.h language.h string.h ../config.h
 testarray.64.o: testarray.c  ../cups/string.h ../config.h string.h array.h versioning.h dir.h
@@ -391,6 +448,6 @@ testoptions.64.o: testoptions.c  string.h ../config.h cups.h ipp.h http.h versio
 testoptions.64.o: testoptions.c  array.h file.h language.h
 testlang.64.o: testlang.c  i18n.h transcode.h language.h array.h versioning.h string.h
 testlang.64.o: testlang.c  ../config.h
-testppd.64.o: testppd.c  ../cups/string.h ../config.h string.h cups.h ipp.h http.h
-testppd.64.o: testppd.c  versioning.h ppd.h array.h file.h language.h pwgmedia.h
+testppd.64.o: testppd.c  ../cups/cups.h ../cups/string.h ../config.h string.h
+testpwg.64.o: testpwg.c  pwg-private.h ../cups/cups.h
 testsnmp.64.o: testsnmp.c  string.h ../config.h snmp-private.h http.h versioning.h
@@ -1,9 +1,9 @@
 #
 # "$Id$"
 #
-#   API library Makefile for the Common UNIX Printing System (CUPS).
+#   API library Makefile for CUPS.
 #
-#   Copyright 2007-2009 by Apple Inc.
+#   Copyright 2007-2010 by Apple Inc.
 #   Copyright 1997-2006 by Easy Software Products, all rights reserved.
 #
 #   These coded instructions, statements, and computer programs are the
@@ -56,7 +56,9 @@ LIBOBJS	=	\
 		options.o \
 		page.o \
 		ppd.o \
-		pwgmedia.o \
+		pwg-file.o \
+		pwg-media.o \
+		pwg-ppd.o \
 		request.o \
 		sidechannel.o \
 		snmp.o \
@@ -83,8 +85,8 @@ OBJS	=	\
 		testoptions.o \
 		testlang.o \
 		testppd.o \
-		testsnmp.o \
-		php_cups_wrap.o
+		testpwg.o \
+		testsnmp.o


 #
@@ -130,6 +132,7 @@ UNITTARGETS =	\
 		testlang \
 		testoptions \
 		testppd \
+		testpwg \
 		testsnmp

 TARGETS	=	\
@@ -237,8 +240,9 @@ install-libs: $(INSTALLSTATIC) $(INSTALL32) $(INSTALL64)

 installstatic:
 	$(INSTALL_DIR) -m 755 $(LIBDIR)
-	$(INSTALL_LIB) libcups.a $(LIBDIR)
+	$(INSTALL_LIB) -m 755 libcups.a $(LIBDIR)
 	$(RANLIB) $(LIBDIR)/libcups.a
+	$(CHMOD) 555 $(LIBDIR)/libcups.a

 install32bit:
 	echo Installing libraries in $(LIB32DIR)...
@@ -374,30 +378,6 @@ libcups.a:	$(LIBOBJS)
 	$(RANLIB) $@


-#
-# CUPS language bindings for various scripting languages...
-#
-# NOTE: Not currently used or functional - see the scripting/php directory
-#       for the hand-written bindings...
-#
-
-phpcups.so:	$(LIBCUPS) php_cups_wrap.o
-	echo Linking $@...
-	if test `uname` = Darwin; then \
-		DSOFLAGS="-bundle -flat_namespace -undefined suppress"; \
-	else \
-		DSOFLAGS="$(DSOFLAGS)"; \
-	fi; \
-	$(DSO) $$DSOFLAGS -o $@ php_cups_wrap.o $(LIBS) `php-config --ldflags --libs`
-
-php_cups_wrap.o:	php_cups_wrap.c
-	echo Compiling $<...
-	$(CC) $(CFLAGS) `php-config --includes` -c $<
-php_cups_wrap.c:	cups.h
-	echo Creating $< using SWIG...
-	swig -php -o $@ -module cups cups.h
-
-
 #
 # testadmin (dependency on static CUPS library is intentional)
 #
@@ -524,6 +504,18 @@ testppd:	testppd.o libcups.a test.ppd test2.ppd
 	./testppd


+#
+# testpwg (dependency on static CUPS library is intentional)
+#
+
+testpwg:	testpwg.o libcups.a test.ppd
+	echo Linking $@...
+	$(CC) $(ARCHFLAGS) $(LDFLAGS) -o $@ testpwg.o libcups.a \
+		$(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
+	echo Running PWG API tests...
+	./testpwg test.ppd
+
+
 #
 # testsnmp (dependency on static CUPS library is intentional)
 #
@@ -4,7 +4,7 @@
 *   Administration utility API definitions for the Common UNIX Printing
 *   System (CUPS).
 *
- *   Copyright 2007-2009 by Apple Inc.
+ *   Copyright 2007-2010 by Apple Inc.
 *   Copyright 2001-2007 by Easy Software Products.
 *
 *   These coded instructions, statements, and computer programs are the
@@ -862,25 +862,6 @@ cupsAdminGetServerSettings(
    http_t        *http,		/* I - Connection to server or @code CUPS_HTTP_DEFAULT@ */
    int           *num_settings,	/* O - Number of settings */
    cups_option_t **settings)		/* O - Settings */
-{
-  return (_cupsAdminGetServerSettings(http, num_settings, settings));
-}
-
-
-/*
- * '_cupsAdminGetServerSettings()' - Get settings from the server.
- *
- * The returned settings should be freed with cupsFreeOptions() when
- * you are done with them.
- *
- * @since CUPS 1.2@
- */
-
-int					/* O - 1 on success, 0 on failure */
-_cupsAdminGetServerSettings(
-    http_t        *http,		/* I - Connection to server or @code CUPS_HTTP_DEFAULT@ */
-    int           *num_settings,	/* O - Number of settings */
-    cups_option_t **settings)		/* O - Settings */
 {
  int		i;			/* Looping var */
  cups_file_t	*cupsd;			/* cupsd.conf file */
@@ -1213,22 +1194,6 @@ cupsAdminSetServerSettings(
    http_t        *http,		/* I - Connection to server or @code CUPS_HTTP_DEFAULT@ */
    int           num_settings,		/* I - Number of settings */
    cups_option_t *settings)		/* I - Settings */
-{
-  return (_cupsAdminSetServerSettings(http, num_settings, settings));
-}
-
-
-/*
- * '_cupsAdminSetServerSettings()' - Set settings on the server.
- *
- * @since CUPS 1.2@
- */
-
-int					/* O - 1 on success, 0 on failure */
-_cupsAdminSetServerSettings(
-    http_t        *http,		/* I - Connection to server or @code CUPS_HTTP_DEFAULT@ */
-    int           num_settings,		/* I - Number of settings */
-    cups_option_t *settings)		/* I - Settings */
 {
  int		i;			/* Looping var */
  http_status_t status;			/* GET/PUT status */
@@ -1309,8 +1274,8 @@ _cupsAdminSetServerSettings(
  * Get current settings...
  */

-  if (!_cupsAdminGetServerSettings(http, &cupsd_num_settings,
-                                   &cupsd_settings))
+  if (!cupsAdminGetServerSettings(http, &cupsd_num_settings,
+				  &cupsd_settings))
    return (0);

  if ((val = cupsGetOption(CUPS_SERVER_DEBUG_LOGGING, cupsd_num_settings,
@@ -1331,6 +1296,9 @@ _cupsAdminSetServerSettings(
  else
    remote_any = 0;

+  DEBUG_printf(("1cupsAdminSetServerSettings: old remote_any=%d",
+                remote_any));
+
  if ((val = cupsGetOption(CUPS_SERVER_REMOTE_PRINTERS, cupsd_num_settings,
                           cupsd_settings)) != NULL)
    old_remote_printers = atoi(val);
@@ -1495,13 +1463,13 @@ _cupsAdminSetServerSettings(
  while (cupsFileGetConf(cupsd, line, sizeof(line), &value, &linenum))
  {
    if ((!strcasecmp(line, "Port") || !strcasecmp(line, "Listen")) &&
-        (share_printers >= 0 || remote_admin >= 0))
+        (remote_admin >= 0 || remote_any > 0 || share_printers >= 0))
    {
      if (!wrote_port_listen)
      {
        wrote_port_listen = 1;

-	if (share_printers > 0 || remote_admin > 0)
+	if (remote_admin > 0 || remote_any > 0 || share_printers > 0)
 	{
 	  cupsFilePuts(temp, "# Allow remote access\n");
 	  cupsFilePrintf(temp, "Port %d\n", server_port);
@@ -1553,7 +1521,7 @@ _cupsAdminSetServerSettings(
 	  const char *remotep = cupsGetOption("BrowseRemoteProtocols",
 					      num_settings, settings);

-          if (!localp)
+          if (!localp || !localp[0])
 	    localp = cupsGetOption("BrowseLocalProtocols", cupsd_num_settings,
 	                           cupsd_settings);

@@ -1709,7 +1677,8 @@ _cupsAdminSetServerSettings(
 	  cupsFilePrintf(temp, "  Allow %s\n",
 	                 remote_any > 0 ? "all" : "@LOCAL");
      }
-      else if (in_root_location && (remote_admin >= 0 || share_printers >= 0))
+      else if (in_root_location &&
+               (remote_admin >= 0 || remote_any >= 0 || share_printers >= 0))
      {
 	wrote_root_location = 1;

@@ -1720,12 +1689,14 @@ _cupsAdminSetServerSettings(
          cupsFilePuts(temp, "  # Allow remote administration...\n");
 	else if (share_printers > 0)
          cupsFilePuts(temp, "  # Allow shared printing...\n");
+	else if (remote_any > 0)
+          cupsFilePuts(temp, "  # Allow remote access...\n");
 	else
          cupsFilePuts(temp, "  # Restrict access to the server...\n");

        cupsFilePuts(temp, "  Order allow,deny\n");

-	if (remote_admin > 0 || share_printers > 0)
+	if (remote_admin > 0 || remote_any > 0 || share_printers > 0)
 	  cupsFilePrintf(temp, "  Allow %s\n",
 	                 remote_any > 0 ? "all" : "@LOCAL");
      }
@@ -1910,9 +1881,10 @@ _cupsAdminSetServerSettings(
    }
  }

-  if (!wrote_port_listen && (share_printers >= 0 || remote_admin >= 0))
+  if (!wrote_port_listen &&
+      (remote_admin >= 0 || remote_any >= 0 || share_printers >= 0))
  {
-    if (share_printers > 0 || remote_admin > 0)
+    if (remote_admin > 0 || remote_any > 0 || share_printers > 0)
    {
      cupsFilePuts(temp, "# Allow remote access\n");
      cupsFilePrintf(temp, "Port %d\n", ippPort());
@@ -1930,7 +1902,8 @@ _cupsAdminSetServerSettings(
 #endif /* CUPS_DEFAULT_DOMAINSOCKET */
  }

-  if (!wrote_root_location && (remote_admin >= 0 || share_printers >= 0))
+  if (!wrote_root_location &&
+      (remote_admin >= 0 || remote_any >= 0 || share_printers >= 0))
  {
    if (remote_admin > 0 && share_printers > 0)
      cupsFilePuts(temp,
@@ -1939,13 +1912,15 @@ _cupsAdminSetServerSettings(
      cupsFilePuts(temp, "# Allow remote administration...\n");
    else if (share_printers > 0)
      cupsFilePuts(temp, "# Allow shared printing...\n");
+    else if (remote_any > 0)
+      cupsFilePuts(temp, "# Allow remote access...\n");
    else
      cupsFilePuts(temp, "# Restrict access to the server...\n");

    cupsFilePuts(temp, "<Location />\n"
                       "  Order allow,deny\n");

-    if (remote_admin > 0 || share_printers > 0)
+    if (remote_admin > 0 || remote_any > 0 || share_printers > 0)
      cupsFilePrintf(temp, "  Allow %s\n", remote_any > 0 ? "all" : "@LOCAL");

    cupsFilePuts(temp, "</Location>\n");
@@ -2173,18 +2148,23 @@ do_samba_command(const char *command,	/* I - Command to run */
    * Child goes here, redirect stdin/out/err and execute the command...
    */

-    close(0);
-    open("/dev/null", O_RDONLY);
+    int fd = open("/dev/null", O_RDONLY);

-    close(1);
+    if (fd > 0)
+    {
+      dup2(fd, 0);
+      close(fd);
+    }

    if (logfile)
-      dup(fileno(logfile));
-    else
-      open("/dev/null", O_WRONLY);
+      dup2(fileno(logfile), 1);
+    else if ((fd = open("/dev/null", O_WRONLY)) > 1)
+    {
+      dup2(fd, 1);
+      close(fd);
+    }

-    close(2);
-    dup(1);
+    dup2(1, 2);

    execlp(command, command, address, "-N", "-A", authfile, "-c", subcmd,
           (char *)0);
@@ -1,13 +1,9 @@
 /*
 * "$Id$"
 *
- *   Administration utility API definitions for the Common UNIX Printing
- *   System (CUPS).
+ *   Administration utility API definitions for CUPS.
 *
- *   MANY OF THE FUNCTIONS IN THIS HEADER ARE PRIVATE AND SUBJECT TO
- *   CHANGE AT ANY TIME.  USE AT YOUR OWN RISK.
- *
- *   Copyright 2007 by Apple Inc.
+ *   Copyright 2007-2010 by Apple Inc.
 *   Copyright 2001-2007 by Easy Software Products.
 *
 *   These coded instructions, statements, and computer programs are the
@@ -1,9 +1,9 @@
 <!--
-  "$Id: api-cups.shtml 7337 2008-02-22 04:44:04Z mike $"
+  "$Id: api-cups.shtml 9061 2010-03-30 22:07:33Z mike $"

  CUPS API introduction for the Common UNIX Printing System (CUPS).

-  Copyright 2007-2008 by Apple Inc.
+  Copyright 2007-2010 by Apple Inc.
  Copyright 1997-2006 by Easy Software Products, all rights reserved.

  These coded instructions, statements, and computer programs are the
@@ -82,12 +82,13 @@ instance will return the default instance for that destination.</p>
 </tr>
 <tr>
 	<td>"printer-is-accepting-jobs"</td>
-	<td>"1" if the destination is accepting new jobs, "0" if not.</td>
+	<td>"true" if the destination is accepting new jobs, "false" if
+	not.</td>
 </tr>
 <tr>
 	<td>"printer-is-shared"</td>
-	<td>"1" if the destination is being shared with other computers, "0" if
-	not.</td>
+	<td>"true" if the destination is being shared with other computers,
+	"false" if not.</td>
 </tr>
 <tr>
 	<td>"printer-location"</td>
@@ -1,5 +1,5 @@
 <!--
-  "$Id: api-filter.header 8627 2009-05-13 21:39:17Z mike $"
+  "$Id: api-filter.header 8673 2009-05-22 17:34:15Z mike $"

  Filter and backend programming header for the Common UNIX Printing System
  (CUPS).
@@ -34,6 +34,8 @@
 	Programming: <a href='api-cups.html' target='_top'>CUPS API</a><br>
 	Programming: <a href='api-ppd.html' target='_top'>PPD API</a><br>
 	Programming: <a href='api-raster.html' target='_top'>Raster API</a><br>
+	Programming: <a href='postscript-driver.html' target='_top'>Developing PostScript Printer Drivers</a><br>
+	Programming: <a href='raster-driver.html' target='_top'>Developing Raster Printer Drivers</a><br>
 	Specifications: <a href='spec-design' target='_top'>CUPS Design Description</a></td>
 </tr>
 </tbody>
@@ -1,5 +1,5 @@
 <!--
-  "$Id: api-filter.shtml 8628 2009-05-13 22:25:34Z mike $"
+  "$Id: api-filter.shtml 9120 2010-04-23 18:56:34Z mike $"

  Filter and backend programming introduction for the Common UNIX Printing
  System (CUPS).
@@ -67,7 +67,7 @@ specify an arbitrary file path to a separator page, template, or other file
 used by the filter since that can lead to an unauthorized disclosure of
 information. <em>Always</em> treat input as suspect and validate it!</p>

-<p>If you are developing a backend that runs as root , make sure to check for
+<p>If you are developing a backend that runs as root, make sure to check for
 potential buffer overflows, integer under/overflow conditions, and file
 accesses since these can lead to privilege escalations. When writing files,
 always validate the file path and <em>never</em> allow a user to determine
@@ -88,15 +88,15 @@ Mac OS X, for example, no backend may write to a user's home directory.</p>
 <h3><a name="PERMISSIONS">File Permissions</a></h3>

 <p>For security reasons, CUPS will only run filters and backends that are owned
-by root and do not have world write permissions. The recommended permissions for
-filters and backends are 0555 - read and execute but no write. Backends that
-must run as root should use permissions of 0500 - read and execute by root, no
-access for other users. Write permissions can be enabled for the root user
-only.</p>
+by root and do not have world or group write permissions. The recommended
+permissions for filters and backends are 0555 - read and execute but no write.
+Backends that must run as root should use permissions of 0500 - read and execute
+by root, no access for other users. Write permissions can be enabled for the
+root user only.</p>

 <p>To avoid a warning message, the directory containing your filter(s) must also
-be owned by root and have world write disabled - permissions of 0755 or 0555 are
-strongly encouraged.</p>
+be owned by root and have world and group write disabled - permissions of 0755
+or 0555 are strongly encouraged.</p>

 <h3><a name="TEMPFILES">Temporary Files</a></h3>

@@ -127,7 +127,7 @@ when running print filters and backends:</p>

 <dl class="code">

-	<dt>APPLE_LANGUAGES</dt>
+	<dt>APPLE_LANGUAGE</dt>
 	<dd>The Apple language identifier associated with the job
 	(Mac OS X only).</dd>

@@ -264,7 +264,16 @@ prefix strings:</p>
 	current queue. Typically this is used to indicate persistent media,
 	ink, toner, and configuration conditions or errors on a printer.
 	<a href='#TABLE2'>Table 2</a> lists the standard state keywords -
-	use vendor-prefixed ("com.acme.foo") keywords for custom states.</dd>
+	use vendor-prefixed ("com.acme.foo") keywords for custom states.
+
+	<blockquote><b>Note:</b>
+
+	<p>"STATE:" messages often provide visible alerts to the user. For example, on
+	Mac OS X setting a printer-state-reason value with an "-error" or "-warning"
+	suffix will cause the printer's dock item to bounce if the corresponding reason
+	is localized with a cupsIPPReason keyword in the printer's PPD file.</p>
+
+	</blockquote></dd>

 	<dt>WARNING: message</dt>
 	<dd>Sets the printer-state-message attribute and adds the specified
@@ -276,7 +285,6 @@ prefix strings:</p>
 <p>Messages without one of these prefixes are treated as if they began with
 the "DEBUG:" prefix string.</p>

-
 <div class='table'><table width='80%' summary='Table 1: Standard marker-types Values'>
 <caption>Table 1: <a name='TABLE1'>Standard marker-types Values</a></caption>
 <thead>
@@ -3,7 +3,7 @@
 *
 *   Authentication functions for the Common UNIX Printing System (CUPS).
 *
- *   Copyright 2007-2009 by Apple Inc.
+ *   Copyright 2007-2010 by Apple Inc.
 *   Copyright 1997-2007 by Easy Software Products.
 *
 *   This file contains Kerberos support code, copyright 2006 by
@@ -98,10 +98,6 @@ cupsDoAuthentication(

  DEBUG_printf(("cupsDoAuthentication(http=%p, method=\"%s\", resource=\"%s\")",
                http, method, resource));
-  DEBUG_printf(("2cupsDoAuthentication: digest_tries=%d, userpass=\"%s\"",
-                http->digest_tries, http->userpass));
-  DEBUG_printf(("2cupsDoAuthentication: WWW-Authenticate=\"%s\"",
-                httpGetField(http, HTTP_FIELD_WWW_AUTHENTICATE)));

  if (!http)
    http = _cupsConnect();
@@ -109,6 +105,11 @@ cupsDoAuthentication(
  if (!http || !method || !resource)
    return (-1);

+  DEBUG_printf(("2cupsDoAuthentication: digest_tries=%d, userpass=\"%s\"",
+                http->digest_tries, http->userpass));
+  DEBUG_printf(("2cupsDoAuthentication: WWW-Authenticate=\"%s\"",
+                httpGetField(http, HTTP_FIELD_WWW_AUTHENTICATE)));
+
 /*
  * Clear the current authentication string...
  */
@@ -181,6 +182,15 @@ cupsDoAuthentication(
  else if (http->status == HTTP_UNAUTHORIZED)
    http->digest_tries ++;

+  if (http->status == HTTP_UNAUTHORIZED && http->digest_tries >= 3)
+  {
+    DEBUG_printf(("1cupsDoAuthentication: Too many authentication tries (%d)",
+		  http->digest_tries));
+
+    http->status = HTTP_AUTHORIZATION_CANCELED;
+    return (-1);
+  }
+
 /*
  * Got a password; encode it for the server...
  */
@@ -222,15 +232,6 @@ cupsDoAuthentication(
    }
 #  endif /* __APPLE__ */

-    if (http->status == HTTP_UNAUTHORIZED && http->digest_tries >= 3)
-    {
-      DEBUG_printf(("1cupsDoAuthentication: too many Negotiate tries (%d)",
-                    http->digest_tries));
-      http->status = HTTP_AUTHORIZATION_CANCELED;
-  
-      return (-1);
-    }
-
    if (http->gssname == GSS_C_NO_NAME)
    {
      if ((gss_service_name = getenv("CUPS_GSSSERVICENAME")) == NULL)
@@ -26,6 +26,14 @@
 #  include "versioning.h"


+/*
+ * C++ magic...
+ */
+
+#  ifdef __cplusplus
+extern "C" {
+#  endif /* __cplusplus */
+
 /*
 * Constants...
 */
@@ -57,6 +65,10 @@ extern void		cupsBackendReport(const char *device_scheme,
 					  _CUPS_API_1_4;
 			                  

+#  ifdef __cplusplus
+}
+#  endif /* __cplusplus */
+
 #endif /* !_CUPS_BACKEND_H_ */

 /*
@@ -583,9 +583,13 @@ ppdConflicts(ppd_file_t *ppd)		/* I - PPD to check */
  * Clear all conflicts...
  */

+  cupsArraySave(ppd->options);
+
  for (o = ppdFirstOption(ppd); o; o = ppdNextOption(ppd))
    o->conflicted = 0;

+  cupsArrayRestore(ppd->options);
+
 /*
  * Test for conflicts...
  */
@@ -641,7 +645,7 @@ ppdInstallableConflict(
  DEBUG_printf(("2ppdInstallableConflict(ppd=%p, option=\"%s\", choice=\"%s\")",
                ppd, option, choice));

- /* 
+ /*
  * Range check input...
  */

@@ -1,9 +1,9 @@
 /*
 * "$Id$"
 *
- *   API definitions for the Common UNIX Printing System (CUPS).
+ *   API definitions for CUPS.
 *
- *   Copyright 2007-2009 by Apple Inc.
+ *   Copyright 2007-2010 by Apple Inc.
 *   Copyright 1997-2007 by Easy Software Products.
 *
 *   These coded instructions, statements, and computer programs are the
@@ -25,10 +25,12 @@
 #  include <sys/types.h>
 #  if defined(WIN32) && !defined(__CUPS_SSIZE_T_DEFINED)
 #    define __CUPS_SSIZE_T_DEFINED
+#    include <stddef.h>
 /* Windows does not support the ssize_t type, so map it to off_t... */
 typedef off_t ssize_t;			/* @private@ */
 #  endif /* WIN32 && !__CUPS_SSIZE_T_DEFINED */

+#  include "file.h"
 #  include "ipp.h"
 #  include "ppd.h"
 #  include "language.h"
@@ -59,10 +61,10 @@ extern "C" {
 * Constants...
 */

-#  define CUPS_VERSION		1.0400
+#  define CUPS_VERSION		1.0404
 #  define CUPS_VERSION_MAJOR	1
 #  define CUPS_VERSION_MINOR	4
-#  define CUPS_VERSION_PATCH	-1
+#  define CUPS_VERSION_PATCH	4

 #  define CUPS_BC_FD		3	/* Back-channel file descriptor for select/poll */
 #  define CUPS_DATE_ANY		(time_t)-1
@@ -253,7 +255,7 @@ extern int		cupsPrintFiles2(http_t *http, const char *name,
 extern int		cupsSetDests2(http_t *http, int num_dests,
 			              cups_dest_t *dests) _CUPS_API_1_1_21;

-/**** New in CUPS 1.2 ****/
+/**** New in CUPS 1.2/Mac OS X 10.5 ****/
 extern ssize_t		cupsBackChannelRead(char *buffer, size_t bytes,
 			                    double timeout) _CUPS_API_1_2;
 extern ssize_t		cupsBackChannelWrite(const char *buffer, size_t bytes,
@@ -268,7 +270,7 @@ extern int		cupsRemoveOption(const char *name, int num_options,
 			                 cups_option_t **options) _CUPS_API_1_2;
 extern cups_file_t	*cupsTempFile2(char *filename, int len) _CUPS_API_1_2;

-/**** New in CUPS 1.3 ****/
+/**** New in CUPS 1.3/Mac OS X 10.5 ****/
 extern ipp_t		*cupsDoIORequest(http_t *http, ipp_t *request,
 			                 const char *resource, int infile,
 					 int outfile) _CUPS_API_1_3;
@@ -281,7 +283,7 @@ extern void		cupsSetDefaultDest(const char *name,
 					   int num_dests,
 					   cups_dest_t *dests) _CUPS_API_1_3;

-/**** New in CUPS 1.4 ****/
+/**** New in CUPS 1.4/Mac OS X 10.6 ****/
 extern ipp_status_t	cupsCancelJob2(http_t *http, const char *name,
 			               int job_id, int purge) _CUPS_API_1_4;
 extern int		cupsCreateJob(http_t *http, const char *name,
@@ -33,7 +33,6 @@
 *                           server.
 *   appleCopyLocations()  - Copy the location history array.
 *   appleCopyNetwork()    - Get the network ID for the current location.
- *   appleGetDefault()     - Get the default printer for this location.
 *   appleGetPaperSize()   - Get the default paper size.
 *   appleGetPrinter()     - Get a printer from the history array.
 *   appleSetDefault()     - Set the default printer for this location.
@@ -54,7 +53,7 @@

 #include "debug.h"
 #include "globals.h"
-#include "pwgmedia.h"
+#include "pwg-private.h"
 #include <stdlib.h>
 #include <ctype.h>
 #include <sys/stat.h>
@@ -139,12 +138,17 @@ cupsAddDest(const char  *name,		/* I  - Destination name */

  if (!cupsGetDest(name, instance, num_dests, *dests))
  {
-    if (instance &&
-        (parent = cupsGetDest(name, NULL, num_dests, *dests)) == NULL)
+    if (instance && !cupsGetDest(name, NULL, num_dests, *dests))
      return (num_dests);

    dest = cups_add_dest(name, instance, &num_dests, dests);

+   /*
+    * Find the base dest again now the array has been realloc'd.
+    */
+
+    parent = cupsGetDest(name, NULL, num_dests, *dests);
+
    if (instance && parent && parent->num_options > 0)
    {
     /*
@@ -549,7 +553,7 @@ cupsGetNamedDest(http_t     *http,	/* I - Connection to server or @code CUPS_HTT

  if (!cups_get_sdests(http, op, name, 0, &dest))
  {
-    if (op == CUPS_GET_DEFAULT)
+    if (op == CUPS_GET_DEFAULT || (name && !set_as_default))
      return (NULL);

   /*
@@ -557,7 +561,7 @@ cupsGetNamedDest(http_t     *http,	/* I - Connection to server or @code CUPS_HTT
    * configuration file does not exist.  Find out the real default.
    */

-    if (!cups_get_sdests(http, CUPS_GET_DEFAULT, name, 0, &dest))
+    if (!cups_get_sdests(http, CUPS_GET_DEFAULT, NULL, 0, &dest))
      return (NULL);
  }

@@ -1109,8 +1113,8 @@ static char *				/* O - Default paper size */
 appleGetPaperSize(char *name,		/* I - Paper size name buffer */
                  int  namesize)	/* I - Size of buffer */
 {
-  CFStringRef		defaultPaperID;	/* Default paper ID */
-  _cups_pwg_media_t	*pwgmedia;	/* PWG media size */
+  CFStringRef	defaultPaperID;		/* Default paper ID */
+  _pwg_media_t	*pwgmedia;		/* PWG media size */


  defaultPaperID = CFPreferencesCopyAppValue(kDefaultPaperIDKey,
@@ -1120,7 +1124,7 @@ appleGetPaperSize(char *name,		/* I - Paper size name buffer */
      !CFStringGetCString(defaultPaperID, name, namesize,
 			  kCFStringEncodingUTF8))
    name[0] = '\0';
-  else if ((pwgmedia = _cupsPWGMediaByLegacy(name)) != NULL)
+  else if ((pwgmedia = _pwgMediaForLegacy(name)) != NULL)
    strlcpy(name, pwgmedia->pwg, namesize);

  if (defaultPaperID)
@@ -1288,6 +1292,9 @@ appleUseLastPrinter(void)
  CFPropertyListRef	uselast;	/* Use last printer preference value */


+  if (getenv("CUPS_DISABLE_APPLE_DEFAULT"))
+    return (0);
+
  if ((uselast = CFPreferencesCopyAppValue(kUseLastPrinterAsCurrentPrinterKey,
                                           kPMPrintingPreferences)) != NULL)
  {
@@ -1800,7 +1807,7 @@ cups_get_sdests(http_t      *http,	/* I - Connection to server or CUPS_HTTP_DEFA
  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_NAME,
               "requesting-user-name", NULL, cupsUser());

-  if (name)
+  if (name && op != CUPS_GET_DEFAULT)
  {
    httpAssembleURIf(HTTP_URI_CODING_ALL, uri, sizeof(uri), "ipp", NULL,
                     "localhost", ippPort(), "/printers/%s", name);
@@ -772,6 +772,7 @@ ppdEmitString(ppd_file_t    *ppd,	/* I - PPD file record */
    if (section == PPD_ORDER_JCL)
    {
      if (!strcasecmp(choices[i]->choice, "Custom") &&
+	  choices[i]->code &&
          (coption = ppdFindCustomOption(ppd, choices[i]->option->keyword))
 	      != NULL)
      {
@@ -8,7 +8,7 @@
 *   our own file functions allows us to provide transparent support of
 *   gzip'd print files, PPD files, etc.
 *
- *   Copyright 2007-2009 by Apple Inc.
+ *   Copyright 2007-2010 by Apple Inc.
 *   Copyright 1997-2007 by Easy Software Products, all rights reserved.
 *
 *   These coded instructions, statements, and computer programs are the
@@ -59,6 +59,8 @@
 */

 #include "file-private.h"
+#include <sys/stat.h>
+#include <sys/types.h>


 /*
@@ -69,6 +71,7 @@
 static ssize_t	cups_compress(cups_file_t *fp, const char *buf, size_t bytes);
 #endif /* HAVE_LIBZ */
 static ssize_t	cups_fill(cups_file_t *fp);
+static int	cups_open(const char *filename, int mode);
 static ssize_t	cups_read(cups_file_t *fp, char *buf, size_t bytes);
 static ssize_t	cups_write(cups_file_t *fp, const char *buf, size_t bytes);

@@ -827,7 +830,8 @@ cupsFileOpen(const char *filename,	/* I - Name of file */
  switch (*mode)
  {
    case 'a' : /* Append file */
-        fd = open(filename, O_RDWR | O_CREAT | O_APPEND | O_LARGEFILE | O_BINARY, 0666);
+        fd = cups_open(filename,
+		       O_RDWR | O_CREAT | O_APPEND | O_LARGEFILE | O_BINARY);
        break;

    case 'r' : /* Read file */
@@ -835,7 +839,21 @@ cupsFileOpen(const char *filename,	/* I - Name of file */
 	break;

    case 'w' : /* Write file */
-        fd = open(filename, O_WRONLY | O_TRUNC | O_CREAT | O_LARGEFILE | O_BINARY, 0666);
+        fd = cups_open(filename, O_WRONLY | O_LARGEFILE | O_BINARY);
+	if (fd < 0 && errno == ENOENT)
+	{
+	  fd = cups_open(filename,
+	                 O_WRONLY | O_CREAT | O_EXCL | O_LARGEFILE | O_BINARY);
+	  if (fd < 0 && errno == EEXIST)
+	    fd = cups_open(filename, O_WRONLY | O_LARGEFILE | O_BINARY);
+	}
+
+	if (fd >= 0)
+#ifdef WIN32
+	  _chsize(fd, 0);
+#else
+	  ftruncate(fd, 0);
+#endif /* WIN32 */
        break;

    case 's' : /* Read/write socket */
@@ -2208,6 +2226,94 @@ cups_fill(cups_file_t *fp)		/* I - CUPS file */
 }


+/*
+ * 'cups_open()' - Safely open a file for writing.
+ *
+ * We don't allow appending to directories or files that are hard-linked or
+ * symlinked.
+ */
+
+static int				/* O - File descriptor or -1 otherwise */
+cups_open(const char *filename,		/* I - Filename */
+	  int        mode)		/* I - Open mode */
+{
+  int		fd;			/* File descriptor */
+  struct stat	fileinfo;		/* File information */
+#ifndef WIN32
+  struct stat	linkinfo;		/* Link information */
+#endif /* !WIN32 */
+
+
+ /*
+  * Open the file...
+  */
+
+  if ((fd = open(filename, mode, 0666)) < 0)
+    return (-1);
+
+ /*
+  * Then verify that the file descriptor doesn't point to a directory or hard-
+  * linked file.
+  */
+
+  if (fstat(fd, &fileinfo))
+  {
+    close(fd);
+    return (-1);
+  }
+
+  if (fileinfo.st_nlink != 1)
+  {
+    close(fd);
+    errno = EPERM;
+    return (-1);
+  }
+
+#ifdef WIN32
+  if (fileinfo.st_mode & _S_IFDIR)
+#else
+  if (S_ISDIR(fileinfo.st_mode))
+#endif /* WIN32 */
+  {
+    close(fd);
+    errno = EISDIR;
+    return (-1);
+  }
+
+#ifndef WIN32
+ /*
+  * Then use lstat to determine whether the filename is a symlink...
+  */
+
+  if (lstat(filename, &linkinfo))
+  {
+    close(fd);
+    return (-1);
+  }
+
+  if (S_ISLNK(linkinfo.st_mode) ||
+      fileinfo.st_dev != linkinfo.st_dev ||
+      fileinfo.st_ino != linkinfo.st_ino ||
+#ifdef HAVE_ST_GEN
+      fileinfo.st_gen != linkinfo.st_gen ||
+#endif /* HAVE_ST_GEN */
+      fileinfo.st_nlink != linkinfo.st_nlink ||
+      fileinfo.st_mode != linkinfo.st_mode)
+  {
+   /*
+    * Yes, don't allow!
+    */
+
+    close(fd);
+    errno = EPERM;
+    return (-1);
+  }
+#endif /* !WIN32 */
+
+  return (fd);
+}
+
+
 /*
 * 'cups_read()' - Read from a file descriptor.
 */
@@ -27,6 +27,7 @@
 */

 #  include "versioning.h"
+#  include <stddef.h>
 #  include <sys/types.h>
 #  if defined(WIN32) && !defined(__CUPS_SSIZE_T_DEFINED)
 #    define __CUPS_SSIZE_T_DEFINED
@@ -3,7 +3,7 @@
 *
 *   cupsGetDevices implementation for the Common UNIX Printing System (CUPS).
 *
- *   Copyright 2008-2009 by Apple Inc.
+ *   Copyright 2008-2010 by Apple Inc.
 *
 *   These coded instructions, statements, and computer programs are the
 *   property of Apple Inc. and are protected by Federal copyright
@@ -258,7 +258,7 @@ cupsGetDevices(
  httpBlocking(http, blocking);
  httpFlush(http);

-  if (status == IPP_ERROR)
+  if (status == HTTP_ERROR)
    _cupsSetError(IPP_ERROR, NULL, 0);
  else
  {
@@ -38,20 +38,46 @@
 static void
 cups_env_init(_cups_globals_t *g)	/* I - Global data */
 {
-  if ((g->cups_datadir = getenv("CUPS_DATADIR")) == NULL)
-    g->cups_datadir = CUPS_DATADIR;
+#ifndef WIN32
+#  ifdef HAVE_GETEUID
+  if ((geteuid() != getuid() && getuid()) || getegid() != getgid())
+#  else
+  if (!getuid())
+#  endif /* HAVE_GETEUID */
+  {
+   /*
+    * When running setuid/setgid, don't allow environment variables to override
+    * the directories...
+    */

-  if ((g->cups_serverbin = getenv("CUPS_SERVERBIN")) == NULL)
-    g->cups_serverbin = CUPS_SERVERBIN;
-
-  if ((g->cups_serverroot = getenv("CUPS_SERVERROOT")) == NULL)
+    g->cups_datadir    = CUPS_DATADIR;
+    g->cups_serverbin  = CUPS_SERVERBIN;
    g->cups_serverroot = CUPS_SERVERROOT;
+    g->cups_statedir   = CUPS_STATEDIR;
+    g->localedir       = CUPS_LOCALEDIR;
+  }
+  else
+#endif /* !WIN32 */
+  {
+   /*
+    * Allow directories to be overridden by environment variables.
+    */

-  if ((g->cups_statedir = getenv("CUPS_STATEDIR")) == NULL)
-    g->cups_statedir = CUPS_STATEDIR;
+    if ((g->cups_datadir = getenv("CUPS_DATADIR")) == NULL)
+      g->cups_datadir = CUPS_DATADIR;

-  if ((g->localedir = getenv("LOCALEDIR")) == NULL)
-    g->localedir = CUPS_LOCALEDIR;
+    if ((g->cups_serverbin = getenv("CUPS_SERVERBIN")) == NULL)
+      g->cups_serverbin = CUPS_SERVERBIN;
+
+    if ((g->cups_serverroot = getenv("CUPS_SERVERROOT")) == NULL)
+      g->cups_serverroot = CUPS_SERVERROOT;
+
+    if ((g->cups_statedir = getenv("CUPS_STATEDIR")) == NULL)
+      g->cups_statedir = CUPS_STATEDIR;
+
+    if ((g->localedir = getenv("LOCALEDIR")) == NULL)
+      g->localedir = CUPS_LOCALEDIR;
+  }
 }


@@ -159,7 +185,9 @@ globals_destructor(void *value)		/* I - Data to free */
  if (cg->last_status_message)
    _cupsStrFree(cg->last_status_message);

+#  ifndef CUPS_LITE
  cupsFreeOptions(cg->cupsd_num_settings, cg->cupsd_settings);
+#  endif /* !CUPS_LITE */

  for (buffer = cg->ipp_buffers; buffer; buffer = next)
  {
@@ -26,6 +26,7 @@
 #  include "http-private.h"
 #  include "cups.h"
 #  include "i18n.h"
+#  include "pwg-private.h"

 #  ifdef HAVE_PTHREAD_H
 #    include <pthread.h>
@@ -103,9 +104,12 @@ typedef struct _cups_globals_s		/**** CUPS global state data ****/
  int			ppd_line;	/* Current line number */
  ppd_conform_t		ppd_conform;	/* Level of conformance required */

-  /* pwgmedia.c */
-  cups_array_t		*pwg_size_lut,	/* Lookup table for PWG names */
-			*leg_size_lut;	/* Lookup table for legacy names */
+  /* pwg-media.c */
+  cups_array_t		*leg_size_lut,	/* Lookup table for legacy names */
+			*ppd_size_lut,	/* Lookup table for PPD names */
+			*pwg_size_lut;	/* Lookup table for PWG names */
+  _pwg_media_t		pwg_media;	/* PWG media data for custom size */
+  char			pwg_name[65];	/* PWG media name for custom size */

  /* snmp.c */
  char			snmp_community[255];
@@ -98,6 +98,7 @@ extern BIO_METHOD *_httpBIOMethods(void);
 * The GNU TLS library is more of a "bare metal" SSL/TLS library...
 */
 #    include <gnutls/gnutls.h>
+#    include <gcrypt.h>

 typedef struct
 {
@@ -50,6 +50,7 @@
 #include "debug.h"
 #include "globals.h"
 #include <stdlib.h>
+#include <errno.h>
 #ifdef HAVE_DNSSD
 #  include <dns_sd.h>
 #  include <poll.h>
@@ -1406,7 +1407,6 @@ _httpResolveURI(
      fputs("STATE: +connecting-to-device\n", stderr);
      fprintf(stderr, "DEBUG: Resolving \"%s\", regtype=\"%s\", "
                      "domain=\"local.\"...\n", hostname, regtype);
-      _cupsLangPuts(stderr, _("INFO: Looking for printer...\n"));
    }

    uri = NULL;
@@ -1418,36 +1418,65 @@ _httpResolveURI(
 			    hostname, regtype, "local.", resolve_callback,
 			    &uribuf) == kDNSServiceErr_NoError)
      {
-        if (strcasecmp(domain, "local."))
+	int	fds;			/* Number of ready descriptors */
+	time_t	timeout,		/* Poll timeout */
+		start_time = time(NULL);/* Start time */
+
+	for (;;)
 	{
+	  if (logit)
+	    _cupsLangPuts(stderr, _("INFO: Looking for printer...\n"));
+
 	 /*
-	  * Wait 2 seconds for a response to the local resolve; if nothing comes
-	  * in, do an additional domain resolution...
+	  * For the first minute, wakeup every 2 seconds to emit a
+	  * "looking for printer" message...
 	  */

+	  timeout = (time(NULL) < (start_time + 60)) ? 2000 : -1;
+
 	  polldata.fd     = DNSServiceRefSockFD(ref);
 	  polldata.events = POLLIN;

-	  if (poll(&polldata, 1, 2000) != 1)
+	  fds = poll(&polldata, 1, timeout);
+
+	  if (fds < 0)
+	  {
+	    if (errno != EINTR && errno != EAGAIN)
+	    {
+	      DEBUG_printf(("5_httpResolveURI: poll error: %s", strerror(errno)));
+	      break;
+	    }
+	  }
+	  else if (fds == 0)
 	  {
 	   /*
-	    * OK, send the domain name resolve...
+	    * Wait 2 seconds for a response to the local resolve; if nothing
+	    * comes in, do an additional domain resolution...
 	    */

-	    if (logit)
-	      fprintf(stderr, "DEBUG: Resolving \"%s\", regtype=\"%s\", "
-		              "domain=\"%s\"...\n", hostname, regtype, domain);
-
-	    domainref = ref;
-	    if (DNSServiceResolve(&domainref, kDNSServiceFlagsShareConnection, 0,
-				  hostname, regtype, domain, resolve_callback,
-				  &uribuf) == kDNSServiceErr_NoError)
-	      domainsent = 1;
+	    if (domainsent == 0 && strcasecmp(domain, "local."))
+	    {
+	      if (logit)
+		fprintf(stderr,
+		        "DEBUG: Resolving \"%s\", regtype=\"%s\", "
+			"domain=\"%s\"...\n", hostname, regtype, domain);
+  
+	      domainref = ref;
+	      if (DNSServiceResolve(&domainref, kDNSServiceFlagsShareConnection, 0,
+				    hostname, regtype, domain, resolve_callback,
+				    &uribuf) == kDNSServiceErr_NoError)
+		domainsent = 1;
+	    }
 	  }
-        }
-
-	if (DNSServiceProcessResult(ref) == kDNSServiceErr_NoError)
-	  uri = resolved_uri;
+	  else
+	  {
+	    if (DNSServiceProcessResult(ref) == kDNSServiceErr_NoError)
+	    {
+	      uri = resolved_uri;
+	      break;
+	    }
+	  }
+	}

 	if (domainsent)
 	  DNSServiceRefDeallocate(domainref);
@@ -1,9 +1,9 @@
 /*
 * "$Id$"
 *
- *   HTTP routines for the Common UNIX Printing System (CUPS).
+ *   HTTP routines for CUPS.
 *
- *   Copyright 2007-2009 by Apple Inc.
+ *   Copyright 2007-2010 by Apple Inc.
 *   Copyright 1997-2007 by Easy Software Products, all rights reserved.
 *
 *   This file contains Kerberos support code, copyright 2006 by
@@ -25,7 +25,7 @@
 *                          server.
 *   httpClearCookie()    - Clear the cookie value(s).
 *   httpClearFields()    - Clear HTTP request fields.
- *   httpClose()          - Close an HTTP connection...
+ *   httpClose()          - Close an HTTP connection.
 *   httpConnect()        - Connect to a HTTP server.
 *   httpConnectEncrypt() - Connect to a HTTP server using encryption.
 *   _httpCreate()        - Create an unconnected HTTP connection.
@@ -62,7 +62,7 @@
 *   _httpReadGNUTLS()    - Read function for the GNU TLS library.
 *   httpReconnect()      - Reconnect to a HTTP server.
 *   httpSetAuthString()  - Set the current authorization string.
- *   httpSetCookie()      - Set the cookie value(s)...
+ *   httpSetCookie()      - Set the cookie value(s).
 *   httpSetExpect()      - Set the Expect: header in a request.
 *   httpSetField()       - Set the value of an HTTP header.
 *   httpSetLength()      - Set the content-length and content-encoding.
@@ -83,10 +83,12 @@
 *   http_debug_hex()     - Do a hex dump of a buffer.
 *   http_field()         - Return the field index for a field name.
 *   http_read_ssl()      - Read from a SSL/TLS connection.
+ *   http_locking_cb()    - Lock/unlock a thread's mutex.
 *   http_send()          - Send a request with all fields and the trailing
 *                          blank line.
 *   http_setup_ssl()     - Set up SSL/TLS support on a connection.
 *   http_shutdown_ssl()  - Shut down SSL/TLS on a connection.
+ *   http_threadid_cb()   - Return the current thread ID.
 *   http_upgrade()       - Force upgrade to TLS encryption.
 *   http_write()         - Write a buffer to a HTTP connection.
 *   http_write_chunk()   - Write a chunked buffer.
@@ -144,6 +146,19 @@ static int		http_setup_ssl(http_t *http);
 static void		http_shutdown_ssl(http_t *http);
 static int		http_upgrade(http_t *http);
 static int		http_write_ssl(http_t *http, const char *buf, int len);
+
+#  ifdef HAVE_GNUTLS
+#    ifdef HAVE_PTHREAD_H
+GCRY_THREAD_OPTION_PTHREAD_IMPL;
+#    endif /* HAVE_PTHREAD_H */
+
+#  elif defined(HAVE_LIBSSL) && defined(HAVE_PTHREAD_H)
+static pthread_mutex_t	*http_locks;	/* OpenSSL lock mutexes */
+
+static void		http_locking_cb(int mode, int type, const char *file,
+					int line);
+static unsigned long	http_threadid_cb(void);
+#  endif /* HAVE_GNUTLS */
 #endif /* HAVE_SSL */


@@ -312,7 +327,7 @@ httpClearFields(http_t *http)		/* I - Connection to server */


 /*
- * 'httpClose()' - Close an HTTP connection...
+ * 'httpClose()' - Close an HTTP connection.
 */

 void
@@ -560,8 +575,9 @@ httpError(http_t *http)			/* I - Connection to server */
 void
 httpFlush(http_t *http)			/* I - Connection to server */
 {
-  char	buffer[8192];			/* Junk buffer */
-  int	blocking;			/* To block or not to block */
+  char		buffer[8192];		/* Junk buffer */
+  int		blocking;		/* To block or not to block */
+  http_state_t	oldstate;		/* Old state */


  DEBUG_printf(("httpFlush(http=%p), state=%s", http,
@@ -578,6 +594,7 @@ httpFlush(http_t *http)			/* I - Connection to server */
  * Read any data we can...
  */

+  oldstate = http->state;
  while (httpRead2(http, buffer, sizeof(buffer)) > 0);

 /*
@@ -587,7 +604,7 @@ httpFlush(http_t *http)			/* I - Connection to server */

  http->blocking = blocking;

-  if (http->state != HTTP_WAITING && http->fd >= 0)
+  if (http->state == oldstate && http->state != HTTP_WAITING && http->fd >= 0)
  {
   /*
    * Didn't get the data back, so close the current connection.
@@ -721,7 +738,7 @@ httpGetField(http_t       *http,	/* I - Connection to server */
 {
  if (!http || field <= HTTP_FIELD_UNKNOWN || field >= HTTP_FIELD_MAX)
    return (NULL);
-  else if (field == HTTP_FIELD_AUTHORIZATION && 
+  else if (field == HTTP_FIELD_AUTHORIZATION &&
 	   http->field_authorization)
  {
   /*
@@ -1137,7 +1154,7 @@ httpGets(char   *line,			/* I - Line to read into */
      http->activity = time(NULL);

      *lineptr = '\0';
-      
+
      DEBUG_printf(("3httpGets: Returning \"%s\"", line));

      return (line);
@@ -1171,21 +1188,22 @@ httpHead(http_t     *http,		/* I - Connection to server */
 void
 httpInitialize(void)
 {
-#ifdef HAVE_LIBSSL
-#  ifndef WIN32
-  struct timeval	curtime;	/* Current time in microseconds */
-#  endif /* !WIN32 */
-  int			i;		/* Looping var */
-  unsigned char		data[1024];	/* Seed data */
-#endif /* HAVE_LIBSSL */
-
+  static int	initialized = 0;	/* Have we been called before? */
 #ifdef WIN32
  WSADATA	winsockdata;		/* WinSock data */
-  static int	initialized = 0;	/* Has WinSock been initialized? */
+#endif /* WIN32 */
+#ifdef HAVE_LIBSSL
+  int		i;			/* Looping var */
+  unsigned char	data[1024];		/* Seed data */
+#endif /* HAVE_LIBSSL */


-  if (!initialized)
-    WSAStartup(MAKEWORD(1,1), &winsockdata);
+  if (initialized)
+    return;
+
+#ifdef WIN32
+  WSAStartup(MAKEWORD(2,2), &winsockdata);
+
 #elif !defined(SO_NOSIGPIPE)
 /*
  * Ignore SIGPIPE signals...
@@ -1193,6 +1211,7 @@ httpInitialize(void)

 #  ifdef HAVE_SIGSET
  sigset(SIGPIPE, SIG_IGN);
+
 #  elif defined(HAVE_SIGACTION)
  struct sigaction	action;		/* POSIX sigaction data */

@@ -1200,35 +1219,63 @@ httpInitialize(void)
  memset(&action, 0, sizeof(action));
  action.sa_handler = SIG_IGN;
  sigaction(SIGPIPE, &action, NULL);
+
 #  else
  signal(SIGPIPE, SIG_IGN);
 #  endif /* !SO_NOSIGPIPE */
 #endif /* WIN32 */

 #ifdef HAVE_GNUTLS
-  gnutls_global_init();
-#endif /* HAVE_GNUTLS */
+ /*
+  * Make sure we handle threading properly...
+  */
+
+#  ifdef HAVE_PTHREAD_H
+  gcry_control(GCRYCTL_SET_THREAD_CBS, &gcry_threads_pthread);
+#  endif /* HAVE_PTHREAD_H */
+
+ /*
+  * Initialize GNU TLS...
+  */
+
+  gnutls_global_init();
+
+#elif defined(HAVE_LIBSSL)
+ /*
+  * Initialize OpenSSL...
+  */

-#ifdef HAVE_LIBSSL
  SSL_load_error_strings();
  SSL_library_init();

+ /*
+  * Set the threading callbacks...
+  */
+
+#  ifdef HAVE_PTHREAD_H
+  http_locks = calloc(CRYPTO_num_locks(), sizeof(pthread_mutex_t));
+
+  for (i = 0; i < CRYPTO_num_locks(); i ++)
+    pthread_mutex_init(http_locks + i, NULL);
+
+  CRYPTO_set_id_callback(http_threadid_cb);
+  CRYPTO_set_locking_callback(http_locking_cb);
+#  endif /* HAVE_PTHREAD_H */
+
 /*
  * Using the current time is a dubious random seed, but on some systems
  * it is the best we can do (on others, this seed isn't even used...)
  */

-#  ifdef WIN32
-#  else
-  gettimeofday(&curtime, NULL);
-  srand(curtime.tv_sec + curtime.tv_usec);
-#  endif /* WIN32 */
+  CUPS_SRAND(time(NULL));

  for (i = 0; i < sizeof(data); i ++)
-    data[i] = rand();
+    data[i] = CUPS_RAND();

  RAND_seed(data, sizeof(data));
-#endif /* HAVE_LIBSSL */
+#endif /* HAVE_GNUTLS */
+
+  initialized = 1;
 }


@@ -1816,7 +1863,7 @@ httpSetAuthString(http_t     *http,	/* I - Connection to server */


 /*
- * 'httpSetCookie()' - Set the cookie value(s)...
+ * 'httpSetCookie()' - Set the cookie value(s).
 *
 * @since CUPS 1.1.19/Mac OS X 10.3@
 */
@@ -2283,7 +2330,7 @@ httpWait(http_t *http,			/* I - Connection to server */
 *
 * @deprecated@
 */
- 
+
 int					/* O - Number of bytes written */
 httpWrite(http_t     *http,		/* I - Connection to server */
          const char *buffer,		/* I - Buffer for data */
@@ -2298,7 +2345,7 @@ httpWrite(http_t     *http,		/* I - Connection to server */
 *
 * @since CUPS 1.2/Mac OS X 10.5@
 */
- 
+
 ssize_t					/* O - Number of bytes written */
 httpWrite2(http_t     *http,		/* I - Connection to server */
           const char *buffer,		/* I - Buffer for data */
@@ -2456,7 +2503,7 @@ _httpWriteCDSA(
  else
  {
    *dataLength = 0;
-  
+
    if (errno == EAGAIN)
      result = errSSLWouldBlock;
    else
@@ -2517,7 +2564,7 @@ http_bio_ctrl(BIO  *h,			/* I - BIO data */
 	}
 	else
 	  return (0);
-        
+
    case BIO_CTRL_DUP :
    case BIO_CTRL_FLUSH :
        return (1);
@@ -2719,7 +2766,36 @@ http_read_ssl(http_t *http,		/* I - Connection to server */
  return (SSL_read((SSL *)(http->tls), buf, len));

 #  elif defined(HAVE_GNUTLS)
-  return (gnutls_record_recv(((http_tls_t *)(http->tls))->session, buf, len));
+  ssize_t	result;			/* Return value */
+
+
+  result = gnutls_record_recv(((http_tls_t *)(http->tls))->session, buf, len);
+
+  if (result < 0 && !errno)
+  {
+   /*
+    * Convert GNU TLS error to errno value...
+    */
+
+    switch (result)
+    {
+      case GNUTLS_E_INTERRUPTED :
+	  errno = EINTR;
+	  break;
+
+      case GNUTLS_E_AGAIN :
+          errno = EAGAIN;
+          break;
+
+      default :
+          errno = EPIPE;
+          break;
+    }
+
+    result = -1;
+  }
+
+  return ((int)result);

 #  elif defined(HAVE_CDSASSL)
  int		result;			/* Return value */
@@ -2758,6 +2834,25 @@ http_read_ssl(http_t *http,		/* I - Connection to server */
 #endif /* HAVE_SSL */


+#if defined(HAVE_LIBSSL) && defined(HAVE_PTHREAD_H)
+/*
+ * 'http_locking_cb()' - Lock/unlock a thread's mutex.
+ */
+
+static void
+http_locking_cb(int        mode,	/* I - Lock mode */
+		int        type,	/* I - Lock type */
+		const char *file,	/* I - Source file */
+		int        line)	/* I - Line number */
+{
+  if (mode & CRYPTO_LOCK)
+    pthread_mutex_lock(http_locks + type);
+  else
+    pthread_mutex_unlock(http_locks + type);
+}
+#endif /* HAVE_LIBSSL && HAVE_PTHREAD_H */
+
+
 /*
 * 'http_send()' - Send a request with all fields and the trailing blank line.
 */
@@ -2857,7 +2952,7 @@ http_send(http_t       *http,	/* I - Connection to server */
      DEBUG_printf(("9http_send: %s: %s", http_fields[i],
                    httpGetField(http, i)));

-      if (httpPrintf(http, "%s: %s\r\n", http_fields[i], 
+      if (httpPrintf(http, "%s: %s\r\n", http_fields[i],
 		     httpGetField(http, i)) < 1)
      {
 	http->status = HTTP_ERROR;
@@ -2896,15 +2991,15 @@ http_send(http_t       *http,	/* I - Connection to server */
  * The Kerberos and AuthRef authentication strings can only be used once...
  */

-  if (http->field_authorization && http->authstring && 
-      (!strncmp(http->authstring, "Negotiate", 9) || 
+  if (http->field_authorization && http->authstring &&
+      (!strncmp(http->authstring, "Negotiate", 9) ||
       !strncmp(http->authstring, "AuthRef", 7)))
  {
    http->_authstring[0] = '\0';

    if (http->authstring != http->_authstring)
      free(http->authstring);
-  
+
    http->authstring = http->_authstring;
  }

@@ -3004,6 +3099,11 @@ http_setup_ssl(http_t *http)		/* I - Connection to server */
    http->error  = errno;
    http->status = HTTP_ERROR;

+    gnutls_deinit(conn->session);
+    gnutls_certificate_free_credentials(*credentials);
+    free(credentials);
+    free(conn);
+
    return (-1);
  }

@@ -3124,6 +3224,19 @@ http_shutdown_ssl(http_t *http)		/* I - Connection to server */
 #endif /* HAVE_SSL */


+#if defined(HAVE_LIBSSL) && defined(HAVE_PTHREAD_H)
+/*
+ * 'http_threadid_cb()' - Return the current thread ID.
+ */
+
+static unsigned long			/* O - Thread ID */
+http_threadid_cb(void)
+{
+  return ((unsigned long)pthread_self());
+}
+#endif /* HAVE_LIBSSL && HAVE_PTHREAD_H */
+
+
 #ifdef HAVE_SSL
 /*
 * 'http_upgrade()' - Force upgrade to TLS encryption.
@@ -3138,6 +3251,13 @@ http_upgrade(http_t *http)		/* I - Connection to server */

  DEBUG_printf(("7http_upgrade(%p)", http));

+ /*
+  * Flush the connection to make sure any previous "Upgrade" message
+  * has been read.
+  */
+
+  httpFlush(http);
+
 /*
  * Copy the HTTP data to a local variable so we can do the OPTIONS
  * request without interfering with the existing request data...
@@ -3165,8 +3285,6 @@ http_upgrade(http_t *http)		/* I - Connection to server */
    while (httpUpdate(http) == HTTP_CONTINUE);
  }

-  httpFlush(http);
-
 /*
  * Restore the HTTP request data...
  */
@@ -3210,7 +3328,7 @@ http_upgrade(http_t *http)		/* I - Connection to server */
 /*
 * 'http_write()' - Write a buffer to a HTTP connection.
 */
- 
+
 static int				/* O - Number of bytes written */
 http_write(http_t     *http,		/* I - Connection to server */
           const char *buffer,		/* I - Buffer for data */
@@ -3325,7 +3443,36 @@ http_write_ssl(http_t     *http,	/* I - Connection to server */
  return (SSL_write((SSL *)(http->tls), buf, len));

 #  elif defined(HAVE_GNUTLS)
-  return (gnutls_record_send(((http_tls_t *)(http->tls))->session, buf, len));
+  ssize_t	result;			/* Return value */
+
+  result = gnutls_record_send(((http_tls_t *)(http->tls))->session, buf, len);
+
+  if (result < 0 && !errno)
+  {
+   /*
+    * Convert GNU TLS error to errno value...
+    */
+
+    switch (result)
+    {
+      case GNUTLS_E_INTERRUPTED :
+	  errno = EINTR;
+	  break;
+
+      case GNUTLS_E_AGAIN :
+          errno = EAGAIN;
+          break;
+
+      default :
+          errno = EPIPE;
+          break;
+    }
+
+    result = -1;
+  }
+
+  return ((int)result);
+
 #  elif defined(HAVE_CDSASSL)
  int		result;			/* Return value */
  OSStatus	error;			/* Error info */
@@ -3348,11 +3495,11 @@ http_write_ssl(http_t     *http,	/* I - Connection to server */
 	else
 	{
 	  result = -1;
-	  errno = EINTR;
+	  errno  = EINTR;
 	}
 	break;
    default :
-	errno = EPIPE;
+	errno  = EPIPE;
 	result = -1;
 	break;
  }
@@ -4,7 +4,7 @@
 *   Hyper-Text Transport Protocol definitions for the Common UNIX Printing
 *   System (CUPS).
 *
- *   Copyright 2007 by Apple Inc.
+ *   Copyright 2007-2009 by Apple Inc.
 *   Copyright 1997-2007 by Easy Software Products, all rights reserved.
 *
 *   These coded instructions, statements, and computer programs are the
@@ -250,7 +250,7 @@ typedef enum http_status_e		/**** HTTP status codes ****/
  HTTP_GATEWAY_TIMEOUT,			/* Gateway connection timed out */
  HTTP_NOT_SUPPORTED,			/* HTTP version not supported */

-  HTTP_AUTHORIZATION_CANCELED = 1000	/* User cancelled authorization */
+  HTTP_AUTHORIZATION_CANCELED = 1000	/* User canceled authorization */

 } http_status_t;

@@ -387,7 +387,7 @@ extern void		httpSeparate2(const char *uri,
 				      char *host, int hostlen, int *port,
 				      char *resource, int resourcelen) _CUPS_DEPRECATED;

-/**** New in CUPS 1.2 ****/
+/**** New in CUPS 1.2/Mac OS X 10.5 ****/
 extern int		httpAddrAny(const http_addr_t *addr) _CUPS_API_1_2;
 extern http_addrlist_t	*httpAddrConnect(http_addrlist_t *addrlist, int *sock) _CUPS_API_1_2;
 extern int		httpAddrEqual(const http_addr_t *addr1,
@@ -435,7 +435,7 @@ extern void		httpSetLength(http_t *http, size_t length) _CUPS_API_1_2;
 extern ssize_t		httpWrite2(http_t *http, const char *buffer,
 			           size_t length) _CUPS_API_1_2;

-/**** New in CUPS 1.3 ****/
+/**** New in CUPS 1.3/Mac OS X 10.5 ****/
 extern char		*httpGetAuthString(http_t *http) _CUPS_API_1_3;
 extern void		httpSetAuthString(http_t *http, const char *scheme,
 			                  const char *data) _CUPS_API_1_3;
@@ -1,10 +1,9 @@
 /*
 * "$Id$"
 *
- *   Internet Printing Protocol support functions for the Common UNIX
- *   Printing System (CUPS).
+ *   Internet Printing Protocol functions for CUPS.
 *
- *   Copyright 2007-2009 by Apple Inc.
+ *   Copyright 2007-2010 by Apple Inc.
 *   Copyright 1997-2007 by Easy Software Products, all rights reserved.
 *
 *   These coded instructions, statements, and computer programs are the
@@ -186,6 +185,8 @@ ippAddCollection(ipp_t      *ipp,	/* I - IPP message */
  attr->value_tag            = IPP_TAG_BEGIN_COLLECTION;
  attr->values[0].collection = value;

+  value->use ++;
+
  return (attr);
 }

@@ -224,10 +225,15 @@ ippAddCollections(
  attr->value_tag = IPP_TAG_BEGIN_COLLECTION;

  if (values != NULL)
+  {
    for (i = 0, value = attr->values;
 	 i < num_values;
 	 i ++, value ++)
+    {
      value->collection = (ipp_t *)values[i];
+      value->collection->use ++;
+    }
+  }

  return (attr);
 }
@@ -425,7 +431,8 @@ ippAddString(ipp_t      *ipp,		/* I - IPP message */
    value = "en";

 /*
-  * Convert language values to lowercase and change _ to - as needed...
+  * Convert language and charset values to lowercase and change _ to - as
+  * needed...
  */

  if ((type == IPP_TAG_LANGUAGE || type == IPP_TAG_CHARSET) && value)
@@ -473,6 +480,8 @@ ippAddStrings(
  int			i;		/* Looping var */
  ipp_attribute_t	*attr;		/* New attribute */
  ipp_value_t		*value;		/* Current value */
+  char			buffer[1024],	/* Language/charset value buffer */
+			*bufptr;	/* Pointer into buffer */


  DEBUG_printf(("ippAddStrings(ipp=%p, group=%02x(%s), type=%02x(%s), "
@@ -506,16 +515,36 @@ ippAddStrings(

    if (values != NULL)
    {
-     /*
-      * Force language to be English for the POSIX locale...
-      */
+      if ((int)type & IPP_TAG_COPY)
+        value->string.text = (char *)values[i];
+      else if (type == IPP_TAG_LANGUAGE && !strcasecmp(values[i], "C"))
+      {
+       /*
+	* Force language to be English for the POSIX locale...
+	*/

-      if (type == IPP_TAG_LANGUAGE && !strcasecmp(values[i], "C"))
 	value->string.text = ((int)type & IPP_TAG_COPY) ? "en" :
                                      _cupsStrAlloc("en");
+      }
+      else if (type == IPP_TAG_LANGUAGE || type == IPP_TAG_CHARSET)
+      {
+       /*
+	* Convert language values to lowercase and change _ to - as needed...
+	*/
+
+	strlcpy(buffer, values[i], sizeof(buffer));
+
+	for (bufptr = buffer; *bufptr; bufptr ++)
+	  if (*bufptr == '_')
+	    *bufptr = '-';
+	  else
+	    *bufptr = tolower(*bufptr & 255);
+
+	value->string.text = _cupsStrAlloc(buffer);
+      }
      else
-	value->string.text = ((int)type & IPP_TAG_COPY) ? (char *)values[i] :
-                                      _cupsStrAlloc(values[i]);
+	value->string.text = _cupsStrAlloc(values[i]);
+
    }
  }

@@ -776,6 +805,10 @@ ippDelete(ipp_t *ipp)			/* I - IPP message */
  if (!ipp)
    return;

+  ipp->use --;
+  if (ipp->use > 0)
+    return;
+
  for (attr = ipp->attrs; attr != NULL; attr = next)
  {
    next = attr->next;
@@ -950,6 +983,7 @@ ippNew(void)

    temp->request.any.version[0] = 1;
    temp->request.any.version[1] = 1;
+    temp->use                    = 1;
  }

  DEBUG_printf(("1ippNew: Returning %p", temp));
@@ -1871,6 +1905,12 @@ ippWriteIO(void       *dst,		/* I - Destination */
 	  *bufptr++ = ipp->request.any.request_id >> 8;
 	  *bufptr++ = ipp->request.any.request_id;

+	  DEBUG_printf(("2ippWriteIO: version=%d.%d", buffer[0], buffer[1]));
+	  DEBUG_printf(("2ippWriteIO: op_status=%04x",
+			ipp->request.any.op_status));
+	  DEBUG_printf(("2ippWriteIO: request_id=%d",
+			ipp->request.any.request_id));
+
          if ((*cb)(dst, buffer, (int)(bufptr - buffer)) < 0)
 	  {
 	    DEBUG_puts("1ippWriteIO: Could not write IPP header...");
@@ -1888,11 +1928,7 @@ ippWriteIO(void       *dst,		/* I - Destination */
 	ipp->current = ipp->attrs;
 	ipp->curtag  = IPP_TAG_ZERO;

-        DEBUG_printf(("2ippWriteIO: version=%d.%d", buffer[0], buffer[1]));
-	DEBUG_printf(("2ippWriteIO: op_status=%04x",
-	              ipp->request.any.op_status));
-	DEBUG_printf(("2ippWriteIO: request_id=%d",
-	              ipp->request.any.request_id));
+	DEBUG_printf(("1ippWriteIO: ipp->current=%p", ipp->current));

       /*
        * If blocking is disabled, stop here...
@@ -1913,23 +1949,30 @@ ippWriteIO(void       *dst,		/* I - Destination */

 	  ipp->current = ipp->current->next;

-          if (ipp->curtag != attr->group_tag && parent == NULL)
+          if (!parent)
 	  {
-	   /*
-	    * Send a group tag byte...
-	    */
+	    if (ipp->curtag != attr->group_tag)
+	    {
+	     /*
+	      * Send a group tag byte...
+	      */

-	    ipp->curtag = attr->group_tag;
+	      ipp->curtag = attr->group_tag;

-            if (attr->group_tag == IPP_TAG_ZERO)
+	      if (attr->group_tag == IPP_TAG_ZERO)
+		continue;
+
+	      DEBUG_printf(("2ippWriteIO: wrote group tag=%x(%s)",
+			    attr->group_tag, ippTagString(attr->group_tag)));
+	      *bufptr++ = attr->group_tag;
+	    }
+	    else if (attr->group_tag == IPP_TAG_ZERO)
 	      continue;
-
-            DEBUG_printf(("2ippWriteIO: wrote group tag=%x(%s)",
-	                  attr->group_tag, ippTagString(attr->group_tag)));
-	    *bufptr++ = attr->group_tag;
 	  }
-	  else if (attr->group_tag == IPP_TAG_ZERO)
-	    continue;
+
+	  DEBUG_printf(("1ippWriteIO: %s (%s%s)", attr->name,
+	                attr->num_values > 1 ? "1setOf " : "",
+			ippTagString(attr->value_tag)));

         /*
 	  * Write the attribute tag and name.  The current implementation
@@ -2602,15 +2645,18 @@ ippWriteIO(void       *dst,		/* I - Destination */
 	  * Write the data out...
 	  */

-          if ((*cb)(dst, buffer, (int)(bufptr - buffer)) < 0)
+	  if (bufptr > buffer)
 	  {
-	    DEBUG_puts("1ippWriteIO: Could not write IPP attribute...");
-	    ipp_buffer_release(buffer);
-	    return (IPP_ERROR);
-	  }
+	    if ((*cb)(dst, buffer, (int)(bufptr - buffer)) < 0)
+	    {
+	      DEBUG_puts("1ippWriteIO: Could not write IPP attribute...");
+	      ipp_buffer_release(buffer);
+	      return (IPP_ERROR);
+	    }

-          DEBUG_printf(("2ippWriteIO: wrote %d bytes",
-	                (int)(bufptr - buffer)));
+	    DEBUG_printf(("2ippWriteIO: wrote %d bytes",
+			  (int)(bufptr - buffer)));
+	  }

 	 /*
          * If blocking is disabled, stop here...
@@ -2979,7 +3025,7 @@ ipp_read_http(http_t      *http,	/* I - Client connection */
  int		tbytes,			/* Total bytes read */
 		bytes;			/* Bytes read this pass */
  char		len[32];		/* Length string */
-  
+

  DEBUG_printf(("7ipp_read_http(http=%p, buffer=%p, length=%d)",
                http, buffer, (int)length));
@@ -1,10 +1,9 @@
 /*
 * "$Id$"
 *
- *   Internet Printing Protocol definitions for the Common UNIX Printing
- *   System (CUPS).
+ *   Internet Printing Protocol definitions for CUPS.
 *
- *   Copyright 2007-2009 by Apple Inc.
+ *   Copyright 2007-2010 by Apple Inc.
 *   Copyright 1997-2006 by Easy Software Products.
 *
 *   These coded instructions, statements, and computer programs are the
@@ -64,7 +63,7 @@ extern "C" {
 * Types and structures...
 */

-typedef enum ipp_tag_e			/**** Format tags for attributes... ****/
+typedef enum ipp_tag_e			/**** Format tags for attributes ****/
 {
  IPP_TAG_ZERO = 0x00,			/* Zero tag - used for separators */
  IPP_TAG_OPERATION,			/* Operation group */
@@ -105,13 +104,13 @@ typedef enum ipp_tag_e			/**** Format tags for attributes... ****/
  IPP_TAG_COPY = -0x7fffffff-1		/* Bitflag for copied attribute values */
 } ipp_tag_t;

-typedef enum ipp_res_e			/**** Resolution units... ****/
+typedef enum ipp_res_e			/**** Resolution units ****/
 {
  IPP_RES_PER_INCH = 3,			/* Pixels per inch */
  IPP_RES_PER_CM			/* Pixels per centimeter */
 } ipp_res_t;

-typedef enum ipp_finish_e		/**** Finishings... ****/
+typedef enum ipp_finish_e		/**** Finishings ****/
 {
  IPP_FINISHINGS_NONE = 3,		/* No finishing */
  IPP_FINISHINGS_STAPLE,		/* Staple (any location) */
@@ -143,7 +142,7 @@ typedef enum ipp_finish_e		/**** Finishings... ****/
  IPP_FINISHINGS_BIND_BOTTOM		/* Bind on bottom */
 } ipp_finish_t;

-typedef enum ipp_orient_e		/**** Orientation... ****/
+typedef enum ipp_orient_e		/**** Orientation values ****/
 {
  IPP_PORTRAIT = 3,			/* No rotation */
  IPP_LANDSCAPE,			/* 90 degrees counter-clockwise */
@@ -151,14 +150,14 @@ typedef enum ipp_orient_e		/**** Orientation... ****/
  IPP_REVERSE_PORTRAIT			/* 180 degrees */
 } ipp_orient_t;

-typedef enum ipp_quality_e		/**** Qualities... ****/
+typedef enum ipp_quality_e		/**** Qualities ****/
 {
  IPP_QUALITY_DRAFT = 3,		/* Draft quality */
  IPP_QUALITY_NORMAL,			/* Normal quality */
  IPP_QUALITY_HIGH			/* High quality */
 } ipp_quality_t;

-typedef enum ipp_jstate_e		/**** Job States.... */
+typedef enum ipp_jstate_e		/**** Job states ****/
 {
  IPP_JOB_PENDING = 3,			/* Job is waiting to be printed */
  IPP_JOB_HELD,				/* Job is held for printing */
@@ -170,14 +169,14 @@ typedef enum ipp_jstate_e		/**** Job States.... */
 } ipp_jstate_t;
 #define IPP_JOB_CANCELLED IPP_JOB_CANCELED

-typedef enum ipp_pstate_e		/**** Printer States.... */
+typedef enum ipp_pstate_e		/**** Printer states ****/
 {
  IPP_PRINTER_IDLE = 3,			/* Printer is idle */
  IPP_PRINTER_PROCESSING,		/* Printer is working */
  IPP_PRINTER_STOPPED			/* Printer is stopped */
 } ipp_pstate_t;

-typedef enum ipp_state_e		/**** IPP states... ****/
+typedef enum ipp_state_e		/**** IPP states ****/
 {
  IPP_ERROR = -1,			/* An error occurred */
  IPP_IDLE,				/* Nothing is happening/request completed */
@@ -186,7 +185,7 @@ typedef enum ipp_state_e		/**** IPP states... ****/
  IPP_DATA				/* IPP request data needs to be sent/received */
 } ipp_state_t;

-typedef enum ipp_op_e			/**** IPP operations... ****/
+typedef enum ipp_op_e			/**** IPP operations ****/
 {
  IPP_PRINT_JOB = 0x0002,		/* Print a single file */
  IPP_PRINT_URI,			/* Print a single URL @private@ */
@@ -255,7 +254,7 @@ typedef enum ipp_op_e			/**** IPP operations... ****/
 #define CUPS_ADD_PRINTER	CUPS_ADD_MODIFY_PRINTER
 #define CUPS_ADD_CLASS		CUPS_ADD_MODIFY_CLASS

-typedef enum ipp_status_e		/**** IPP status codes... ****/
+typedef enum ipp_status_e		/**** IPP status codes ****/
 {
  IPP_OK = 0x0000,			/* successful-ok */
  IPP_OK_SUBST,				/* successful-ok-ignored-or-substituted-attributes */
@@ -405,6 +404,9 @@ struct ipp_s				/**** IPP Request/Response/Notification ****/

 /**** New in CUPS 1.2 ****/
  ipp_attribute_t *prev;		/* Previous attribute (for read) @since CUPS 1.2/Mac OS X 10.5@ */
+
+/**** New in CUPS 1.5 ****/
+  int		use;			/* Use count */
 };


@@ -445,7 +445,7 @@ cupsLangGet(const char *language)	/* I - Language or locale */

  if (!language)
  {
-    if ((language = getenv("LANG")) == NULL)
+    if (!getenv("SOFTWARE") || (language = getenv("LANG")) == NULL)
      language = appleLangDefault();

    DEBUG_printf(("4cupsLangGet: language=\"%s\"", language));
@@ -1121,13 +1121,15 @@ appleLangDefault(void)
  					/* Pointer to library globals */


+  DEBUG_puts("2appleLangDefault()");
+
 /*
  * Only do the lookup and translation the first time.
  */

  if (!cg->language[0])
  {
-    if ((lang = getenv("LANG")))
+    if (getenv("SOFTWARE") != NULL && (lang = getenv("LANG")) != NULL)
    {
      strlcpy(cg->language, lang, sizeof(cg->language));
      return (cg->language);
@@ -2,8 +2,6 @@ __cups_debug_fd
 __cups_debug_printf
 __cups_debug_puts
 __cups_strcpy
-__cupsAdminGetServerSettings
-__cupsAdminSetServerSettings
 __cupsAppleLanguage
 __cupsCharmapFlush
 __cupsCharmapFree
@@ -21,9 +19,6 @@ __cupsMD5Init
 __cupsMessageFree
 __cupsMessageLoad
 __cupsMessageLookup
-__cupsPWGMediaByName
-__cupsPWGMediaByLegacy
-__cupsPWGMediaBySize
 __cupsSetError
 __cupsSetLocale
 __cupsSNMPClose
@@ -62,6 +57,25 @@ __ppdHashName
 __ppdLocalizedAttr
 __ppdNormalizeMakeAndModel
 __ppdParseOptions
+__pwgCreateWithFile
+__pwgDestroy
+__pwgWriteFile
+__pwgGenerateSize
+__pwgInitSize
+__pwgMediaForLegacy
+__pwgMediaForPPD
+__pwgMediaForPWG
+__pwgMediaForSize
+__pwgCreateWithPPD
+__pwgGetInputSlot
+__pwgGetMediaType
+__pwgGetPageSize
+__pwgGetSize
+__pwgGetSource
+__pwgGetType
+__pwgInputSlotForSource
+__pwgMediaTypeForType
+__pwgPageSizeForMedia
 _cupsAddDest
 _cupsAddOption
 _cupsAdminCreateWindowsPPD
@@ -1,8 +1,6 @@
 LIBRARY libcups2
 VERSION 2.7
 EXPORTS
-_cupsAdminGetServerSettings
-_cupsAdminSetServerSettings
 _cupsCharmapFlush
 _cupsCharmapFree
 _cupsCharmapGet
@@ -29,10 +27,14 @@ _cupsStrStatistics
 _cups_strcpy
 _cups_strlcat
 _cups_strlcpy
+_httpResolveURI
 _ippAddAttr
 _ippFindOption
 _ippFreeAttr
+_ppdFreeLanguages
 _ppdGetEncoding
+_ppdGetLanguages
+_ppdHashName
 cupsAddDest
 cupsAddOption
 cupsAdminCreateWindowsPPD
@@ -129,6 +131,7 @@ cupsPrintFiles2
 cupsPutFd
 cupsPutFile
 cupsRemoveOption
+cupsResolveConflicts
 cupsServer
 cupsSetDests
 cupsSetDests2
@@ -1,12 +1,11 @@
 _cups_debug_fd
-_cupsAdminGetServerSettings
-_cupsAdminSetServerSettings
 _cupsCharmapFlush
 _cupsCharmapFree
 _cupsCharmapGet
 _cupsEncodingName
 _cupsGetPassword
 _cupsGlobals
+_cupsLangPrintError
 _cupsLangPrintf
 _cupsLangPuts
 _cupsLangString
@@ -16,9 +15,6 @@ _cupsMD5Init
 _cupsMessageFree
 _cupsMessageLoad
 _cupsMessageLookup
-_cupsPWGMediaByName
-_cupsPWGMediaByLegacy
-_cupsPWGMediaBySize
 _cupsSetError
 _cupsSetLocale
 _cupsSNMPClose
@@ -50,6 +46,7 @@ _httpBIOMethods
 _httpCreate
 _httpEncodeURI
 _httpResolveURI
+_httpWait
 _ippAddAttr
 _ippFreeAttr
 _ppdFreeLanguages
@@ -59,4 +56,25 @@ _ppdGetLanguages
 _ppdHashName
 _ppdLocalizedAttr
 _ppdNormalizeMakeAndModel
-_ppdParseOptions
+_ppdParseOptions
+_pwgCreateWithFile
+_pwgDestroy
+_pwgWriteFile
+_pwgGenerateSize
+_pwgInitSize
+_pwgMediaForLegacy
+_pwgMediaForPPD
+_pwgMediaForPWG
+_pwgMediaForSize
+_pwgCreateWithPPD
+_pwgGetBin
+_pwgGetInputSlot
+_pwgGetMediaType
+_pwgGetOutputBin
+_pwgGetPageSize
+_pwgGetSize
+_pwgGetSource
+_pwgGetType
+_pwgInputSlotForSource
+_pwgMediaTypeForType
+_pwgPageSizeForMedia
@@ -1,9 +1,9 @@
 /*
 * "$Id$"
 *
- *   Option marking routines for the Common UNIX Printing System (CUPS).
+ *   Option marking routines for CUPS.
 *
- *   Copyright 2007-2009 by Apple Inc.
+ *   Copyright 2007-2010 by Apple Inc.
 *   Copyright 1997-2007 by Easy Software Products, all rights reserved.
 *
 *   These coded instructions, statements, and computer programs are the
@@ -29,13 +29,11 @@
 *   ppdFirstOption()      - Return the first option in the PPD file.
 *   ppdNextOption()       - Return the next option in the PPD file.
 *   _ppdParseOptions()    - Parse options from a PPD file.
- *   debug_marked()        - Output the marked array to stdout...
+ *   ppd_debug_marked()    - Output the marked array to stdout...
 *   ppd_defaults()        - Set the defaults for this group and all sub-groups.
 *   ppd_mark_choices()    - Mark one or more option choices from a string.
 *   ppd_mark_option()     - Quickly mark an option without checking for
 *                           conflicts.
- *   ppd_mark_size()       - Quickly mark a page size without checking for
- *                           conflicts.
 */

 /*
@@ -45,7 +43,7 @@
 #include "cups.h"
 #include "string.h"
 #include "debug.h"
-#include "pwgmedia.h"
+#include "pwg-private.h"


 /*
@@ -53,15 +51,14 @@
 */

 #ifdef DEBUG
-static void	debug_marked(ppd_file_t *ppd, const char *title);
+static void	ppd_debug_marked(ppd_file_t *ppd, const char *title);
 #else
-#  define	debug_marked(ppd,title)
+#  define	ppd_debug_marked(ppd,title)
 #endif /* DEBUG */
 static void	ppd_defaults(ppd_file_t *ppd, ppd_group_t *g);
 static void	ppd_mark_choices(ppd_file_t *ppd, const char *s);
 static void	ppd_mark_option(ppd_file_t *ppd, const char *option,
 		                const char *choice);
-static void	ppd_mark_size(ppd_file_t *ppd, const char *size);


 /*
@@ -83,8 +80,8 @@ cupsMarkOptions(
 		s[255];			/* Temporary string */
  const char	*val,			/* Pointer into value */
 		*media,			/* media option */
-		*media_col,		/* media-col option */
-		*page_size;		/* PageSize option */
+		*page_size,		/* PageSize option */
+		*ppd_keyword;		/* PPD keyword */
  cups_option_t	*optptr;		/* Current option */
  ppd_option_t	*option;		/* PPD option */
  ppd_attr_t	*attr;			/* PPD attribute */
@@ -122,71 +119,24 @@ cupsMarkOptions(
  if (!ppd || num_options <= 0 || !options)
    return (0);

-  debug_marked(ppd, "Before...");
+  ppd_debug_marked(ppd, "Before...");

 /*
-  * Do special handling for media, media-col, and PageSize...
+  * Do special handling for media and PageSize...
  */

  media     = cupsGetOption("media", num_options, options);
-  media_col = cupsGetOption("media-col", num_options, options);
  page_size = cupsGetOption("PageSize", num_options, options);

-  if (media_col && (!page_size || !page_size[0]))
-  {
-   /*
-    * Pull out the corresponding media size from the media-col value...
-    */
-
-    int			num_media_cols,	/* Number of media-col values */
-    			num_media_sizes;/* Number of media-size values */
-    cups_option_t	*media_cols,	/* media-col values */
-			*media_sizes;	/* media-size values */
-
-
-    num_media_cols = cupsParseOptions(media_col, 0, &media_cols);
-
-    if ((val = cupsGetOption("media-key", num_media_cols, media_cols)) != NULL)
-      media = val;
-    else if ((val = cupsGetOption("media-size", num_media_cols,
-                                  media_cols)) != NULL)
-    {
-     /*
-      * Lookup by dimensions...
-      */
-
-      double		width,		/* Width in points */
-			length;		/* Length in points */
-      struct lconv	*loc;		/* Locale data */
-      _cups_pwg_media_t	*pwgmedia;	/* PWG media name */
-
-
-      num_media_sizes = cupsParseOptions(val, 0, &media_sizes);
-      loc             = localeconv();
-
-      if ((val = cupsGetOption("x-dimension", num_media_sizes,
-                               media_sizes)) != NULL)
-        width = _cupsStrScand(val, NULL, loc) * 2540.0 / 72.0;
-      else
-        width = 0.0;
-
-      if ((val = cupsGetOption("y-dimension", num_media_sizes,
-                               media_sizes)) != NULL)
-        length = _cupsStrScand(val, NULL, loc) * 2540.0 / 72.0;
-      else
-        length = 0.0;
-
-      if ((pwgmedia = _cupsPWGMediaBySize(width, length)) != NULL)
-        media = pwgmedia->pwg;
-
-      cupsFreeOptions(num_media_sizes, media_sizes);
-    }
-
-    cupsFreeOptions(num_media_cols, media_cols);
-  }
-
  if (media)
  {
+   /*
+    * Load PWG mapping data as needed...
+    */
+
+    if (!ppd->pwg)
+      ppd->pwg = _pwgCreateWithPPD(ppd);
+
   /*
    * Loop through the option string, separating it at commas and
    * marking each individual option as long as the corresponding
@@ -215,23 +165,21 @@ cupsMarkOptions(
      */

      if (!page_size || !page_size[0])
-	ppd_mark_size(ppd, s);
+      {
+        if (!strncasecmp(s, "Custom.", 7) || ppdPageSize(ppd, s))
+          ppd_mark_option(ppd, "PageSize", s);
+        else if ((ppd_keyword = _pwgGetPageSize((_pwg_t *)ppd->pwg, NULL, s,
+	                                        NULL)) != NULL)
+	  ppd_mark_option(ppd, "PageSize", ppd_keyword);
+      }

-      if (cupsGetOption("InputSlot", num_options, options) == NULL)
-	ppd_mark_option(ppd, "InputSlot", s);
+      if (!cupsGetOption("InputSlot", num_options, options) &&
+	  (ppd_keyword = _pwgGetInputSlot((_pwg_t *)ppd->pwg, NULL, s)) != NULL)
+	ppd_mark_option(ppd, "InputSlot", ppd_keyword);

-      if (cupsGetOption("MediaType", num_options, options) == NULL)
-	ppd_mark_option(ppd, "MediaType", s);
-
-      if (cupsGetOption("EFMediaType", num_options, options) == NULL)
-	ppd_mark_option(ppd, "EFMediaType", s);		/* EFI */
-
-      if (cupsGetOption("EFMediaQualityMode", num_options, options) == NULL)
-	ppd_mark_option(ppd, "EFMediaQualityMode", s);	/* EFI */
-
-      if (!strcasecmp(s, "manual") &&
-	  !cupsGetOption("ManualFeed", num_options, options))
-	ppd_mark_option(ppd, "ManualFeed", "True");
+      if (!cupsGetOption("MediaType", num_options, options) &&
+	  (ppd_keyword = _pwgGetMediaType((_pwg_t *)ppd->pwg, NULL, s)) != NULL)
+	ppd_mark_option(ppd, "MediaType", ppd_keyword);
    }
  }

@@ -240,8 +188,7 @@ cupsMarkOptions(
  */

  for (i = num_options, optptr = options; i > 0; i --, optptr ++)
-    if (!strcasecmp(optptr->name, "media") ||
-        !strcasecmp(optptr->name, "media-col"))
+    if (!strcasecmp(optptr->name, "media"))
      continue;
    else if (!strcasecmp(optptr->name, "sides"))
    {
@@ -346,8 +293,10 @@ cupsMarkOptions(
    }
    else if (!strcasecmp(optptr->name, "output-bin"))
    {
-      if (!cupsGetOption("OutputBin", num_options, options))
-        ppd_mark_option(ppd, "OutputBin", optptr->value);
+      if (!cupsGetOption("OutputBin", num_options, options) &&
+	  (ppd_keyword = _pwgGetOutputBin((_pwg_t *)ppd->pwg,
+	                                  optptr->value)) != NULL)
+	ppd_mark_option(ppd, "OutputBin", ppd_keyword);
    }
    else if (!strcasecmp(optptr->name, "multiple-document-handling"))
    {
@@ -401,6 +350,60 @@ cupsMarkOptions(
        ppd_mark_choices(ppd, attr->value);
      }
    }
+    else if (!strcasecmp(optptr->name, "print-quality"))
+    {
+      ppd_option_t	*output_mode = ppdFindOption(ppd, "OutputMode");
+					/* OutputMode option */
+
+      if (!strcmp(optptr->value, "3"))
+      {
+       /*
+        * Draft quality...
+	*/
+
+	if (ppdFindChoice(output_mode, "Draft"))
+	  ppd_mark_option(ppd, "OutputMode", "Draft");
+	else if (ppdFindChoice(output_mode, "Fast"))
+	  ppd_mark_option(ppd, "OutputMode", "Fast");
+
+        if ((attr = ppdFindAttr(ppd, "APPrinterPreset",
+	                        "DraftGray_with_Paper_Auto-Detect")) != NULL)
+          ppd_mark_choices(ppd, attr->value);
+      }
+      else if (!strcmp(optptr->value, "4"))
+      {
+       /*
+        * Normal quality...
+	*/
+
+	if (ppdFindChoice(output_mode, "Normal"))
+	  ppd_mark_option(ppd, "OutputMode", "Normal");
+	else if (ppdFindChoice(output_mode, "Good"))
+	  ppd_mark_option(ppd, "OutputMode", "Good");
+
+        if ((attr = ppdFindAttr(ppd, "APPrinterPreset",
+	                        "Color_with_Paper_Auto-Detect")) != NULL)
+          ppd_mark_choices(ppd, attr->value);
+        else if ((attr = ppdFindAttr(ppd, "APPrinterPreset",
+	                        "Gray_with_Paper_Auto-Detect")) != NULL)
+          ppd_mark_choices(ppd, attr->value);
+      }
+      else if (!strcmp(optptr->value, "5"))
+      {
+       /*
+        * High/best/photo quality...
+	*/
+
+	if (ppdFindChoice(output_mode, "Best"))
+	  ppd_mark_option(ppd, "OutputMode", "Best");
+	else if (ppdFindChoice(output_mode, "High"))
+	  ppd_mark_option(ppd, "OutputMode", "High");
+
+        if ((attr = ppdFindAttr(ppd, "APPrinterPreset",
+	                        "Photo_on_Photo_Paper")) != NULL)
+          ppd_mark_choices(ppd, attr->value);
+      }
+    }
    else if (!strcasecmp(optptr->name, "APPrinterPreset"))
    {
     /*
@@ -421,7 +424,7 @@ cupsMarkOptions(
    else
      ppd_mark_option(ppd, optptr->name, optptr->value);

-  debug_marked(ppd, "After...");
+  ppd_debug_marked(ppd, "After...");

  return (ppdConflicts(ppd) > 0);
 }
@@ -746,11 +749,11 @@ _ppdParseOptions(

 #ifdef DEBUG
 /*
- * 'debug_marked()' - Output the marked array to stdout...
+ * 'ppd_debug_marked()' - Output the marked array to stdout...
 */

 static void
-debug_marked(ppd_file_t *ppd,		/* I - PPD file data */
+ppd_debug_marked(ppd_file_t *ppd,		/* I - PPD file data */
             const char *title)		/* I - Title for list */
 {
  ppd_choice_t	*c;			/* Current choice */
@@ -842,6 +845,8 @@ ppd_mark_option(ppd_file_t *ppd,	/* I - PPD file */

  if (!strcasecmp(option, "AP_D_InputSlot"))
  {
+    cupsArraySave(ppd->options);
+
    if ((o = ppdFindOption(ppd, "InputSlot")) != NULL)
    {
      key.option = o;
@@ -851,13 +856,21 @@ ppd_mark_option(ppd_file_t *ppd,	/* I - PPD file */
        cupsArrayRemove(ppd->marked, oldc);
      }
    }
+
+    cupsArrayRestore(ppd->options);
  }

 /*
  * Check for custom options...
  */

-  if ((o = ppdFindOption(ppd, option)) == NULL)
+  cupsArraySave(ppd->options);
+
+  o = ppdFindOption(ppd, option);
+
+  cupsArrayRestore(ppd->options);
+
+  if (!o)
    return;

  loc = localeconv();
@@ -912,15 +925,15 @@ ppd_mark_option(ppd_file_t *ppd,	/* I - PPD file */
              if (units)
 	      {
        	if (!strcasecmp(units, "cm"))
-	          cparam->current.custom_points *= 72.0f / 2.54f;	      
+	          cparam->current.custom_points *= 72.0f / 2.54f;
        	else if (!strcasecmp(units, "mm"))
-	          cparam->current.custom_points *= 72.0f / 25.4f;	      
+	          cparam->current.custom_points *= 72.0f / 25.4f;
        	else if (!strcasecmp(units, "m"))
-	          cparam->current.custom_points *= 72.0f / 0.0254f;	      
+	          cparam->current.custom_points *= 72.0f / 0.0254f;
        	else if (!strcasecmp(units, "in"))
-	          cparam->current.custom_points *= 72.0f;	      
+	          cparam->current.custom_points *= 72.0f;
        	else if (!strcasecmp(units, "ft"))
-	          cparam->current.custom_points *= 12.0f * 72.0f;	      
+	          cparam->current.custom_points *= 12.0f * 72.0f;
              }
 	      break;

@@ -1060,6 +1073,8 @@ ppd_mark_option(ppd_file_t *ppd,	/* I - PPD file */
      * appropriate...
      */

+      cupsArraySave(ppd->options);
+
      if (!strcasecmp(option, "PageSize"))
      {
 	if ((o = ppdFindOption(ppd, "PageRegion")) != NULL)
@@ -1084,6 +1099,8 @@ ppd_mark_option(ppd_file_t *ppd,	/* I - PPD file */
          }
        }
      }
+
+      cupsArrayRestore(ppd->options);
    }
    else if (!strcasecmp(option, "InputSlot"))
    {
@@ -1091,6 +1108,8 @@ ppd_mark_option(ppd_file_t *ppd,	/* I - PPD file */
      * Unmark ManualFeed option...
      */

+      cupsArraySave(ppd->options);
+
      if ((o = ppdFindOption(ppd, "ManualFeed")) != NULL)
      {
        key.option = o;
@@ -1100,6 +1119,8 @@ ppd_mark_option(ppd_file_t *ppd,	/* I - PPD file */
          cupsArrayRemove(ppd->marked, oldc);
        }
      }
+
+      cupsArrayRestore(ppd->options);
    }
    else if (!strcasecmp(option, "ManualFeed") &&
 	     !strcasecmp(choice, "True"))
@@ -1108,6 +1129,8 @@ ppd_mark_option(ppd_file_t *ppd,	/* I - PPD file */
      * Unmark InputSlot option...
      */

+      cupsArraySave(ppd->options);
+
      if ((o = ppdFindOption(ppd, "InputSlot")) != NULL)
      {
        key.option = o;
@@ -1117,6 +1140,8 @@ ppd_mark_option(ppd_file_t *ppd,	/* I - PPD file */
          cupsArrayRemove(ppd->marked, oldc);
        }
      }
+
+      cupsArrayRestore(ppd->options);
    }
  }

@@ -1126,107 +1151,6 @@ ppd_mark_option(ppd_file_t *ppd,	/* I - PPD file */
 }


-/*
- * 'ppd_mark_size()' - Quickly mark a page size without checking for conflicts.
- *
- * This function is also responsible for mapping PWG/ISO/IPP size names to the
- * PPD file...
- */
-
-static void
-ppd_mark_size(ppd_file_t *ppd,		/* I - PPD file */
-              const char *size)		/* I - Size name */
-{
-  int			i;		/* Looping var */
-  _cups_pwg_media_t	*pwgmedia;	/* PWG media information */
-  ppd_size_t		*ppdsize;	/* Current PPD size */
-  double		dw, dl;		/* Difference in width and height */
-  double		width,		/* Width to find */
-			length;		/* Length to find */
-  char			width_str[256],	/* Width in size name */
-			length_str[256],/* Length in size name */
-			units[256],	/* Units in size name */
-			custom[256];	/* Custom size */
-  struct lconv		*loc;		/* Localization data */
-
-
- /*
-  * See if this is a PPD size...
-  */
-
-  if (!strncasecmp(size, "Custom.", 7) || ppdPageSize(ppd, size))
-  {
-    ppd_mark_option(ppd, "PageSize", size);
-    return;
-  }
-
- /*
-  * Nope, try looking up the PWG or legacy (IPP/ISO) size name...
-  */
-
-  if ((pwgmedia = _cupsPWGMediaByName(size)) == NULL)
-    pwgmedia = _cupsPWGMediaByLegacy(size);
-
-  if (pwgmedia)
-  {
-    width  = pwgmedia->width;
-    length = pwgmedia->length;
-  }
-  else if (sscanf(size, "%*[^_]_%*[^_]_%255[0-9.]x%255[0-9.]%s", width_str,
-                  length_str, units) == 3)
-  {
-   /*
-    * Got a "self-describing" name that isn't in our table...
-    */
-
-    loc    = localeconv();
-    width  = _cupsStrScand(width_str, NULL, loc);
-    length = _cupsStrScand(length_str, NULL, loc);
-
-    if (!strcmp(units, "in"))
-    {
-      width  *= 72.0;
-      length *= 72.0;
-    }
-    else if (!strcmp(units, "mm"))
-    {
-      width  *= 25.4 / 72.0;
-      length *= 25.4 / 72.0;
-    }
-    else
-      return;
-  }
-  else
-    return;    
-
- /*
-  * Search the PPD file for a matching size...
-  */
-
-  for (i = ppd->num_sizes, ppdsize = ppd->sizes; i > 0; i --, ppdsize ++)
-  {
-    dw = ppdsize->width - width;
-    dl = ppdsize->length - length;
-
-    if (dw > -5.0 && dw < 5.0 && dl > -5.0 && dl < 5.0)
-    {
-      ppd_mark_option(ppd, "PageSize", ppdsize->name);
-      return;
-    }
-  }
-
- /*
-  * No match found; if custom sizes are supported, set a custom size...
-  */
-
-  if (ppd->variable_sizes)
-  {
-    snprintf(custom, sizeof(custom), "Custom.%dx%d", (int)width, (int)length);
-    ppd_mark_option(ppd, "PageSize", custom);
-  }
-}
-
-
 /*
 * End of "$Id$".
 */
@@ -3,7 +3,7 @@
 *
 *   Page size functions for the Common UNIX Printing System (CUPS).
 *
- *   Copyright 2007-2009 by Apple Inc.
+ *   Copyright 2007-2010 by Apple Inc.
 *   Copyright 1997-2007 by Easy Software Products, all rights reserved.
 *
 *   These coded instructions, statements, and computer programs are the
@@ -18,9 +18,10 @@
 *
 * Contents:
 *
- *   ppdPageSize()   - Get the page size record for the given size.
- *   ppdPageWidth()  - Get the page width for the given size.
- *   ppdPageLength() - Get the page length for the given size.
+ *   ppdPageSize()       - Get the page size record for the given size.
+ *   ppdPageSizeLimits() - Return the custom page size limits.
+ *   ppdPageWidth()      - Get the page width for the given size.
+ *   ppdPageLength()     - Get the page length for the given size.
 */

 /*
@@ -43,7 +44,7 @@ ppdPageSize(ppd_file_t *ppd,		/* I - PPD file record */
 {
  int		i;			/* Looping var */
  ppd_size_t	*size;			/* Current page size */
-  float		w, l;			/* Width and length of page */
+  double	w, l;			/* Width and length of page */
  char		*nameptr;		/* Pointer into name */
  struct lconv	*loc;			/* Locale data */
  ppd_coption_t	*coption;		/* Custom option for page size */
@@ -80,52 +81,54 @@ ppdPageSize(ppd_file_t *ppd,		/* I - PPD file record */
      * Variable size; size name can be one of the following:
      *
      *    Custom.WIDTHxLENGTHin    - Size in inches
+      *    Custom.WIDTHxLENGTHft    - Size in feet
      *    Custom.WIDTHxLENGTHcm    - Size in centimeters
      *    Custom.WIDTHxLENGTHmm    - Size in millimeters
+      *    Custom.WIDTHxLENGTHm     - Size in meters
      *    Custom.WIDTHxLENGTH[pt]  - Size in points
      */

      loc = localeconv();
-      w   = (float)_cupsStrScand(name + 7, &nameptr, loc);
+      w   = _cupsStrScand(name + 7, &nameptr, loc);
      if (!nameptr || *nameptr != 'x')
        return (NULL);

-      l = (float)_cupsStrScand(nameptr + 1, &nameptr, loc);
+      l = _cupsStrScand(nameptr + 1, &nameptr, loc);
      if (!nameptr)
        return (NULL);

      if (!strcasecmp(nameptr, "in"))
      {
-        w *= 72.0f;
-	l *= 72.0f;
+        w *= 72.0;
+	l *= 72.0;
      }
      else if (!strcasecmp(nameptr, "ft"))
      {
-        w *= 12.0f * 72.0f;
-	l *= 12.0f * 72.0f;
+        w *= 12.0 * 72.0;
+	l *= 12.0 * 72.0;
      }
      else if (!strcasecmp(nameptr, "mm"))
      {
-        w *= 72.0f / 25.4f;
-        l *= 72.0f / 25.4f;
+        w *= 72.0 / 25.4;
+        l *= 72.0 / 25.4;
      }
      else if (!strcasecmp(nameptr, "cm"))
      {
-        w *= 72.0f / 2.54f;
-        l *= 72.0f / 2.54f;
+        w *= 72.0 / 2.54;
+        l *= 72.0 / 2.54;
      }
      else if (!strcasecmp(nameptr, "m"))
      {
-        w *= 72.0f / 0.0254f;
-        l *= 72.0f / 0.0254f;
+        w *= 72.0 / 0.0254;
+        l *= 72.0 / 0.0254;
      }

-      size->width  = w;
-      size->length = l;
+      size->width  = (float)w;
+      size->length = (float)l;
      size->left   = ppd->custom_margins[0];
      size->bottom = ppd->custom_margins[1];
-      size->right  = w - ppd->custom_margins[2];
-      size->top    = l - ppd->custom_margins[3];
+      size->right  = (float)(w - ppd->custom_margins[2]);
+      size->top    = (float)(l - ppd->custom_margins[3]);

     /*
      * Update the custom option records for the page size, too...
@@ -249,6 +252,9 @@ ppdPageSizeLimits(ppd_file_t *ppd,	/* I - PPD file record */
  * Figure out the current minimum width and length...
  */

+  width  = ppd->custom_min[0];
+  length = ppd->custom_min[1];
+
  if (qualifier2)
  {
   /*
@@ -276,18 +282,13 @@ ppdPageSizeLimits(ppd_file_t *ppd,	/* I - PPD file record */
      attr = ppdFindAttr(ppd, "cupsMinSize", spec);
    }

-    if (!attr ||
-        (attr->value && sscanf(attr->value, "%f%f", &width, &length) != 2))
+    if ((attr && attr->value &&
+         sscanf(attr->value, "%f%f", &width, &length) != 2) || !attr)
    {
      width  = ppd->custom_min[0];
      length = ppd->custom_min[1];
    }
  }
-  else
-  {
-    width  = ppd->custom_min[0];
-    length = ppd->custom_min[1];
-  }

  minimum->width  = width;
  minimum->length = length;
@@ -300,6 +301,9 @@ ppdPageSizeLimits(ppd_file_t *ppd,	/* I - PPD file record */
  * Figure out the current maximum width and length...
  */

+  width  = ppd->custom_max[0];
+  length = ppd->custom_max[1];
+
  if (qualifier2)
  {
   /*
@@ -334,11 +338,6 @@ ppdPageSizeLimits(ppd_file_t *ppd,	/* I - PPD file record */
      length = ppd->custom_max[1];
    }
  }
-  else
-  {
-    width  = ppd->custom_max[0];
-    length = ppd->custom_max[1];
-  }

  maximum->width  = width;
  maximum->length = length;
@@ -1,9 +1,9 @@
 /*
 * "$Id$"
 *
- *   PPD file routines for the Common UNIX Printing System (CUPS).
+ *   PPD file routines for CUPS.
 *
- *   Copyright 2007-2009 by Apple Inc.
+ *   Copyright 2007-2010 by Apple Inc.
 *   Copyright 1997-2007 by Easy Software Products, all rights reserved.
 *
 *   These coded instructions, statements, and computer programs are the
@@ -60,6 +60,7 @@
 */

 #include "ppd-private.h"
+#include "pwg-private.h"
 #include "globals.h"
 #include "debug.h"
 #include <stdlib.h>
@@ -313,6 +314,13 @@ ppdClose(ppd_file_t *ppd)		/* I - PPD file record */
    cupsArrayDelete(ppd->cups_uiconstraints);
  }

+ /*
+  * Free any PWG mapping data...
+  */
+
+  if (ppd->pwg)
+    _pwgDestroy((_pwg_t *)ppd->pwg);
+
 /*
  * Free the whole record...
  */
@@ -352,11 +360,13 @@ ppdErrorString(ppd_status_t status)	/* I - PPD status */
 		  _("Illegal option keyword string"),
 		  _("Illegal translation string"),
 		  _("Illegal whitespace character"),
-		  _("Bad custom parameter")
+		  _("Bad custom parameter"),
+		  _("Missing option keyword"),
+		  _("Bad value string")
 		};


-  if (status < PPD_OK || status > PPD_ILLEGAL_WHITESPACE)
+  if (status < PPD_OK || status >= PPD_MAX_STATUS)
    return (_cupsLangString(cupsLangDefault(), _("Unknown")));
  else
    return (_cupsLangString(cupsLangDefault(), messages[status]));
@@ -942,7 +952,8 @@ ppdOpen2(cups_file_t *fp)		/* I - File to read from */
      * Get the parameter data...
      */

-      if (sscanf(string, "%d%32s%64s%64s", &corder, ctype, cminimum,
+      if (!string ||
+          sscanf(string, "%d%32s%64s%64s", &corder, ctype, cminimum,
                 cmaximum) != 4)
      {
        cg->ppd_status = PPD_BAD_CUSTOM_PARAM;
@@ -1176,6 +1187,37 @@ ppdOpen2(cups_file_t *fp)		/* I - File to read from */
    }
    else if (!strcmp(keyword, "JobPatchFile"))
    {
+     /*
+      * CUPS STR #3421: Check for "*JobPatchFile: int: string"
+      */
+
+      if (isdigit(*string & 255))
+      {
+        for (sptr = string + 1; isdigit(*sptr & 255); sptr ++);
+
+        if (*sptr == ':')
+        {
+         /*
+          * Found "*JobPatchFile: int: string"...
+          */
+
+          cg->ppd_status = PPD_BAD_VALUE;
+
+	  goto error;
+        }
+      }
+
+      if (!name[0])
+      {
+       /*
+        * Found "*JobPatchFile: string"...
+        */
+
+        cg->ppd_status = PPD_MISSING_OPTION_KEYWORD;
+
+	goto error;
+      }
+
      if (ppd->patches == NULL)
        ppd->patches = strdup(string);
      else
@@ -1615,6 +1657,12 @@ ppdOpen2(cups_file_t *fp)		/* I - File to read from */
    else if (!strcmp(keyword, "UIConstraints") ||
             !strcmp(keyword, "NonUIConstraints"))
    {
+      if (!string)
+      {
+	cg->ppd_status = PPD_BAD_UI_CONSTRAINTS;
+	goto error;
+      }
+
      if (ppd->num_consts == 0)
 	constraint = calloc(2, sizeof(ppd_const_t));
      else
@@ -1,10 +1,9 @@
 /*
 * "$Id$"
 *
- *   PostScript Printer Description definitions for the Common UNIX Printing
- *   System (CUPS).
+ *   PostScript Printer Description definitions for CUPS.
 *
- *   Copyright 2007-2008 by Apple Inc.
+ *   Copyright 2007-2010 by Apple Inc.
 *   Copyright 1997-2007 by Easy Software Products, all rights reserved.
 *
 *   These coded instructions, statements, and computer programs are the
@@ -115,7 +114,10 @@ typedef enum ppd_status_e		/**** Status Codes @since CUPS 1.1.19/Mac OS X 10.3@
  PPD_ILLEGAL_OPTION_KEYWORD,		/* Illegal option keyword string */
  PPD_ILLEGAL_TRANSLATION,		/* Illegal translation string */
  PPD_ILLEGAL_WHITESPACE,		/* Illegal whitespace character */
-  PPD_BAD_CUSTOM_PARAM			/* Bad custom parameter */
+  PPD_BAD_CUSTOM_PARAM,			/* Bad custom parameter */
+  PPD_MISSING_OPTION_KEYWORD,		/* Missing option keyword */
+  PPD_BAD_VALUE,			/* Bad value string */
+  PPD_MAX_STATUS			/* @private@ */
 } ppd_status_t;

 enum ppd_conform_e			/**** Conformance Levels @since CUPS 1.1.19/Mac OS X 10.3@ ****/
@@ -213,7 +215,7 @@ typedef struct ppd_profile_s		/**** sRGB Color Profiles ****/
  float		matrix[3][3];		/* Transform matrix */
 } ppd_profile_t;

-/**** New in CUPS 1.2 ****/
+/**** New in CUPS 1.2/Mac OS X 10.5 ****/
 typedef enum ppd_cptype_e		/**** Custom Parameter Type @since CUPS 1.2/Mac OS X 10.5@ ****/
 {
  PPD_CUSTOM_CURVE,			/* Curve value for f(x) = x^value */
@@ -321,16 +323,19 @@ typedef struct ppd_file_s		/**** PPD File ****/
  int		cur_attr;		/* Current attribute @since CUPS 1.1.19/Mac OS X 10.3@ @private@ */
  ppd_attr_t	**attrs;		/* Attributes @since CUPS 1.1.19/Mac OS X 10.3@ @private@ */

-  /**** New in CUPS 1.2 ****/
+  /**** New in CUPS 1.2/Mac OS X 10.5 ****/
  cups_array_t	*sorted_attrs;		/* Attribute lookup array @since CUPS 1.2/Mac OS X 10.5@ @private@ */
  cups_array_t	*options;		/* Option lookup array @since CUPS 1.2/Mac OS X 10.5@ @private@ */
  cups_array_t	*coptions;		/* Custom options array @since CUPS 1.2/Mac OS X 10.5@ @private@ */

-  /**** New in CUPS 1.3 ****/
+  /**** New in CUPS 1.3/Mac OS X 10.5 ****/
  cups_array_t	*marked;		/* Marked choices @since CUPS 1.3/Mac OS X 10.5@ @private@ */

-  /**** New in CUPS 1.4 ****/
+  /**** New in CUPS 1.4/Mac OS X 10.6 ****/
  cups_array_t	*cups_uiconstraints;	/* cupsUIConstraints @since CUPS 1.4/Mac OS X 10.6@ @private@ */
+
+  /**** New in CUPS 1.5 ****/
+  void		*pwg;			/* PWG to/from PPD mappings */
 } ppd_file_t;


@@ -394,19 +399,20 @@ extern ppd_option_t	*ppdNextOption(ppd_file_t *ppd) _CUPS_API_1_2;
 extern int		ppdLocalize(ppd_file_t *ppd) _CUPS_API_1_2;
 extern ppd_file_t	*ppdOpen2(cups_file_t *fp) _CUPS_API_1_2;

-/**** New in CUPS 1.3 ****/
+/**** New in CUPS 1.3/Mac OS X 10.5 ****/
 extern const char	*ppdLocalizeIPPReason(ppd_file_t *ppd,
 			                      const char *reason,
 					      const char *scheme,
 					      char *buffer,
 					      size_t bufsize) _CUPS_API_1_3;

-/**** New in CUPS 1.4 ****/
+/**** New in CUPS 1.4/Mac OS X 10.6 ****/
 extern int		ppdInstallableConflict(ppd_file_t *ppd,
 			                       const char *option,
-					       const char *choice);
+					       const char *choice)
+					           _CUPS_API_1_4;
 extern ppd_attr_t	*ppdLocalizeAttr(ppd_file_t *ppd, const char *keyword,
-			                 const char *spec);
+			                 const char *spec) _CUPS_API_1_4;
 extern const char	*ppdLocalizeMarkerName(ppd_file_t *ppd,
 			                       const char *name) _CUPS_API_1_4;
 extern int		ppdPageSizeLimits(ppd_file_t *ppd,
@@ -0,0 +1,561 @@
+/*
+ * "$Id$"
+ *
+ *   PWG load/save API implementation for CUPS.
+ *
+ *   Copyright 2010 by Apple Inc.
+ *
+ *   These coded instructions, statements, and computer programs are the
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
+ *
+ *   This file is subject to the Apple OS-Developed Software exception.
+ *
+ * Contents:
+ *
+ *   _pwgCreateWithFile() - Create PWG mapping data from a written file.
+ *   _pwgDestroy()        - Free all memory used for PWG mapping data.
+ *   _pwgWriteFile()      - Write PWG mapping data to a file.
+ */
+
+/*
+ * Include necessary headers...
+ */
+
+#include "globals.h"
+#include "debug.h"
+#include <math.h>
+
+
+/*
+ * '_pwgCreateWithFile()' - Create PWG mapping data from a written file.
+ *
+ * Use the @link _pwgWriteFile@ function to write PWG mapping data to a file.
+ */
+
+_pwg_t *				/* O - PWG mapping data */
+_pwgCreateWithFile(const char *filename)/* I - File to read */
+{
+  cups_file_t	*fp;			/* File */
+  _pwg_t	*pwg;			/* PWG mapping data */
+  _pwg_size_t	*size;			/* Current size */
+  _pwg_map_t	*map;			/* Current map */
+  int		linenum,		/* Current line number */
+		num_bins,		/* Number of bins in file */
+		num_sizes,		/* Number of sizes in file */
+		num_sources,		/* Number of sources in file */
+		num_types;		/* Number of types in file */
+  char		line[512],		/* Current line */
+		*value,			/* Pointer to value in line */
+		pwg_keyword[128],	/* PWG keyword */
+		ppd_keyword[PPD_MAX_NAME];
+					/* PPD keyword */
+
+
+  DEBUG_printf(("_pwgCreateWithFile(filename=\"%s\")", filename));
+
+ /*
+  * Range check input...
+  */
+
+  if (!filename)
+  {
+    _cupsSetError(IPP_INTERNAL_ERROR, strerror(EINVAL), 0);
+    return (NULL);
+  }
+
+ /*
+  * Open the file...
+  */
+
+  if ((fp = cupsFileOpen(filename, "r")) == NULL)
+  {
+    _cupsSetError(IPP_INTERNAL_ERROR, strerror(errno), 0);
+    return (NULL);
+  }
+
+ /*
+  * Allocate the mapping data structure...
+  */
+
+  if ((pwg = calloc(1, sizeof(_pwg_t))) == NULL)
+  {
+    DEBUG_puts("_pwgCreateWithFile: Unable to allocate pwg_t.");
+    _cupsSetError(IPP_INTERNAL_ERROR, strerror(errno), 0);
+    goto create_error;
+  }
+
+ /*
+  * Read the file...
+  */
+
+  linenum     = 0;
+  num_bins    = 0;
+  num_sizes   = 0;
+  num_sources = 0;
+  num_types   = 0;
+
+  while (cupsFileGetConf(fp, line, sizeof(line), &value, &linenum))
+  {
+    DEBUG_printf(("_pwgCreateWithFile: line=\"%s\", value=\"%s\", linenum=%d",
+		  line, value, linenum));
+
+    if (!value)
+    {
+      DEBUG_printf(("_pwgCreateWithFile: Missing value on line %d.", linenum));
+      _cupsSetError(IPP_INTERNAL_ERROR, _("Bad PWG mapping file."), 1);
+      goto create_error;
+    }
+    else if (!strcasecmp(line, "NumBins"))
+    {
+      if (num_bins > 0)
+      {
+        DEBUG_puts("_pwgCreateWithFile: NumBins listed multiple times.");
+	_cupsSetError(IPP_INTERNAL_ERROR, _("Bad PWG mapping file."), 1);
+	goto create_error;
+      }
+
+      if ((num_bins = atoi(value)) <= 0 || num_bins > 65536)
+      {
+        DEBUG_printf(("_pwgCreateWithFile: Bad NumBins value %d on line %d.",
+	              num_sizes, linenum));
+	_cupsSetError(IPP_INTERNAL_ERROR, _("Bad PWG mapping file."), 1);
+	goto create_error;
+      }
+
+      if ((pwg->bins = calloc(num_bins, sizeof(_pwg_map_t))) == NULL)
+      {
+        DEBUG_printf(("_pwgCreateWithFile: Unable to allocate %d bins.",
+	              num_sizes));
+	_cupsSetError(IPP_INTERNAL_ERROR, strerror(errno), 0);
+	goto create_error;
+      }
+    }
+    else if (!strcasecmp(line, "Bin"))
+    {
+      if (sscanf(value, "%127s%40s", pwg_keyword, ppd_keyword) != 2)
+      {
+        DEBUG_printf(("_pwgCreateWithFile: Bad Bin on line %d.", linenum));
+	_cupsSetError(IPP_INTERNAL_ERROR, _("Bad PWG mapping file."), 1);
+	goto create_error;
+      }
+
+      if (pwg->num_bins >= num_bins)
+      {
+        DEBUG_printf(("_pwgCreateWithFile: Too many Bin's on line %d.",
+	              linenum));
+	_cupsSetError(IPP_INTERNAL_ERROR, _("Bad PWG mapping file."), 1);
+	goto create_error;
+      }
+
+      map      = pwg->bins + pwg->num_bins;
+      map->pwg = _cupsStrAlloc(pwg_keyword);
+      map->ppd = _cupsStrAlloc(ppd_keyword);
+
+      pwg->num_bins ++;
+    }
+    else if (!strcasecmp(line, "NumSizes"))
+    {
+      if (num_sizes > 0)
+      {
+        DEBUG_puts("_pwgCreateWithFile: NumSizes listed multiple times.");
+	_cupsSetError(IPP_INTERNAL_ERROR, _("Bad PWG mapping file."), 1);
+	goto create_error;
+      }
+
+      if ((num_sizes = atoi(value)) <= 0 || num_sizes > 65536)
+      {
+        DEBUG_printf(("_pwgCreateWithFile: Bad NumSizes value %d on line %d.",
+	              num_sizes, linenum));
+	_cupsSetError(IPP_INTERNAL_ERROR, _("Bad PWG mapping file."), 1);
+	goto create_error;
+      }
+
+      if ((pwg->sizes = calloc(num_sizes, sizeof(_pwg_size_t))) == NULL)
+      {
+        DEBUG_printf(("_pwgCreateWithFile: Unable to allocate %d sizes.",
+	              num_sizes));
+	_cupsSetError(IPP_INTERNAL_ERROR, strerror(errno), 0);
+	goto create_error;
+      }
+    }
+    else if (!strcasecmp(line, "Size"))
+    {
+      if (pwg->num_sizes >= num_sizes)
+      {
+        DEBUG_printf(("_pwgCreateWithFile: Too many Size's on line %d.",
+	              linenum));
+	_cupsSetError(IPP_INTERNAL_ERROR, _("Bad PWG mapping file."), 1);
+	goto create_error;
+      }
+
+      size = pwg->sizes + pwg->num_sizes;
+
+      if (sscanf(value, "%127s%40s%d%d%d%d%d%d", pwg_keyword, ppd_keyword,
+		 &(size->width), &(size->length), &(size->left),
+		 &(size->bottom), &(size->right), &(size->top)) != 8)
+      {
+        DEBUG_printf(("_pwgCreateWithFile: Bad Size on line %d.", linenum));
+	_cupsSetError(IPP_INTERNAL_ERROR, _("Bad PWG mapping file."), 1);
+	goto create_error;
+      }
+
+      size->map.pwg = _cupsStrAlloc(pwg_keyword);
+      size->map.ppd = _cupsStrAlloc(ppd_keyword);
+
+      pwg->num_sizes ++;
+    }
+    else if (!strcasecmp(line, "CustomSize"))
+    {
+      if (pwg->custom_max_width > 0)
+      {
+        DEBUG_printf(("_pwgCreateWithFile: Too many CustomSize's on line %d.",
+	              linenum));
+	_cupsSetError(IPP_INTERNAL_ERROR, _("Bad PWG mapping file."), 1);
+	goto create_error;
+      }
+
+      if (sscanf(value, "%d%d%d%d%d%d%d%d", &(pwg->custom_max_width),
+                 &(pwg->custom_max_length), &(pwg->custom_min_width),
+		 &(pwg->custom_min_length), &(pwg->custom_size.left),
+		 &(pwg->custom_size.bottom), &(pwg->custom_size.right),
+		 &(pwg->custom_size.top)) != 8)
+      {
+        DEBUG_printf(("_pwgCreateWithFile: Bad CustomSize on line %d.", linenum));
+	_cupsSetError(IPP_INTERNAL_ERROR, _("Bad PWG mapping file."), 1);
+	goto create_error;
+      }
+
+      _pwgGenerateSize(pwg_keyword, sizeof(pwg_keyword), "custom", "max",
+		       pwg->custom_max_width, pwg->custom_max_length);
+      pwg->custom_max_keyword = _cupsStrAlloc(pwg_keyword);
+
+      _pwgGenerateSize(pwg_keyword, sizeof(pwg_keyword), "custom", "min",
+		       pwg->custom_min_width, pwg->custom_min_length);
+      pwg->custom_min_keyword = _cupsStrAlloc(pwg_keyword);
+    }
+    else if (!strcasecmp(line, "NumSources"))
+    {
+      if (num_sources > 0)
+      {
+        DEBUG_puts("_pwgCreateWithFile: NumSources listed multiple times.");
+	_cupsSetError(IPP_INTERNAL_ERROR, _("Bad PWG mapping file."), 1);
+	goto create_error;
+      }
+
+      if ((num_sources = atoi(value)) <= 0 || num_sources > 65536)
+      {
+        DEBUG_printf(("_pwgCreateWithFile: Bad NumSources value %d on line %d.",
+	              num_sources, linenum));
+	_cupsSetError(IPP_INTERNAL_ERROR, _("Bad PWG mapping file."), 1);
+	goto create_error;
+      }
+
+      if ((pwg->sources = calloc(num_sources, sizeof(_pwg_map_t))) == NULL)
+      {
+        DEBUG_printf(("_pwgCreateWithFile: Unable to allocate %d sources.",
+	              num_sources));
+	_cupsSetError(IPP_INTERNAL_ERROR, strerror(errno), 0);
+	goto create_error;
+      }
+    }
+    else if (!strcasecmp(line, "Source"))
+    {
+      if (sscanf(value, "%127s%40s", pwg_keyword, ppd_keyword) != 2)
+      {
+        DEBUG_printf(("_pwgCreateWithFile: Bad Source on line %d.", linenum));
+	_cupsSetError(IPP_INTERNAL_ERROR, _("Bad PWG mapping file."), 1);
+	goto create_error;
+      }
+
+      if (pwg->num_sources >= num_sources)
+      {
+        DEBUG_printf(("_pwgCreateWithFile: Too many Source's on line %d.",
+	              linenum));
+	_cupsSetError(IPP_INTERNAL_ERROR, _("Bad PWG mapping file."), 1);
+	goto create_error;
+      }
+
+      map      = pwg->sources + pwg->num_sources;
+      map->pwg = _cupsStrAlloc(pwg_keyword);
+      map->ppd = _cupsStrAlloc(ppd_keyword);
+
+      pwg->num_sources ++;
+    }
+    else if (!strcasecmp(line, "NumTypes"))
+    {
+      if (num_types > 0)
+      {
+        DEBUG_puts("_pwgCreateWithFile: NumTypes listed multiple times.");
+	_cupsSetError(IPP_INTERNAL_ERROR, _("Bad PWG mapping file."), 1);
+	goto create_error;
+      }
+
+      if ((num_types = atoi(value)) <= 0 || num_types > 65536)
+      {
+        DEBUG_printf(("_pwgCreateWithFile: Bad NumTypes value %d on line %d.",
+	              num_types, linenum));
+	_cupsSetError(IPP_INTERNAL_ERROR, _("Bad PWG mapping file."), 1);
+	goto create_error;
+      }
+
+      if ((pwg->types = calloc(num_types, sizeof(_pwg_map_t))) == NULL)
+      {
+        DEBUG_printf(("_pwgCreateWithFile: Unable to allocate %d types.",
+	              num_types));
+	_cupsSetError(IPP_INTERNAL_ERROR, strerror(errno), 0);
+	goto create_error;
+      }
+    }
+    else if (!strcasecmp(line, "Type"))
+    {
+      if (sscanf(value, "%127s%40s", pwg_keyword, ppd_keyword) != 2)
+      {
+        DEBUG_printf(("_pwgCreateWithFile: Bad Type on line %d.", linenum));
+	_cupsSetError(IPP_INTERNAL_ERROR, _("Bad PWG mapping file."), 1);
+	goto create_error;
+      }
+
+      if (pwg->num_types >= num_types)
+      {
+        DEBUG_printf(("_pwgCreateWithFile: Too many Type's on line %d.",
+	              linenum));
+	_cupsSetError(IPP_INTERNAL_ERROR, _("Bad PWG mapping file."), 1);
+	goto create_error;
+      }
+
+      map      = pwg->types + pwg->num_types;
+      map->pwg = _cupsStrAlloc(pwg_keyword);
+      map->ppd = _cupsStrAlloc(ppd_keyword);
+
+      pwg->num_types ++;
+    }
+    else
+    {
+      DEBUG_printf(("_pwgCreateWithFile: Unknown %s on line %d.", line,
+		    linenum));
+      _cupsSetError(IPP_INTERNAL_ERROR, _("Bad PWG mapping file."), 1);
+      goto create_error;
+    }
+  }
+
+  if (pwg->num_sizes < num_sizes)
+  {
+    DEBUG_printf(("_pwgCreateWithFile: Not enough sizes (%d < %d).",
+                  pwg->num_sizes, num_sizes));
+    _cupsSetError(IPP_INTERNAL_ERROR, _("Bad PWG mapping file."), 1);
+    goto create_error;
+  }
+
+  if (pwg->num_sources < num_sources)
+  {
+    DEBUG_printf(("_pwgCreateWithFile: Not enough sources (%d < %d).",
+                  pwg->num_sources, num_sources));
+    _cupsSetError(IPP_INTERNAL_ERROR, _("Bad PWG mapping file."), 1);
+    goto create_error;
+  }
+
+  if (pwg->num_types < num_types)
+  {
+    DEBUG_printf(("_pwgCreateWithFile: Not enough types (%d < %d).",
+                  pwg->num_types, num_types));
+    _cupsSetError(IPP_INTERNAL_ERROR, _("Bad PWG mapping file."), 1);
+    goto create_error;
+  }
+
+  cupsFileClose(fp);
+
+  return (pwg);
+
+ /*
+  * If we get here the file was bad - free any data and return...
+  */
+
+  create_error:
+
+  cupsFileClose(fp);
+  _pwgDestroy(pwg);
+
+  return (NULL);
+}
+
+
+/*
+ * '_pwgDestroy()' - Free all memory used for PWG mapping data.
+ */
+
+void
+_pwgDestroy(_pwg_t *pwg)		/* I - PWG mapping data */
+{
+  int		i;			/* Looping var */
+  _pwg_map_t	*map;			/* Current map */
+  _pwg_size_t	*size;			/* Current size */
+
+
+ /*
+  * Range check input...
+  */
+
+  if (!pwg)
+    return;
+
+ /*
+  * Free memory as needed...
+  */
+
+  if (pwg->bins)
+  {
+    for (i = pwg->num_bins, map = pwg->bins; i > 0; i --, map ++)
+    {
+      _cupsStrFree(map->pwg);
+      _cupsStrFree(map->ppd);
+    }
+
+    free(pwg->bins);
+  }
+
+  if (pwg->sizes)
+  {
+    for (i = pwg->num_sizes, size = pwg->sizes; i > 0; i --, size ++)
+    {
+      _cupsStrFree(size->map.pwg);
+      _cupsStrFree(size->map.ppd);
+    }
+
+    free(pwg->sizes);
+  }
+
+  if (pwg->sources)
+  {
+    for (i = pwg->num_sources, map = pwg->sources; i > 0; i --, map ++)
+    {
+      _cupsStrFree(map->pwg);
+      _cupsStrFree(map->ppd);
+    }
+
+    free(pwg->sources);
+  }
+
+  if (pwg->types)
+  {
+    for (i = pwg->num_types, map = pwg->types; i > 0; i --, map ++)
+    {
+      _cupsStrFree(map->pwg);
+      _cupsStrFree(map->ppd);
+    }
+
+    free(pwg->types);
+  }
+
+  if (pwg->custom_max_keyword)
+    _cupsStrFree(pwg->custom_max_keyword);
+
+  if (pwg->custom_min_keyword)
+    _cupsStrFree(pwg->custom_min_keyword);
+
+  free(pwg);
+}
+
+
+/*
+ * '_pwgWriteFile()' - Write PWG mapping data to a file.
+ */
+
+int					/* O - 1 on success, 0 on failure */
+_pwgWriteFile(_pwg_t     *pwg,		/* I - PWG mapping data */
+              const char *filename)	/* I - File to write */
+{
+  int		i;			/* Looping var */
+  cups_file_t	*fp;			/* Output file */
+  _pwg_size_t	*size;			/* Current size */
+  _pwg_map_t	*map;			/* Current map */
+
+
+ /*
+  * Range check input...
+  */
+
+  if (!pwg || !filename)
+  {
+    _cupsSetError(IPP_INTERNAL_ERROR, strerror(EINVAL), 0);
+    return (0);
+  }
+
+ /*
+  * Open the file and write with compression...
+  */
+
+  if ((fp = cupsFileOpen(filename, "w9")) == NULL)
+  {
+    _cupsSetError(IPP_INTERNAL_ERROR, strerror(errno), 0);
+    return (0);
+  }
+
+ /*
+  * Standard header...
+  */
+
+  cupsFilePuts(fp, "#CUPS-PWGPPD\n");
+
+ /*
+  * Output bins...
+  */
+
+  if (pwg->num_bins > 0)
+  {
+    cupsFilePrintf(fp, "NumBins %d\n", pwg->num_bins);
+    for (i = pwg->num_bins, map = pwg->bins; i > 0; i --, map ++)
+      cupsFilePrintf(fp, "Bin %s %s\n", map->pwg, map->ppd);
+  }
+
+ /*
+  * Media sizes...
+  */
+
+  cupsFilePrintf(fp, "NumSizes %d\n", pwg->num_sizes);
+  for (i = pwg->num_sizes, size = pwg->sizes; i > 0; i --, size ++)
+    cupsFilePrintf(fp, "Size %s %s %d %d %d %d %d %d\n", size->map.pwg,
+		   size->map.ppd, size->width, size->length, size->left,
+		   size->bottom, size->right, size->top);
+  if (pwg->custom_max_width > 0)
+    cupsFilePrintf(fp, "CustomSize %d %d %d %d %d %d %d %d\n",
+                   pwg->custom_max_width, pwg->custom_max_length,
+		   pwg->custom_min_width, pwg->custom_min_length,
+		   pwg->custom_size.left, pwg->custom_size.bottom,
+		   pwg->custom_size.right, pwg->custom_size.top);
+
+ /*
+  * Media sources...
+  */
+
+  if (pwg->num_sources > 0)
+  {
+    cupsFilePrintf(fp, "NumSources %d\n", pwg->num_sources);
+    for (i = pwg->num_sources, map = pwg->sources; i > 0; i --, map ++)
+      cupsFilePrintf(fp, "Source %s %s\n", map->pwg, map->ppd);
+  }
+
+ /*
+  * Media types...
+  */
+
+  if (pwg->num_types > 0)
+  {
+    cupsFilePrintf(fp, "NumTypes %d\n", pwg->num_types);
+    for (i = pwg->num_types, map = pwg->types; i > 0; i --, map ++)
+      cupsFilePrintf(fp, "Type %s %s\n", map->pwg, map->ppd);
+  }
+
+ /*
+  * Close and return...
+  */
+
+  return (!cupsFileClose(fp));
+}
+
+
+/*
+ * End of "$Id$".
+ */
@@ -0,0 +1,686 @@
+/*
+ * "$Id$"
+ *
+ *   PWG media name API implementation for CUPS.
+ *
+ *   Copyright 2009-2010 by Apple Inc.
+ *
+ *   These coded instructions, statements, and computer programs are the
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
+ *
+ *   This file is subject to the Apple OS-Developed Software exception.
+ *
+ * Contents:
+ *
+ *   _pwgGenerateSize()   - Generate a PWG size keyword.
+ *   _pwgInitSize()       - Initialize a PWG size using IPP job template
+ *                          attributes.
+ *   _pwgMediaForLegacy() - Find a PWG media size by ISO/IPP legacy name.
+ *   _pwgMediaForPPD()    - Find a PWG media size by Adobe PPD name.
+ *   _pwgMediaForPWG()    - Find a PWG media size by 5101.1 self-describing
+ *                          name.
+ *   _pwgMediaForSize()   - Get the PWG media name for a given size.
+ *   pwg_compare_legacy() - Compare two sizes using the legacy names.
+ *   pwg_compare_ppd()    - Compare two sizes using the PPD names.
+ *   pwg_compare_pwg()    - Compare two sizes using the PWG names.
+ */
+
+/*
+ * Include necessary headers...
+ */
+
+#include "globals.h"
+#include "debug.h"
+#include <math.h>
+
+
+/*
+ * Local macros...
+ */
+
+#define _PWG_MEDIA_IN(p,l,a,x,y) {p, l, a, (int)(x * 2540), (int)(y * 2540)}
+#define _PWG_MEDIA_MM(p,l,a,x,y) {p, l, a, (int)(x * 100), (int)(y * 100)}
+
+
+/*
+ * Local functions...
+ */
+
+static int	pwg_compare_legacy(_pwg_media_t *a, _pwg_media_t *b);
+static int	pwg_compare_pwg(_pwg_media_t *a, _pwg_media_t *b);
+static int	pwg_compare_ppd(_pwg_media_t *a, _pwg_media_t *b);
+
+
+/*
+ * Local globals...
+ */
+
+static _pwg_media_t const cups_pwg_media[] =
+{					/* Media size lookup table */
+  /* North American Standard Sheet Media Sizes */
+  _PWG_MEDIA_IN("na_index-3x5_3x5in", NULL, NULL, 3, 5),
+  _PWG_MEDIA_IN("na_personal_3.625x6.5in", NULL, "EnvPersonal", 3.625, 6.5),
+  _PWG_MEDIA_IN("na_monarch_3.875x7.5in", "monarch-envelope", "EnvMonarch", 3.875, 7.5),
+  _PWG_MEDIA_IN("na_number-9_3.875x8.875in", "na-number-9-envelope", "Env9", 3.875, 8.875),
+  _PWG_MEDIA_IN("na_index-4x6_4x6in", NULL, NULL, 4, 6),
+  _PWG_MEDIA_IN("na_number-10_4.125x9.5in", "na-number-10-envelope", "Env10", 4.125, 9.5),
+  _PWG_MEDIA_IN("na_a2_4.375x5.75in", NULL, NULL, 4.375, 5.75),
+  _PWG_MEDIA_IN("na_number-11_4.5x10.375in", NULL, "Env11", 4.5, 10.375),
+  _PWG_MEDIA_IN("na_number-12_4.75x11in", NULL, "Env12", 4.75, 11),
+  _PWG_MEDIA_IN("na_5x7_5x7in", NULL, NULL, 5, 7),
+  _PWG_MEDIA_IN("na_index-5x8_5x8in", NULL, NULL, 5, 8),
+  _PWG_MEDIA_IN("na_number-14_5x11.5in", NULL, "Env14", 5, 11.5),
+  _PWG_MEDIA_IN("na_invoice_5.5x8.5in", "invoice", "Statement", 5.5, 8.5),
+  _PWG_MEDIA_IN("na_index-4x6-ext_6x8in", NULL, NULL, 6, 8),
+  _PWG_MEDIA_IN("na_6x9_6x9in", "na-6x9-envelope", NULL, 6, 9),
+  _PWG_MEDIA_IN("na_c5_6.5x9.5in", NULL, NULL, 6.5, 9.5),
+  _PWG_MEDIA_IN("na_7x9_7x9in", "na-7x9-envelope", "7x9", 7, 9),
+  _PWG_MEDIA_IN("na_executive_7.25x10.5in", "executive", "Executive", 7.25, 10.5),
+  _PWG_MEDIA_IN("na_govt-letter_8x10in", "na-8x10", "8x10", 8, 10),
+  _PWG_MEDIA_IN("na_govt-legal_8x13in", NULL, NULL, 8, 13),
+  _PWG_MEDIA_IN("na_quarto_8.5x10.83in", "quarto", "Quarto", 8.5, 10.83),
+  _PWG_MEDIA_IN("na_letter_8.5x11in", "na-letter", "Letter", 8.5, 11),
+  _PWG_MEDIA_IN("na_fanfold-eur_8.5x12in", NULL, "FanFoldGerman", 8.5, 12),
+  _PWG_MEDIA_IN("na_letter-plus_8.5x12.69in", NULL, "LetterPlus", 8.5, 12.69),
+  _PWG_MEDIA_IN("na_foolscap_8.5x13in", NULL, "FanFoldGermanLegal", 8.5, 13),
+  _PWG_MEDIA_IN("na_legal_8.5x14in", "na-legal", "Legal", 8.5, 14),
+  _PWG_MEDIA_IN("na_super-a_8.94x14in", NULL, "SuperA", 8.94, 14),
+  _PWG_MEDIA_IN("na_9x11_9x11in", "na-9x11-envelope", "9x11", 9, 11),
+  _PWG_MEDIA_IN("na_arch-a_9x12in", "arch-a", "ARCHA", 9, 12),
+  _PWG_MEDIA_IN("na_letter-extra_9.5x12in", NULL, "LetterExtra", 9.5, 12),
+  _PWG_MEDIA_IN("na_legal-extra_9.5x15in", NULL, "LegalExtra", 9.5, 15),
+  _PWG_MEDIA_IN("na_10x11_10x11in", NULL, "10x11", 10, 11),
+  _PWG_MEDIA_IN("na_10x13_10x13in", "na-10x13-envelope", "10x13", 10, 13),
+  _PWG_MEDIA_IN("na_10x14_10x14in", "na-10x14-envelope", "10x14", 10, 14),
+  _PWG_MEDIA_IN("na_10x15_10x15in", "na-10x15-envelope", NULL, 10, 15),
+  _PWG_MEDIA_IN("na_11x12_11x12in", NULL, NULL, 11, 12),
+  _PWG_MEDIA_IN("na_edp_11x14in", NULL, NULL, 11, 14),
+  _PWG_MEDIA_IN("na_fanfold-us_11x14.875in", NULL, NULL, 11, 14.875),
+  _PWG_MEDIA_IN("na_11x15_11x15in", NULL, NULL, 11, 15),
+  _PWG_MEDIA_IN("na_ledger_11x17in", "tabloid", "Tabloid", 11, 17),
+  _PWG_MEDIA_IN("na_eur-edp_12x14in", NULL, NULL, 12, 14),
+  _PWG_MEDIA_IN("na_arch-b_12x18in", "arch-b", "ARCHB", 12, 18),
+  _PWG_MEDIA_IN("na_12x19_12x19in", NULL, NULL, 12, 19),
+  _PWG_MEDIA_IN("na_b-plus_12x19.17in", NULL, "SuperB", 12, 19.17),
+  _PWG_MEDIA_IN("na_super-b_13x19in", "super-b", NULL, 13, 19),
+  _PWG_MEDIA_IN("na_c_17x22in", "c", "AnsiC", 17, 22),
+  _PWG_MEDIA_IN("na_arch-c_18x24in", "arch-c", "ARCHC", 18, 24),
+  _PWG_MEDIA_IN("na_d_22x34in", "d", "AnsiD", 22, 34),
+  _PWG_MEDIA_IN("na_arch-d_24x36in", "arch-d", "ARCHD", 24, 36),
+  _PWG_MEDIA_IN("asme_f_28x40in", "f", NULL, 28, 40),
+  _PWG_MEDIA_IN("na_wide-format_30x42in", NULL, NULL, 30, 42),
+  _PWG_MEDIA_IN("na_e_34x44in", "e", "AnsiE", 34, 44),
+  _PWG_MEDIA_IN("na_arch-e_36x48in", "arch-e", "ARCHE", 36, 48),
+  _PWG_MEDIA_IN("na_f_44x68in", NULL, NULL, 44, 68),
+
+  /* Chinese Standard Sheet Media Inch Sizes */
+  _PWG_MEDIA_IN("roc_16k_7.75x10.75in", NULL, NULL, 7.75, 10.75),
+  _PWG_MEDIA_IN("roc_8k_10.75x15.5in", NULL, NULL, 10.75, 15.5),
+
+  /* ISO Standard Sheet Media Sizes */
+  _PWG_MEDIA_MM("iso_a10_26x37mm", "iso-a10", "A10", 26, 37),
+  _PWG_MEDIA_MM("iso_a9_37x52mm", "iso-a9", "A9", 37, 52),
+  _PWG_MEDIA_MM("iso_a8_52x74mm", "iso-a8", "A8", 52, 74),
+  _PWG_MEDIA_MM("iso_a7_74x105mm", "iso-a7", "A7", 74, 105),
+  _PWG_MEDIA_MM("iso_a6_105x148mm", "iso-a6", "A6", 105, 148),
+  _PWG_MEDIA_MM("iso_a5_148x210mm", "iso-a5", "A5", 148, 210),
+  _PWG_MEDIA_MM("iso_a5-extra_174x235mm", NULL, "A5Extra", 174, 235),
+  _PWG_MEDIA_MM("iso_a4_210x297mm", "iso-a4", "A4", 210, 297),
+  _PWG_MEDIA_MM("iso_a4-tab_225x297mm", NULL, NULL, 225, 297),
+  _PWG_MEDIA_MM("iso_a4-extra_235.5x322.3mm", NULL, "A4Extra", 235.5, 322.3),
+  _PWG_MEDIA_MM("iso_a3_297x420mm", "iso-a3", "A3", 297, 420),
+  _PWG_MEDIA_MM("iso_a4x3_297x630mm", "iso-a4x3", NULL, 297, 630),
+  _PWG_MEDIA_MM("iso_a4x4_297x841mm", "iso-a4x4", NULL, 297, 841),
+  _PWG_MEDIA_MM("iso_a4x5_297x1051mm", "iso-a4x5", NULL, 297, 1051),
+  _PWG_MEDIA_MM("iso_a4x6_297x1261mm", "iso-a4x6", NULL, 297, 1261),
+  _PWG_MEDIA_MM("iso_a4x7_297x1471mm", "iso-a4x7", NULL, 297, 1471),
+  _PWG_MEDIA_MM("iso_a4x8_297x1682mm", "iso-a4x8", NULL, 297, 1682),
+  _PWG_MEDIA_MM("iso_a4x9_297x1892mm", "iso-a4x9", NULL, 297, 1892),
+  _PWG_MEDIA_MM("iso_a3-extra_322x445mm", "iso-a3-extra", "A3Extra", 322, 445),
+  _PWG_MEDIA_MM("iso_a2_420x594mm", "iso-a2", "A2", 420, 594),
+  _PWG_MEDIA_MM("iso_a3x3_420x891mm", "iso-a3x3", NULL, 420, 891),
+  _PWG_MEDIA_MM("iso_a3x4_420x1189mm", "iso-a3x4", NULL, 420, 1189),
+  _PWG_MEDIA_MM("iso_a3x5_420x1486mm", "iso-a3x5", NULL, 420, 1486),
+  _PWG_MEDIA_MM("iso_a3x6_420x1783mm", "iso-a3x6", NULL, 420, 1783),
+  _PWG_MEDIA_MM("iso_a3x7_420x2080mm", "iso-a3x7", NULL, 420, 2080),
+  _PWG_MEDIA_MM("iso_a1_594x841mm", "iso-a1", "A1", 594, 841),
+  _PWG_MEDIA_MM("iso_a2x3_594x1261mm", "iso-a2x3", NULL, 594, 1261),
+  _PWG_MEDIA_MM("iso_a2x4_594x1682mm", "iso-a2x4", NULL, 594, 1682),
+  _PWG_MEDIA_MM("iso_a2x5_594x2102mm", "iso-a2x5", NULL, 594, 2102),
+  _PWG_MEDIA_MM("iso_a0_841x1189mm", "iso-a0", "A0", 841, 1189),
+  _PWG_MEDIA_MM("iso_a1x3_841x1783mm", "iso-a1x3", NULL, 841, 1783),
+  _PWG_MEDIA_MM("iso_a1x4_841x2378mm", "iso-a1x4", NULL, 841, 2378),
+  _PWG_MEDIA_MM("iso_2a0_1189x1682mm", NULL, NULL, 1189, 1682),
+  _PWG_MEDIA_MM("iso_a0x3_1189x2523mm", NULL, NULL, 1189, 2523),
+  _PWG_MEDIA_MM("iso_b10_31x44mm", "iso-b10", "ISOB10", 31, 44),
+  _PWG_MEDIA_MM("iso_b9_44x62mm", "iso-b9", "ISOB9", 44, 62),
+  _PWG_MEDIA_MM("iso_b8_62x88mm", "iso-b8", "ISOB8", 62, 88),
+  _PWG_MEDIA_MM("iso_b7_88x125mm", "iso-b7", "ISOB7", 88, 125),
+  _PWG_MEDIA_MM("iso_b6_125x176mm", "iso-b6", "ISOB6", 125, 176),
+  _PWG_MEDIA_MM("iso_b6c4_125x324mm", NULL, NULL, 125, 324),
+  _PWG_MEDIA_MM("iso_b5_176x250mm", "iso-b5", "ISOB5", 176, 250),
+  _PWG_MEDIA_MM("iso_b5-extra_201x276mm", NULL, "ISOB5Extra", 201, 276),
+  _PWG_MEDIA_MM("iso_b4_250x353mm", "iso-b4", "ISOB4", 250, 353),
+  _PWG_MEDIA_MM("iso_b3_353x500mm", "iso-b3", "ISOB3", 353, 500),
+  _PWG_MEDIA_MM("iso_b2_500x707mm", "iso-b2", "ISOB2", 500, 707),
+  _PWG_MEDIA_MM("iso_b1_707x1000mm", "iso-b1", "ISOB1", 707, 1000),
+  _PWG_MEDIA_MM("iso_b0_1000x1414mm", "iso-b0", "ISOB0", 1000, 1414),
+  _PWG_MEDIA_MM("iso_c10_28x40mm", "iso-c10", NULL, 28, 40),
+  _PWG_MEDIA_MM("iso_c9_40x57mm", "iso-c9", NULL, 40, 57),
+  _PWG_MEDIA_MM("iso_c8_57x81mm", "iso-c8", NULL, 57, 81),
+  _PWG_MEDIA_MM("iso_c7_81x114mm", "iso-c7", "EnvC7", 81, 114),
+  _PWG_MEDIA_MM("iso_c7c6_81x162mm", NULL, NULL, 81, 162),
+  _PWG_MEDIA_MM("iso_c6_114x162mm", "iso-c6", "EnvC6", 114, 162),
+  _PWG_MEDIA_MM("iso_c6c5_114x229mm", NULL, "EnvC65", 114, 229),
+  _PWG_MEDIA_MM("iso_c5_162x229mm", "iso-c5", "EnvC5", 162, 229),
+  _PWG_MEDIA_MM("iso_c4_229x324mm", "iso-c4", "EnvC4", 229, 324),
+  _PWG_MEDIA_MM("iso_c3_324x458mm", "iso-c3", "EnvC3", 324, 458),
+  _PWG_MEDIA_MM("iso_c2_458x648mm", "iso-c2", "EnvC2", 458, 648),
+  _PWG_MEDIA_MM("iso_c1_648x917mm", "iso-c1", "EnvC1", 648, 917),
+  _PWG_MEDIA_MM("iso_c0_917x1297mm", "iso-c0", "EnvC0", 917, 1297),
+  _PWG_MEDIA_MM("iso_dl_110x220mm", "iso-designated", "EnvDL", 110, 220),
+  _PWG_MEDIA_MM("iso_ra2_430x610mm", "iso-ra2", NULL, 430, 610),
+  _PWG_MEDIA_MM("iso_sra2_450x640mm", "iso-sra2", NULL, 450, 640),
+  _PWG_MEDIA_MM("iso_ra1_610x860mm", "iso-ra1", NULL, 610, 860),
+  _PWG_MEDIA_MM("iso_sra1_640x900mm", "iso-sra1", NULL, 640, 900),
+  _PWG_MEDIA_MM("iso_ra0_860x1220mm", "iso-ra0", NULL, 860, 1220),
+  _PWG_MEDIA_MM("iso_sra0_900x1280mm", "iso-sra0", NULL, 900, 1280),
+
+  /* Japanese Standard Sheet Media Sizes */
+  _PWG_MEDIA_MM("jis_b10_32x45mm", "jis-b10", "B10", 32, 45),
+  _PWG_MEDIA_MM("jis_b9_45x64mm", "jis-b9", "B9", 45, 64),
+  _PWG_MEDIA_MM("jis_b8_64x91mm", "jis-b8", "B8", 64, 91),
+  _PWG_MEDIA_MM("jis_b7_91x128mm", "jis-b7", "B7", 91, 128),
+  _PWG_MEDIA_MM("jis_b6_128x182mm", "jis-b6", "B6", 128, 182),
+  _PWG_MEDIA_MM("jis_b5_182x257mm", "jis-b5", "B5", 182, 257),
+  _PWG_MEDIA_MM("jis_b4_257x364mm", "jis-b4", "B4", 257, 364),
+  _PWG_MEDIA_MM("jis_b3_364x515mm", "jis-b3", "B3", 364, 515),
+  _PWG_MEDIA_MM("jis_b2_515x728mm", "jis-b2", "B2", 515, 728),
+  _PWG_MEDIA_MM("jis_b1_728x1030mm", "jis-b1", "B1", 728, 1030),
+  _PWG_MEDIA_MM("jis_b0_1030x1456mm", "jis-b0", "B0", 1030, 1456),
+  _PWG_MEDIA_MM("jis_exec_216x330mm", NULL, NULL, 216, 330),
+  _PWG_MEDIA_MM("jpn_chou4_90x205mm", NULL, "EnvChou4", 90, 205),
+  _PWG_MEDIA_MM("jpn_hagaki_100x148mm", NULL, "Postcard", 100, 148),
+  _PWG_MEDIA_MM("jpn_you4_105x235mm", NULL, "EnvYou4", 105, 235),
+  _PWG_MEDIA_MM("jpn_chou2_111.1x146mm", NULL, NULL, 111.1, 146),
+  _PWG_MEDIA_MM("jpn_chou3_120x235mm", NULL, "EnvChou3", 120, 235),
+  _PWG_MEDIA_MM("jpn_oufuku_148x200mm", NULL, "DoublePostcardRotated", 148, 200),
+  _PWG_MEDIA_MM("jpn_kahu_240x322.1mm", NULL, NULL, 240, 322.1),
+  _PWG_MEDIA_MM("jpn_kaku2_240x332mm", NULL, "EnvKaku2", 240, 332),
+
+  /* Chinese Standard Sheet Media Sizes */
+  _PWG_MEDIA_MM("prc_32k_97x151mm", NULL, "PRC32K", 97, 151),
+  _PWG_MEDIA_MM("prc_1_102x165mm", NULL, "EnvPRC1", 102, 165),
+  _PWG_MEDIA_MM("prc_2_102x176mm", NULL, "EnvPRC2", 102, 176),
+  _PWG_MEDIA_MM("prc_4_110x208mm", NULL, "EnvPRC4", 110, 208),
+  _PWG_MEDIA_MM("prc_5_110x220mm", NULL, "EnvPRC5", 110, 220),
+  _PWG_MEDIA_MM("prc_8_120x309mm", NULL, "EnvPRC8", 120, 309),
+  _PWG_MEDIA_MM("prc_6_120x320mm", NULL, NULL, 120, 320),
+  _PWG_MEDIA_MM("prc_3_125x176mm", NULL, "EnvPRC3", 125, 176),
+  _PWG_MEDIA_MM("prc_16k_146x215mm", NULL, "PRC16K", 146, 215),
+  _PWG_MEDIA_MM("prc_7_160x230mm", NULL, "EnvPRC7", 160, 230),
+  _PWG_MEDIA_MM("om_juuro-ku-kai_198x275mm", NULL, NULL, 198, 275),
+  _PWG_MEDIA_MM("om_pa-kai_267x389mm", NULL, NULL, 267, 389),
+  _PWG_MEDIA_MM("om_dai-pa-kai_275x395mm", NULL, NULL, 275, 395),
+  _PWG_MEDIA_MM("prc_10_324x458mm", NULL, "EnvPRC10", 324, 458),
+
+  /* Other Metric Standard Sheet Media Sizes */
+  _PWG_MEDIA_MM("om_small-photo_100x150mm", NULL, NULL, 100, 150),
+  _PWG_MEDIA_MM("om_italian_110x230mm", NULL, "EnvItalian", 110, 230),
+  _PWG_MEDIA_MM("om_postfix_114x229mm", NULL, NULL, 114, 229),
+  _PWG_MEDIA_MM("om_large-photo_200x300", NULL, NULL, 200, 300),
+  _PWG_MEDIA_MM("om_folio_210x330mm", "folio", "Folio", 210, 330),
+  _PWG_MEDIA_MM("om_folio-sp_215x315mm", NULL, NULL, 215, 315),
+  _PWG_MEDIA_MM("om_invite_220x220mm", NULL, "EnvInvite", 220, 220)
+};
+
+
+/*
+ * '_pwgGenerateSize()' - Generate a PWG size keyword.
+ */
+
+void
+_pwgGenerateSize(char       *keyword,	/* I - Keyword buffer */
+                 size_t     keysize,	/* I - Size of keyword buffer */
+		 const char *prefix,	/* I - Prefix for PWG size or NULL */
+		 const char *name,	/* I - Size name or NULL */
+		 int        width,	/* I - Width of page in 2540ths */
+		 int        length)	/* I - Length of page in 2540ths */
+{
+  struct lconv	*loc;			/* Locale conversion data */
+  double	uwidth,			/* Width in inches or millimeters */
+		ulength;		/* Height in inches or millimeters */
+  const char	*units;			/* Units to report */
+  char		usize[12 + 1 + 12 + 3],	/* Unit size: NNNNNNNNNNNNxNNNNNNNNNNNNuu */
+		*uptr;			/* Pointer into unit size */
+
+
+  loc = localeconv();
+
+  if ((width % 635) == 0 && (length % 635) == 0)
+  {
+   /*
+    * Use inches since the size is a multiple of 1/4 inch.
+    */
+
+    uwidth  = width / 2540.0;
+    ulength = length / 2540.0;
+    units   = "in";
+
+    if (!prefix)
+      prefix = "oe";
+  }
+  else
+  {
+   /*
+    * Use millimeters since the size is not a multiple of 1/4 inch.
+    */
+
+    uwidth  = width * 0.01;
+    ulength = length * 0.01;
+    units   = "mm";
+
+    if (!prefix)
+      prefix = "om";
+  }
+
+  uptr = usize;
+  _cupsStrFormatd(uptr, uptr + 12, uwidth, loc);
+  uptr += strlen(uptr);
+  *uptr++ = 'x';
+  _cupsStrFormatd(uptr, uptr + 12, ulength, loc);
+  uptr += strlen(uptr);
+
+ /*
+  * Safe because usize can hold up to 12 + 1 + 12 + 4 bytes.
+  */
+
+  strcpy(uptr, units);
+
+  if (!name)
+    name = usize;
+
+ /*
+  * Format the name...
+  */
+
+  snprintf(keyword, keysize, "%s_%s_%s", prefix, name, usize);
+}
+
+
+/*
+ * '_pwgInitSize()' - Initialize a PWG size using IPP job template attributes.
+ */
+
+int					/* O - 1 if size was initialize, 0 otherwise */
+_pwgInitSize(_pwg_size_t *size,		/* I - Size to initialize */
+             ipp_t       *job,		/* I - Job template attributes */
+	     int         *margins_set)	/* O - 1 if margins were set, 0 otherwise */
+{
+  ipp_attribute_t *media,		/* media attribute */
+		*media_bottom_margin,	/* media-bottom-margin member attribute */
+		*media_col,		/* media-col attribute */
+		*media_left_margin,	/* media-left-margin member attribute */
+		*media_right_margin,	/* media-right-margin member attribute */
+		*media_size,		/* media-size member attribute */
+		*media_top_margin,	/* media-top-margin member attribute */
+		*x_dimension,		/* x-dimension member attribute */
+		*y_dimension;		/* y-dimension member attribute */
+  _pwg_media_t	*pwg;			/* PWG media value */
+
+
+ /*
+  * Range check input...
+  */
+
+  if (!size || !job || !margins_set)
+    return (0);
+
+ /*
+  * Look for media-col and then media...
+  */
+
+  memset(size, 0, sizeof(_pwg_size_t));
+  *margins_set = 0;
+
+  if ((media_col = ippFindAttribute(job, "media-col",
+                                    IPP_TAG_BEGIN_COLLECTION)) != NULL)
+  {
+   /*
+    * Got media-col, look for media-size member attribute...
+    */
+
+    if ((media_size = ippFindAttribute(media_col->values[0].collection,
+                                            "media-size",
+					    IPP_TAG_BEGIN_COLLECTION)) != NULL)
+    {
+     /*
+      * Got media-size, look for x-dimension and y-dimension member
+      * attributes...
+      */
+
+      x_dimension = ippFindAttribute(media_size->values[0].collection,
+				     "x-dimension", IPP_TAG_INTEGER);
+      y_dimension = ippFindAttribute(media_size->values[0].collection,
+                                     "y-dimension", IPP_TAG_INTEGER);
+
+      if (x_dimension && y_dimension)
+      {
+        size->width  = x_dimension->values[0].integer;
+	size->length = y_dimension->values[0].integer;
+      }
+      else if (!x_dimension)
+      {
+	_cupsSetError(IPP_INTERNAL_ERROR,
+		      _("Missing x-dimension in media-size."), 1);
+        return (0);
+      }
+      else if (!y_dimension)
+      {
+	_cupsSetError(IPP_INTERNAL_ERROR,
+		      _("Missing y-dimension in media-size."), 1);
+        return (0);
+      }
+    }
+    else
+    {
+      _cupsSetError(IPP_INTERNAL_ERROR, _("Missing media-size in media-col."),
+                    1);
+      return (0);
+    }
+
+    /* media-*-margin */
+    media_bottom_margin = ippFindAttribute(media_col->values[0].collection,
+					   "media-bottom-margin",
+					   IPP_TAG_INTEGER);
+    media_left_margin   = ippFindAttribute(media_col->values[0].collection,
+					   "media-left-margin",
+					   IPP_TAG_INTEGER);
+    media_right_margin  = ippFindAttribute(media_col->values[0].collection,
+					   "media-right-margin",
+					   IPP_TAG_INTEGER);
+    media_top_margin    = ippFindAttribute(media_col->values[0].collection,
+					   "media-top-margin",
+					   IPP_TAG_INTEGER);
+    if (media_bottom_margin && media_left_margin && media_right_margin &&
+        media_top_margin)
+    {
+      *margins_set = 1;
+      size->bottom = media_bottom_margin->values[0].integer;
+      size->left   = media_left_margin->values[0].integer;
+      size->right  = media_right_margin->values[0].integer;
+      size->top    = media_top_margin->values[0].integer;
+    }
+  }
+  else
+  {
+    if ((media = ippFindAttribute(job, "media", IPP_TAG_NAME)) == NULL)
+      media = ippFindAttribute(job, "media", IPP_TAG_KEYWORD);
+
+    if (media)
+    {
+      if ((pwg = _pwgMediaForPWG(media->values[0].string.text)) == NULL)
+	pwg = _pwgMediaForLegacy(media->values[0].string.text);
+
+      if (pwg)
+      {
+        size->width  = pwg->width;
+	size->length = pwg->length;
+      }
+      else
+      {
+        _cupsSetError(IPP_INTERNAL_ERROR, _("Unsupported media value."), 1);
+	return (0);
+      }
+    }
+    else
+    {
+      _cupsSetError(IPP_INTERNAL_ERROR, _("Missing media or media-col."), 1);
+      return (0);
+    }
+  }
+
+  return (1);
+}
+
+
+/*
+ * '_pwgMediaForLegacy()' - Find a PWG media size by ISO/IPP legacy name.
+ */
+
+_pwg_media_t *				/* O - Matching size or NULL */
+_pwgMediaForLegacy(
+    const char *legacy)			/* I - Legacy size name */
+{
+  _pwg_media_t	key;			/* Search key */
+  _cups_globals_t *cg = _cupsGlobals();	/* Global data */
+
+
+ /*
+  * Range check input...
+  */
+
+  if (!legacy)
+    return (NULL);
+
+ /*
+  * Build the lookup table for PWG names as needed...
+  */
+
+  if (!cg->leg_size_lut)
+  {
+    int			i;		/* Looping var */
+    _pwg_media_t	*size;		/* Current size */
+
+    cg->leg_size_lut = cupsArrayNew((cups_array_func_t)pwg_compare_legacy,
+                                    NULL);
+
+    for (i = (int)(sizeof(cups_pwg_media) / sizeof(cups_pwg_media[0])),
+             size = (_pwg_media_t *)cups_pwg_media;
+	 i > 0;
+	 i --, size ++)
+      if (size->legacy)
+	cupsArrayAdd(cg->leg_size_lut, size);
+  }
+
+ /*
+  * Lookup the name...
+  */
+
+  key.legacy = legacy;
+  return ((_pwg_media_t *)cupsArrayFind(cg->leg_size_lut, &key));
+}
+
+
+/*
+ * '_pwgMediaForPPD()' - Find a PWG media size by Adobe PPD name.
+ */
+
+_pwg_media_t *				/* O - Matching size or NULL */
+_pwgMediaForPPD(const char *ppd)	/* I - PPD size name */
+{
+  _pwg_media_t	key;			/* Search key */
+  _cups_globals_t *cg = _cupsGlobals();	/* Global data */
+
+
+ /*
+  * Range check input...
+  */
+
+  if (!ppd)
+    return (NULL);
+
+ /*
+  * Build the lookup table for PWG names as needed...
+  */
+
+  if (!cg->ppd_size_lut)
+  {
+    int			i;		/* Looping var */
+    _pwg_media_t	*size;		/* Current size */
+
+    cg->ppd_size_lut = cupsArrayNew((cups_array_func_t)pwg_compare_ppd, NULL);
+
+    for (i = (int)(sizeof(cups_pwg_media) / sizeof(cups_pwg_media[0])),
+             size = (_pwg_media_t *)cups_pwg_media;
+	 i > 0;
+	 i --, size ++)
+      if (size->ppd)
+        cupsArrayAdd(cg->ppd_size_lut, size);
+  }
+
+ /*
+  * Lookup the name...
+  */
+
+  key.ppd = ppd;
+  return ((_pwg_media_t *)cupsArrayFind(cg->ppd_size_lut, &key));
+}
+
+
+/*
+ * '_pwgMediaForPWG()' - Find a PWG media size by 5101.1 self-describing name.
+ */
+
+_pwg_media_t *				/* O - Matching size or NULL */
+_pwgMediaForPWG(const char *pwg)	/* I - PWG size name */
+{
+  _pwg_media_t	key;			/* Search key */
+  _cups_globals_t *cg = _cupsGlobals();	/* Global data */
+
+
+ /*
+  * Range check input...
+  */
+
+  if (!pwg)
+    return (NULL);
+
+ /*
+  * Build the lookup table for PWG names as needed...
+  */
+
+  if (!cg->pwg_size_lut)
+  {
+    int			i;		/* Looping var */
+    _pwg_media_t	*size;		/* Current size */
+
+    cg->pwg_size_lut = cupsArrayNew((cups_array_func_t)pwg_compare_pwg, NULL);
+
+    for (i = (int)(sizeof(cups_pwg_media) / sizeof(cups_pwg_media[0])),
+             size = (_pwg_media_t *)cups_pwg_media;
+	 i > 0;
+	 i --, size ++)
+      cupsArrayAdd(cg->pwg_size_lut, size);
+  }
+
+ /*
+  * Lookup the name...
+  */
+
+  key.pwg = pwg;
+  return ((_pwg_media_t *)cupsArrayFind(cg->pwg_size_lut, &key));
+}
+
+
+/*
+ * '_pwgMediaForSize()' - Get the PWG media name for a given size.
+ */
+
+_pwg_media_t *				/* O - PWG media name */
+_pwgMediaForSize(int width,		/* I - Width in 2540ths */
+		 int length)		/* I - Length in 2540ths */
+{
+  int		i;			/* Looping var */
+  _pwg_media_t	*media;			/* Current media */
+  int		dw, dl;			/* Difference in width and length */
+  _cups_globals_t *cg = _cupsGlobals();	/* Global data */
+
+
+ /*
+  * Range check input...
+  */
+
+  if (width <= 0 || length <= 0)
+    return (NULL);
+
+ /*
+  * Look for a standard size...
+  */
+
+  for (i = (int)(sizeof(cups_pwg_media) / sizeof(cups_pwg_media[0])),
+	   media = (_pwg_media_t *)cups_pwg_media;
+       i > 0;
+       i --, media ++)
+  {
+   /*
+    * Adobe uses a size matching algorithm with an epsilon of 5 points, which
+    * is just about 176/2540ths...
+    */
+
+    dw = media->width - width;
+    dl = media->length - length;
+
+    if (dw > -176 && dw < 176 && dl > -176 && dl < 176)
+      return (media);
+  }
+
+ /*
+  * Not a standard size; convert it to a PWG custom name of the form:
+  *
+  *     custom_WIDTHxHEIGHTuu_WIDTHxHEIGHTuu
+  */
+
+  _pwgGenerateSize(cg->pwg_name, sizeof(cg->pwg_name), "custom", NULL, width,
+                   length);
+
+  cg->pwg_media.pwg    = cg->pwg_name;
+  cg->pwg_media.width  = width;
+  cg->pwg_media.length = length;
+
+  return (&(cg->pwg_media));
+}
+
+
+/*
+ * 'pwg_compare_legacy()' - Compare two sizes using the legacy names.
+ */
+
+static int				/* O - Result of comparison */
+pwg_compare_legacy(_pwg_media_t *a,	/* I - First size */
+                   _pwg_media_t *b)	/* I - Second size */
+{
+  return (strcmp(a->legacy, b->legacy));
+}
+
+
+/*
+ * 'pwg_compare_ppd()' - Compare two sizes using the PPD names.
+ */
+
+static int				/* O - Result of comparison */
+pwg_compare_ppd(_pwg_media_t *a,	/* I - First size */
+                _pwg_media_t *b)	/* I - Second size */
+{
+  return (strcmp(a->ppd, b->ppd));
+}
+
+
+/*
+ * 'pwg_compare_pwg()' - Compare two sizes using the PWG names.
+ */
+
+static int				/* O - Result of comparison */
+pwg_compare_pwg(_pwg_media_t *a,	/* I - First size */
+                _pwg_media_t *b)	/* I - Second size */
+{
+  return (strcmp(a->pwg, b->pwg));
+}
+
+
+/*
+ * End of "$Id$".
+ */
@@ -0,0 +1,143 @@
+/*
+ * "$Id$"
+ *
+ *   Private PWG media API definitions for CUPS.
+ *
+ *   Copyright 2009-2010 by Apple Inc.
+ *
+ *   These coded instructions, statements, and computer programs are the
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
+ *
+ *   This file is subject to the Apple OS-Developed Software exception.
+ */
+
+#ifndef _CUPS_PWG_PRIVATE_H_
+#  define _CUPS_PWG_PRIVATE_H_
+
+
+/*
+ * Include necessary headers...
+ */
+
+#  include <cups/cups.h>
+
+
+/*
+ * C++ magic...
+ */
+
+#  ifdef __cplusplus
+extern "C" {
+#  endif /* __cplusplus */
+
+
+/*
+ * Macros...
+ */
+
+/* Convert from points to 2540ths */
+#  define _PWG_FROMPTS(n)	(int)((n) * 2540 / 72)
+/* Convert from 2540ths to points */
+#  define _PWG_TOPTS(n)		((n) * 72.0 / 2540.0)
+
+
+/*
+ * Types and structures...
+ */
+
+typedef struct _pwg_media_s		/**** Common media size data ****/
+{
+  const char	*pwg,			/* PWG 5101.1 "self describing" name */
+		*legacy,		/* IPP/ISO legacy name */
+		*ppd;			/* Standard Adobe PPD name */
+  int		width,			/* Width in 2540ths */
+		length;			/* Length in 2540ths */
+} _pwg_media_t;
+
+typedef struct _pwg_map_s		/**** Map element - PPD to/from PWG */
+{
+  char		*pwg,			/* PWG media keyword */
+		*ppd;			/* PPD option keyword */
+} _pwg_map_t;
+
+typedef struct _pwg_size_s		/**** Size element - PPD to/from PWG */
+{
+  _pwg_map_t	map;			/* Map element */
+  int		width,			/* Width in 2540ths */
+		length,			/* Length in 2540ths */
+		left,			/* Left margin in 2540ths */
+		bottom,			/* Bottom margin in 2540ths */
+		right,			/* Right margin in 2540ths */
+		top;			/* Top margin in 2540ths */
+} _pwg_size_t;
+
+typedef struct _pwg_s			/**** PWG-PPD conversion data ****/
+{
+  int		num_bins;		/* Number of output bins */
+  _pwg_map_t	*bins;			/* Output bins */
+  int		num_sizes;		/* Number of media sizes */
+  _pwg_size_t	*sizes;			/* Media sizes */
+  int		custom_max_width,	/* Maximum custom width in 2540ths */
+		custom_max_length,	/* Maximum custom length in 2540ths */
+		custom_min_width,	/* Minimum custom width in 2540ths */
+		custom_min_length;	/* Minimum custom length in 2540ths */
+  char		*custom_max_keyword,	/* Maximum custom size PWG keyword */
+		*custom_min_keyword,	/* Minimum custom size PWG keyword */
+		custom_ppd_size[41];	/* Custom PPD size name */
+  _pwg_size_t	custom_size;		/* Custom size record */
+  int		num_sources;		/* Number of media sources */
+  _pwg_map_t	*sources;		/* Media sources */
+  int		num_types;		/* Number of media types */
+  _pwg_map_t	*types;			/* Media types */
+} _pwg_t;
+
+
+/*
+ * Functions...
+ */
+
+extern _pwg_t		*_pwgCreateWithFile(const char *filename);
+extern _pwg_t		*_pwgCreateWithPPD(ppd_file_t *ppd);
+extern void		_pwgDestroy(_pwg_t *pwg);
+extern void		_pwgGenerateSize(char *keyword, size_t keysize,
+				         const char *prefix,
+					 const char *ppdname,
+					 int width, int length);
+extern const char	*_pwgGetBin(_pwg_t *pwg, const char *output_bin);
+extern const char	*_pwgGetInputSlot(_pwg_t *pwg, ipp_t *job,
+			                  const char *keyword);
+extern const char	*_pwgGetMediaType(_pwg_t *pwg, ipp_t *job,
+			                  const char *keyword);
+extern const char	*_pwgGetOutputBin(_pwg_t *pwg, const char *keyword);
+extern const char	*_pwgGetPageSize(_pwg_t *pwg, ipp_t *job,
+			                 const char *keyword, int *exact);
+extern _pwg_size_t	*_pwgGetSize(_pwg_t *pwg, const char *page_size);
+extern const char	*_pwgGetSource(_pwg_t *pwg, const char *input_slot);
+extern const char	*_pwgGetType(_pwg_t *pwg, const char *media_type);
+extern int		_pwgInitSize(_pwg_size_t *size, ipp_t *job,
+				     int *margins_set);
+extern const char	*_pwgInputSlotForSource(const char *media_source,
+			                        char *name, size_t namesize);
+extern _pwg_media_t	*_pwgMediaForLegacy(const char *legacy);
+extern _pwg_media_t	*_pwgMediaForPPD(const char *ppd);
+extern _pwg_media_t	*_pwgMediaForPWG(const char *pwg);
+extern _pwg_media_t	*_pwgMediaForSize(int width, int length);
+extern const char	*_pwgMediaTypeForType(const char *media_source,
+			                      char *name, size_t namesize);
+extern const char	*_pwgPageSizeForMedia(_pwg_media_t *media,
+			                      char *name, size_t namesize);
+extern int		_pwgWriteFile(_pwg_t *pwg, const char *filename);
+
+
+#  ifdef __cplusplus
+}
+#  endif /* __cplusplus */
+
+#endif /* !_CUPS_PWG_PRIVATE_H_ */
+
+/*
+ * End of "$Id$".
+ */
@@ -1,376 +0,0 @@
-/*
- * "$Id$"
- *
- *   PWG media name API implementation for the Common UNIX Printing System
- *   (CUPS).
- *
- *   Copyright 2009 by Apple Inc.
- *
- *   These coded instructions, statements, and computer programs are the
- *   property of Apple Inc. and are protected by Federal copyright
- *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
- *   which should have been included with this file.  If this file is
- *   file is missing or damaged, see the license at "http://www.cups.org/".
- *
- * Contents:
- *
- *   _cupsPWGMediaByLegacy() - Find a PWG media size by ISO/IPP legacy name.
- *   _cupsPWGMediaByName()   - Find a PWG media size by 5101.1 self-describing
- *                             name.
- *   _cupsPWGMediaBySize()   - Find a PWG media size by size in points.
- *   compare_legacy()        - Compare two sizes using the legacy names.
- *   compare_pwg()           - Compare two sizes using the PWG names.
- */
-
-/*
- * Include necessary headers...
- */
-
-#include "pwgmedia.h"
-#include "globals.h"
-#include "string.h"
-#include "debug.h"
-#include <math.h>
-
-
-/*
- * Local macros...
- */
-
-#define _CUPS_SIZE_IN(p,l,x,y)	{p, l, x * 72.0, y * 72.0}
-#define _CUPS_SIZE_MM(p,l,x,y)	{p, l, x / 25.4 * 72.0, y / 25.4 * 72.0}
-
-
-/*
- * Local functions...
- */
-
-static int	compare_legacy(_cups_pwg_media_t *a, _cups_pwg_media_t *b);
-static int	compare_pwg(_cups_pwg_media_t *a, _cups_pwg_media_t *b);
-
-
-/*
- * Local globals...
- */
-
-static _cups_pwg_media_t const cups_pwg_media[] =
-{					/* Media size lookup table */
-  /* North American Standard Sheet Media Sizes */
-  _CUPS_SIZE_IN("na_index-3x5_3x5in", NULL, 3, 5),
-  _CUPS_SIZE_IN("na_personal_3.625x6.5in", NULL, 3.625, 6.5),
-  _CUPS_SIZE_IN("na_monarch_3.875x7.5in", "monarch-envelope", 3.875, 7.5),
-  _CUPS_SIZE_IN("na_number-9_3.875x8.875in", "na-number-9-envelope", 3.875, 8.875),
-  _CUPS_SIZE_IN("na_index-4x6_4x6in", NULL, 4, 6),
-  _CUPS_SIZE_IN("na_number-10_4.125x9.5in", "na-number-10-envelope", 4.125, 9.5),
-  _CUPS_SIZE_IN("na_a2_4.375x5.75in", NULL, 4.375, 5.75),
-  _CUPS_SIZE_IN("na_number-11_4.5x10.375in", NULL, 4.5, 10.375),
-  _CUPS_SIZE_IN("na_number-12_4.75x11in", NULL, 4.75, 11),
-  _CUPS_SIZE_IN("na_5x7_5x7in", NULL, 5, 7),
-  _CUPS_SIZE_IN("na_index-5x8_5x8in", NULL, 5, 8),
-  _CUPS_SIZE_IN("na_number-14_5x11.5in", NULL, 5, 11.5),
-  _CUPS_SIZE_IN("na_invoice_5.5x8.5in", "invoice", 5.5, 8.5),
-  _CUPS_SIZE_IN("na_index-4x6-ext_6x8in", NULL, 6, 8),
-  _CUPS_SIZE_IN("na_6x9_6x9in", "na-6x9-envelope", 6, 9),
-  _CUPS_SIZE_IN("na_c5_6.5x9.5in", NULL, 6.5, 9.5),
-  _CUPS_SIZE_IN("na_7x9_7x9in", "na-7x9-envelope", 7, 9),
-  _CUPS_SIZE_IN("na_executive_7.25x10.5in", "executive", 7.25, 10.5),
-  _CUPS_SIZE_IN("na_govt-letter_8x10in", "na-8x10", 8, 10),
-  _CUPS_SIZE_IN("na_govt-legal_8x13in", NULL, 8, 13),
-  _CUPS_SIZE_IN("na_quarto_8.5x10.83in", "quarto", 8.5, 10.83),
-  _CUPS_SIZE_IN("na_letter_8.5x11in", "na-letter", 8.5, 11),
-  _CUPS_SIZE_IN("na_fanfold-eur_8.5x12in", NULL, 8.5, 12),
-  _CUPS_SIZE_IN("na_letter-plus_8.5x12.69in", NULL, 8.5, 12.69),
-  _CUPS_SIZE_IN("na_foolscap_8.5x13in", NULL, 8.5, 13),
-  _CUPS_SIZE_IN("na_legal_8.5x14in", "na-legal", 8.5, 14),
-  _CUPS_SIZE_IN("na_super-a_8.94x14in", NULL, 8.94, 14),
-  _CUPS_SIZE_IN("na_9x11_9x11in", "na-9x11-envelope", 9, 11),
-  _CUPS_SIZE_IN("na_arch-a_9x12in", "arch-a", 9, 12),
-  _CUPS_SIZE_IN("na_letter-extra_9.5x12in", NULL, 9.5, 12),
-  _CUPS_SIZE_IN("na_legal-extra_9.5x15in", NULL, 9.5, 15),
-  _CUPS_SIZE_IN("na_10x11_10x11in", NULL, 10, 11),
-  _CUPS_SIZE_IN("na_10x13_10x13in", "na-10x13-envelope", 10, 13),
-  _CUPS_SIZE_IN("na_10x14_10x14in", "na-10x14-envelope", 10, 14),
-  _CUPS_SIZE_IN("na_10x15_10x15in", "na-10x15-envelope", 10, 15),
-  _CUPS_SIZE_IN("na_11x12_11x12in", NULL, 11, 12),
-  _CUPS_SIZE_IN("na_edp_11x14in", NULL, 11, 14),
-  _CUPS_SIZE_IN("na_fanfold-us_11x14.875in", NULL, 11, 14.875),
-  _CUPS_SIZE_IN("na_11x15_11x15in", NULL, 11, 15),
-  _CUPS_SIZE_IN("na_ledger_11x17in", "tabloid", 11, 17),
-  _CUPS_SIZE_IN("na_eur-edp_12x14in", NULL, 12, 14),
-  _CUPS_SIZE_IN("na_arch-b_12x18in", "arch-b", 12, 18),
-  _CUPS_SIZE_IN("na_12x19_12x19in", NULL, 12, 19),
-  _CUPS_SIZE_IN("na_b-plus_12x19.17in", NULL, 12, 19.17),
-  _CUPS_SIZE_IN("na_super-b_13x19in", NULL, 13, 19),
-  _CUPS_SIZE_IN("na_c_17x22in", "c", 17, 22),
-  _CUPS_SIZE_IN("na_arch-c_18x24in", "arch-c", 18, 24),
-  _CUPS_SIZE_IN("na_d_22x34in", "d", 22, 34),
-  _CUPS_SIZE_IN("na_arch-d_24x36in", "arch-d", 24, 36),
-  _CUPS_SIZE_IN("asme_f_28x40in", "f", 28, 40),
-  _CUPS_SIZE_IN("na_wide-format_30x42in", NULL, 30, 42),
-  _CUPS_SIZE_IN("na_e_34x44in", "e", 34, 44),
-  _CUPS_SIZE_IN("na_arch-e_36x48in", "arch-e", 36, 48),
-  _CUPS_SIZE_IN("na_f_44x68in", NULL, 44, 68),
-
-  /* Chinese Standard Sheet Media Inch Sizes */
-  _CUPS_SIZE_IN("roc_16k_7.75x10.75in", NULL, 7.75, 10.75),
-  _CUPS_SIZE_IN("roc_8k_10.75x15.5in", NULL, 10.75, 15.5),
-
-  /* ISO Standard Sheet Media Sizes */
-  _CUPS_SIZE_MM("iso_a10_26x37mm", "iso-a10", 26, 37),
-  _CUPS_SIZE_MM("iso_a9_37x52mm", "iso-a9", 37, 52),
-  _CUPS_SIZE_MM("iso_a8_52x74mm", "iso-a8", 52, 74),
-  _CUPS_SIZE_MM("iso_a7_74x105mm", "iso-a7", 74, 105),
-  _CUPS_SIZE_MM("iso_a6_105x148mm", "iso-a6", 105, 148),
-  _CUPS_SIZE_MM("iso_a5_148x210mm", "iso-a5", 148, 210),
-  _CUPS_SIZE_MM("iso_a5-extra_174x235mm", NULL, 174, 235),
-  _CUPS_SIZE_MM("iso_a4_210x297mm", "iso-a4", 210, 297),
-  _CUPS_SIZE_MM("iso_a4-tab_225x297mm", NULL, 225, 297),
-  _CUPS_SIZE_MM("iso_a4-extra_235.5x322.3mm", NULL, 235.5, 322.3),
-  _CUPS_SIZE_MM("iso_a3_297x420mm", "iso-a3", 297, 420),
-  _CUPS_SIZE_MM("iso_a4x3_297x630mm", "iso-a4x3", 297, 630),
-  _CUPS_SIZE_MM("iso_a4x4_297x841mm", "iso-a4x4", 297, 841),
-  _CUPS_SIZE_MM("iso_a4x5_297x1051mm", "iso-a4x5", 297, 1051),
-  _CUPS_SIZE_MM("iso_a4x6_297x1261mm", "iso-a4x6", 297, 1261),
-  _CUPS_SIZE_MM("iso_a4x7_297x1471mm", "iso-a4x7", 297, 1471),
-  _CUPS_SIZE_MM("iso_a4x8_297x1682mm", "iso-a4x8", 297, 1682),
-  _CUPS_SIZE_MM("iso_a4x9_297x1892mm", "iso-a4x9", 297, 1892),
-  _CUPS_SIZE_MM("iso_a3-extra_322x445mm", "iso-a3-extra", 322, 445),
-  _CUPS_SIZE_MM("iso_a2_420x594mm", "iso-a2", 420, 594),
-  _CUPS_SIZE_MM("iso_a3x3_420x891mm", "iso-a3x3", 420, 891),
-  _CUPS_SIZE_MM("iso_a3x4_420x1189mm", "iso-a3x4", 420, 1189),
-  _CUPS_SIZE_MM("iso_a3x5_420x1486mm", "iso-a3x5", 420, 1486),
-  _CUPS_SIZE_MM("iso_a3x6_420x1783mm", "iso-a3x6", 420, 1783),
-  _CUPS_SIZE_MM("iso_a3x7_420x2080mm", "iso-a3x7", 420, 2080),
-  _CUPS_SIZE_MM("iso_a1_594x841mm", "iso-a1", 594, 841),
-  _CUPS_SIZE_MM("iso_a2x3_594x1261mm", "iso-a2x3", 594, 1261),
-  _CUPS_SIZE_MM("iso_a2x4_594x1682mm", "iso-a2x4", 594, 1682),
-  _CUPS_SIZE_MM("iso_a2x5_594x2102mm", "iso-a2x5", 594, 2102),
-  _CUPS_SIZE_MM("iso_a0_841x1189mm", "iso-a0", 841, 1189),
-  _CUPS_SIZE_MM("iso_a1x3_841x1783mm", "iso-a1x3", 841, 1783),
-  _CUPS_SIZE_MM("iso_a1x4_841x2378mm", "iso-a1x4", 841, 2378),
-  _CUPS_SIZE_MM("iso_2a0_1189x1682mm", NULL, 1189, 1682),
-  _CUPS_SIZE_MM("iso_a0x3_1189x2523mm", NULL, 1189, 2523),
-  _CUPS_SIZE_MM("iso_b10_31x44mm", "iso-b10", 31, 44),
-  _CUPS_SIZE_MM("iso_b9_44x62mm", "iso-b9", 44, 62),
-  _CUPS_SIZE_MM("iso_b8_62x88mm", "iso-b8", 62, 88),
-  _CUPS_SIZE_MM("iso_b7_88x125mm", "iso-b7", 88, 125),
-  _CUPS_SIZE_MM("iso_b6_125x176mm", "iso-b6", 125, 176),
-  _CUPS_SIZE_MM("iso_b6c4_125x324mm", NULL, 125, 324),
-  _CUPS_SIZE_MM("iso_b5_176x250mm", "iso-b5", 176, 250),
-  _CUPS_SIZE_MM("iso_b5-extra_201x276mm", NULL, 201, 276),
-  _CUPS_SIZE_MM("iso_b4_250x353mm", "iso-b4", 250, 353),
-  _CUPS_SIZE_MM("iso_b3_353x500mm", "iso-b3", 353, 500),
-  _CUPS_SIZE_MM("iso_b2_500x707mm", "iso-b2", 500, 707),
-  _CUPS_SIZE_MM("iso_b1_707x1000mm", "iso-b1", 707, 1000),
-  _CUPS_SIZE_MM("iso_b0_1000x1414mm", "iso-b0", 1000, 1414),
-  _CUPS_SIZE_MM("iso_c10_28x40mm", "iso-c10", 28, 40),
-  _CUPS_SIZE_MM("iso_c9_40x57mm", "iso-c9", 40, 57),
-  _CUPS_SIZE_MM("iso_c8_57x81mm", "iso-c8", 57, 81),
-  _CUPS_SIZE_MM("iso_c7_81x114mm", "iso-c7", 81, 114),
-  _CUPS_SIZE_MM("iso_c7c6_81x162mm", NULL, 81, 162),
-  _CUPS_SIZE_MM("iso_c6_114x162mm", "iso-c6", 114, 162),
-  _CUPS_SIZE_MM("iso_c6c5_114x229mm", NULL, 114, 229),
-  _CUPS_SIZE_MM("iso_c5_162x229mm", "iso-c5", 162, 229),
-  _CUPS_SIZE_MM("iso_c4_229x324mm", "iso-c4", 229, 324),
-  _CUPS_SIZE_MM("iso_c3_324x458mm", "iso-c3", 324, 458),
-  _CUPS_SIZE_MM("iso_c2_458x648mm", "iso-c2", 458, 648),
-  _CUPS_SIZE_MM("iso_c1_648x917mm", "iso-c1", 648, 917),
-  _CUPS_SIZE_MM("iso_c0_917x1297mm", "iso-c0", 917, 1297),
-  _CUPS_SIZE_MM("iso_dl_110x220mm", "iso-designated", 110, 220),
-  _CUPS_SIZE_MM("iso_ra2_430x610mm", "iso-ra2", 430, 610),
-  _CUPS_SIZE_MM("iso_sra2_450x640mm", "iso-sra2", 450, 640),
-  _CUPS_SIZE_MM("iso_ra1_610x860mm", "iso-ra1", 610, 860),
-  _CUPS_SIZE_MM("iso_sra1_640x900mm", "iso-sra1", 640, 900),
-  _CUPS_SIZE_MM("iso_ra0_860x1220mm", "iso-ra0", 860, 1220),
-  _CUPS_SIZE_MM("iso_sra0_900x1280mm", "iso-sra0", 900, 1280),
-
-  /* Japanese Standard Sheet Media Sizes */
-  _CUPS_SIZE_MM("jis_b10_32x45mm", "jis-b10", 32, 45),
-  _CUPS_SIZE_MM("jis_b9_45x64mm", "jis-b9", 45, 64),
-  _CUPS_SIZE_MM("jis_b8_64x91mm", "jis-b8", 64, 91),
-  _CUPS_SIZE_MM("jis_b7_91x128mm", "jis-b7", 91, 128),
-  _CUPS_SIZE_MM("jis_b6_128x182mm", "jis-b6", 128, 182),
-  _CUPS_SIZE_MM("jis_b5_182x257mm", "jis-b5", 182, 257),
-  _CUPS_SIZE_MM("jis_b4_257x364mm", "jis-b4", 257, 364),
-  _CUPS_SIZE_MM("jis_b3_364x515mm", "jis-b3", 364, 515),
-  _CUPS_SIZE_MM("jis_b2_515x728mm", "jis-b2", 515, 728),
-  _CUPS_SIZE_MM("jis_b1_728x1030mm", "jis-b1", 728, 1030),
-  _CUPS_SIZE_MM("jis_b0_1030x1456mm", "jis-b0", 1030, 1456),
-  _CUPS_SIZE_MM("jis_exec_216x330mm", NULL, 216, 330),
-  _CUPS_SIZE_MM("jpn_chou4_90x205mm", NULL, 90, 205),
-  _CUPS_SIZE_MM("jpn_hagaki_100x148mm", NULL, 100, 148),
-  _CUPS_SIZE_MM("jpn_you4_105x235mm", NULL, 105, 235),
-  _CUPS_SIZE_MM("jpn_chou2_111.1x146mm", NULL, 111.1, 146),
-  _CUPS_SIZE_MM("jpn_chou3_120x235mm", NULL, 120, 235),
-  _CUPS_SIZE_MM("jpn_oufuku_148x200mm", NULL, 148, 200),
-  _CUPS_SIZE_MM("jpn_kahu_240x322.1mm", NULL, 240, 322.1),
-  _CUPS_SIZE_MM("jpn_kaku2_240x332mm", NULL, 240, 332),
-
-  /* Chinese Standard Sheet Media Sizes */
-  _CUPS_SIZE_MM("prc_32k_97x151mm", NULL, 97, 151),
-  _CUPS_SIZE_MM("prc_1_102x165mm", NULL, 102, 165),
-  _CUPS_SIZE_MM("prc_2_102x176mm", NULL, 102, 176),
-  _CUPS_SIZE_MM("prc_4_110x208mm", NULL, 110, 208),
-  _CUPS_SIZE_MM("prc_5_110x220mm", NULL, 110, 220),
-  _CUPS_SIZE_MM("prc_8_120x309mm", NULL, 120, 309),
-  _CUPS_SIZE_MM("prc_6_120x320mm", NULL, 120, 320),
-  _CUPS_SIZE_MM("prc_3_125x176mm", NULL, 125, 176),
-  _CUPS_SIZE_MM("prc_16k_146x215mm", NULL, 146, 215),
-  _CUPS_SIZE_MM("prc_7_160x230mm", NULL, 160, 230),
-  _CUPS_SIZE_MM("om_juuro-ku-kai_198x275mm", NULL, 198, 275),
-  _CUPS_SIZE_MM("om_pa-kai_267x389mm", NULL, 267, 389),
-  _CUPS_SIZE_MM("om_dai-pa-kai_275x395mm", NULL, 275, 395),
-  _CUPS_SIZE_MM("prc_10_324x458mm", NULL, 324, 458),
-
-  /* Other Metric Standard Sheet Media Sizes */
-  _CUPS_SIZE_MM("om_small-photo_100x150mm", NULL, 100, 150),
-  _CUPS_SIZE_MM("om_italian_110x230mm", NULL, 110, 230),
-  _CUPS_SIZE_MM("om_postfix_114x229mm", NULL, 114, 229),
-  _CUPS_SIZE_MM("om_large-photo_200x300", NULL, 200, 300),
-  _CUPS_SIZE_MM("om_folio_210x330mm", "folio", 210, 330),
-  _CUPS_SIZE_MM("om_folio-sp_215x315mm", NULL, 215, 315),
-  _CUPS_SIZE_MM("om_invite_220x220mm", NULL, 220, 220)
-};
-
-
-/*
- * '_cupsPWGMediaByLegacy()' - Find a PWG media size by ISO/IPP legacy name.
- */
-
-_cups_pwg_media_t *			/* O - Matching size or NULL */
-_cupsPWGMediaByLegacy(
-    const char *legacy)			/* I - Legacy size name */
-{
-  _cups_pwg_media_t	key;		/* Search key */
-  _cups_globals_t	*cg = _cupsGlobals();
-					/* Global data */
-
-
- /*
-  * Build the lookup table for PWG names as needed...
-  */
-
-  if (!cg->leg_size_lut)
-  {
-    int			i;		/* Looping var */
-    _cups_pwg_media_t	*size;		/* Current size */
-
-    cg->leg_size_lut = cupsArrayNew((cups_array_func_t)compare_legacy, NULL);
-
-    for (i = (int)(sizeof(cups_pwg_media) / sizeof(cups_pwg_media[0])),
-             size = (_cups_pwg_media_t *)cups_pwg_media;
-	 i > 0;
-	 i --, size ++)
-      if (size->legacy)
-	cupsArrayAdd(cg->leg_size_lut, size);
-  }
-
- /*
-  * Lookup the name...
-  */
-
-  key.legacy = legacy;
-  return ((_cups_pwg_media_t *)cupsArrayFind(cg->leg_size_lut, &key));
-}
-
-
-/*
- * '_cupsPWGMediaByName()' - Find a PWG media size by 5101.1 self-describing
- *                           name.
- */
-
-_cups_pwg_media_t *			/* O - Matching size or NULL */
-_cupsPWGMediaByName(const char *pwg)	/* I - PWG size name */
-{
-  _cups_pwg_media_t	key;		/* Search key */
-  _cups_globals_t	*cg = _cupsGlobals();
-					/* Global data */
-
-
- /*
-  * Build the lookup table for PWG names as needed...
-  */
-
-  if (!cg->pwg_size_lut)
-  {
-    int			i;		/* Looping var */
-    _cups_pwg_media_t	*size;		/* Current size */
-
-    cg->pwg_size_lut = cupsArrayNew((cups_array_func_t)compare_pwg, NULL);
-
-    for (i = (int)(sizeof(cups_pwg_media) / sizeof(cups_pwg_media[0])),
-             size = (_cups_pwg_media_t *)cups_pwg_media;
-	 i > 0;
-	 i --, size ++)
-      cupsArrayAdd(cg->pwg_size_lut, size);
-  }
-
- /*
-  * Lookup the name...
-  */
-
-  key.pwg = pwg;
-  return ((_cups_pwg_media_t *)cupsArrayFind(cg->pwg_size_lut, &key));
-}
-
-
-/*
- * '_cupsPWGMediaBySize()' - Find a PWG media size by size in points.
- */
-
-_cups_pwg_media_t *			/* O - Matching size or NULL */
-_cupsPWGMediaBySize(double width,	/* I - Width in points */
-                    double length)	/* I - Length in points */
-{
-  int			i;		/* Looping var */
-  _cups_pwg_media_t	*size;		/* Current size */
-  double		dw, dl;		/* Difference in width and length */
-
-
-  for (i = (int)(sizeof(cups_pwg_media) / sizeof(cups_pwg_media[0])),
-	   size = (_cups_pwg_media_t *)cups_pwg_media;
-       i > 0;
-       i --, size ++)
-  {
-   /*
-    * Adobe uses a size matching algorithm with an epsilon of 5 points...
-    */
-
-    dw = size->width - width;
-    dl = size->length - length;
-
-    if (dw > -5.0 && dw < 5.0 && dl > -5.0 && dl < 5.0)
-      return (size);
-  }
-
-  return (NULL);
-}
-
-
-/*
- * 'compare_legacy()' - Compare two sizes using the legacy names.
- */
-
-static int				/* O - Result of comparison */
-compare_legacy(_cups_pwg_media_t *a,	/* I - First size */
-               _cups_pwg_media_t *b)	/* I - Second size */
-{
-  return (strcmp(a->legacy, b->legacy));
-}
-
-
-/*
- * 'compare_pwg()' - Compare two sizes using the PWG names.
- */
-
-static int				/* O - Result of comparison */
-compare_pwg(_cups_pwg_media_t *a,	/* I - First size */
-            _cups_pwg_media_t *b)	/* I - Second size */
-{
-  return (strcmp(a->pwg, b->pwg));
-}
-
-
-/*
- * End of "$Id$".
- */
@@ -1,59 +0,0 @@
-/*
- * "$Id$"
- *
- *   PWG media name API definitions for the Common UNIX Printing System (CUPS).
- *
- *   Copyright 2009 by Apple Inc.
- *
- *   These coded instructions, statements, and computer programs are the
- *   property of Apple Inc. and are protected by Federal copyright
- *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
- *   which should have been included with this file.  If this file is
- *   file is missing or damaged, see the license at "http://www.cups.org/".
- */
-
-#ifndef _CUPS_PWGMEDIA_H_
-#  define _CUPS_PWGMEDIA_H_
-
-
-/*
- * C++ magic...
- */
-
-#  ifdef __cplusplus
-extern "C" {
-#  endif /* __cplusplus */
-
-
-/*
- * Types and structures...
- */
-
-typedef struct _cups_pwg_media_s	/**** Common media size data ****/
-{
-  const char	*pwg,			/* PWG 5101.1 "self describing" name */
-		*legacy;		/* IPP/ISO legacy name */
-  double	width,			/* Width in points */
-		length;			/* Length in points */
-} _cups_pwg_media_t;
-
-
-/*
- * Functions...
- */
-
-extern _cups_pwg_media_t	*_cupsPWGMediaByLegacy(const char *legacy);
-extern _cups_pwg_media_t	*_cupsPWGMediaByName(const char *pwg);
-extern _cups_pwg_media_t	*_cupsPWGMediaBySize(double width,
-				                     double length);
-
-
-#  ifdef __cplusplus
-}
-#  endif /* __cplusplus */
-
-#endif /* !_CUPS_PWGMEDIA_H_ */
-
-/*
- * End of "$Id$".
- */
@@ -3,7 +3,7 @@
 *
 *   IPP utilities for the Common UNIX Printing System (CUPS).
 *
- *   Copyright 2007-2009 by Apple Inc.
+ *   Copyright 2007-2010 by Apple Inc.
 *   Copyright 1997-2007 by Easy Software Products.
 *
 *   These coded instructions, statements, and computer programs are the
@@ -263,11 +263,14 @@ cupsDoIORequest(http_t     *http,	/* I - Connection to server or @code CUPS_HTTP
      response = cupsGetResponse(http, resource);
      status   = http->status;
    }
+    else
+      httpFlush(http);

    DEBUG_printf(("2cupsDoIORequest: status=%d", status));

-    if (status == HTTP_FORBIDDEN || status == HTTP_ERROR ||
-	status >= HTTP_SERVER_ERROR)
+    if (status == HTTP_ERROR ||
+        (status >= HTTP_BAD_REQUEST && status != HTTP_UNAUTHORIZED &&
+	 status != HTTP_UPGRADE_REQUIRED))
    {
      _cupsSetHTTPError(status);
      break;
@@ -676,6 +679,9 @@ cupsSendRequest(http_t     *http,	/* I - Connection to server or @code CUPS_HTTP
    * Process the current HTTP status...
    */

+    if (status >= HTTP_BAD_REQUEST)
+      httpFlush(http);
+
    switch (status)
    {
      case HTTP_ERROR :
@@ -684,18 +690,15 @@ cupsSendRequest(http_t     *http,	/* I - Connection to server or @code CUPS_HTTP
          return (status);

      case HTTP_UNAUTHORIZED :
-          if (!cupsDoAuthentication(http, "POST", resource))
-	  {
-	    if (httpReconnect(http))
-	    {
-	      _cupsSetError(IPP_SERVICE_UNAVAILABLE, NULL, 0);
-	      return (HTTP_SERVICE_UNAVAILABLE);
-	    }
-	  }
-	  else
-	    status = HTTP_AUTHORIZATION_CANCELED;
+          if (cupsDoAuthentication(http, "POST", resource))
+	    return (HTTP_AUTHORIZATION_CANCELED);

-          return (status);
+	  if (httpReconnect(http))
+	  {
+	    _cupsSetError(IPP_SERVICE_UNAVAILABLE, NULL, 0);
+	    return (HTTP_SERVICE_UNAVAILABLE);
+	  }
+	  break;

 #ifdef HAVE_SSL
      case HTTP_UPGRADE_REQUIRED :
@@ -710,9 +713,12 @@ cupsSendRequest(http_t     *http,	/* I - Connection to server or @code CUPS_HTTP
 	    return (HTTP_SERVICE_UNAVAILABLE);
 	  }

-	  httpEncryption(http, HTTP_ENCRYPT_REQUIRED);
-
-          return (status);
+	  if (httpEncryption(http, HTTP_ENCRYPT_REQUIRED))
+	  {
+	    _cupsSetError(IPP_SERVICE_UNAVAILABLE, NULL, 0);
+	    return (HTTP_SERVICE_UNAVAILABLE);
+	  }
+	  break;
 #endif /* HAVE_SSL */

      case HTTP_EXPECTATION_FAILED :
@@ -799,7 +805,14 @@ cupsWriteRequestData(
    */

    if (_httpWait(http, 0, 1))
-      return (httpUpdate(http));
+    {
+      http_status_t	status;		/* Status from httpUpdate */
+
+      if ((status = httpUpdate(http)) >= HTTP_BAD_REQUEST)
+        httpFlush(http);
+
+      return (status);
+    }
  }

  return (HTTP_CONTINUE);
@@ -116,6 +116,7 @@ cupsSideChannelRead(
  char		buffer[16388];		/* Message buffer */
  int		bytes;			/* Bytes read */
  int		templen;		/* Data length from message */
+  int		nfds;			/* Number of file descriptors */
 #ifdef HAVE_POLL
  struct pollfd	pfd;			/* Poll structure for poll() */
 #else /* select() */
@@ -143,39 +144,31 @@ cupsSideChannelRead(
  pfd.fd     = CUPS_SC_FD;
  pfd.events = POLLIN;

-  if (timeout < 0.0)
-  {
-    if (poll(&pfd, 1, -1) < 1)
-      return (-1);
-  }
-  else if (poll(&pfd, 1, (long)(timeout * 1000)) < 1)
-    return (-1);
+  while ((nfds = poll(&pfd, 1, 
+		      timeout < 0.0 ? -1 : (long)(timeout * 1000))) < 0 &&
+	 (errno == EINTR || errno == EAGAIN))
+    ;

 #else /* select() */
  FD_ZERO(&input_set);
  FD_SET(CUPS_SC_FD, &input_set);

-  if (timeout < 0.0)
-  {
-    if (select(CUPS_SC_FD + 1, &input_set, NULL, NULL, NULL) < 1)
-    {
-      DEBUG_printf(("1cupsSideChannelRead: Select error: %s", strerror(errno)));
-      return (-1);
-    }
-  }
-  else
-  {
-    stimeout.tv_sec  = (int)timeout;
-    stimeout.tv_usec = (int)(timeout * 1000000) % 1000000;
+  stimeout.tv_sec  = (int)timeout;
+  stimeout.tv_usec = (int)(timeout * 1000000) % 1000000;
+
+  while ((nfds = select(CUPS_SC_FD + 1, &input_set, NULL, NULL, 
+			timeout < 0.0 ? NULL : &stimeout)) < 0 &&
+	 (errno == EINTR || errno == EAGAIN))
+    ;

-    if (select(CUPS_SC_FD + 1, &input_set, NULL, NULL, &stimeout) < 1)
-    {
-      DEBUG_puts("1cupsSideChannelRead: Select timeout");
-      return (-1);
-    }
-  }
 #endif /* HAVE_POLL */

+  if  (nfds < 1)
+  {
+    *status = nfds==0 ? CUPS_SC_STATUS_TIMEOUT : CUPS_SC_STATUS_IO_ERROR;
+    return (-1);
+  }
+
 /*
  * Read a side-channel message for the format:
  *
@@ -191,9 +184,23 @@ cupsSideChannelRead(
    if (errno != EINTR && errno != EAGAIN)
    {
      DEBUG_printf(("1cupsSideChannelRead: Read error: %s", strerror(errno)));
+      *command = CUPS_SC_CMD_NONE;
+      *status  = CUPS_SC_STATUS_IO_ERROR;
      return (-1);
    }

+ /*
+  * Watch for EOF or too few bytes...
+  */
+
+  if (bytes < 4)
+  {
+    DEBUG_printf(("1cupsSideChannelRead: Short read of %d bytes", bytes));
+    *command = CUPS_SC_CMD_NONE;
+    *status  = CUPS_SC_STATUS_BAD_MESSAGE;
+    return (-1);
+  }
+
 /*
  * Validate the command code in the message...
  */
@@ -202,6 +209,8 @@ cupsSideChannelRead(
      buffer[0] > CUPS_SC_CMD_SNMP_GET_NEXT)
  {
    DEBUG_printf(("1cupsSideChannelRead: Bad command %d!", buffer[0]));
+    *command = CUPS_SC_CMD_NONE;
+    *status  = CUPS_SC_STATUS_BAD_MESSAGE;
    return (-1);
  }

@@ -379,6 +388,7 @@ cupsSideChannelSNMPWalk(
 			real_oidlen,	/* Length of returned OID string */
 			oidlen;		/* Length of first OID */
  const char		*current_oid;	/* Current OID */
+  char			last_oid[2048];	/* Last OID */


  DEBUG_printf(("cupsSideChannelSNMPWalk(oid=\"%s\", timeout=%.3f, cb=%p, "
@@ -397,6 +407,7 @@ cupsSideChannelSNMPWalk(

  current_oid = oid;
  oidlen      = (int)strlen(oid);
+  last_oid[0] = '\0';

  do
  {
@@ -422,7 +433,8 @@ cupsSideChannelSNMPWalk(
      * Parse the response of the form "oid\0value"...
      */

-      if (strncmp(real_data, oid, oidlen) || real_data[oidlen] != '.')
+      if (strncmp(real_data, oid, oidlen) || real_data[oidlen] != '.' ||
+          !strcmp(real_data, last_oid))
      {
       /*
        * Done with this set of OIDs...
@@ -448,6 +460,7 @@ cupsSideChannelSNMPWalk(
      */

      current_oid = real_data;
+      strlcpy(last_oid, current_oid, sizeof(last_oid));
    }
  }
  while (status == CUPS_SC_STATUS_OK);
@@ -55,6 +55,7 @@ typedef enum cups_sc_bidi_e cups_sc_bidi_t;

 enum cups_sc_command_e			/**** Request command codes ****/
 {
+  CUPS_SC_CMD_NONE = 0,			/* No command @private@ */
  CUPS_SC_CMD_SOFT_RESET = 1,		/* Do a soft reset */
  CUPS_SC_CMD_DRAIN_OUTPUT = 2,		/* Drain all pending output */
  CUPS_SC_CMD_GET_BIDI = 3,		/* Return bidirectional capabilities */
@@ -3,7 +3,7 @@
 *
 *   SNMP functions for the Common UNIX Printing System (CUPS).
 *
- *   Copyright 2007-2009 by Apple Inc.
+ *   Copyright 2007-2010 by Apple Inc.
 *   Copyright 2006-2007 by Easy Software Products, all rights reserved.
 *
 *   These coded instructions, statements, and computer programs are the
@@ -89,14 +89,14 @@ static char		*asn1_get_string(unsigned char **buffer,
 			                 unsigned char *bufend,
 			                 int length, char *string,
 			                 int strsize);
-static int		asn1_get_length(unsigned char **buffer,
+static unsigned		asn1_get_length(unsigned char **buffer,
 			                unsigned char *bufend);
 static int		asn1_get_type(unsigned char **buffer,
 			              unsigned char *bufend);
 static void		asn1_set_integer(unsigned char **buffer,
 			                 int integer);
 static void		asn1_set_length(unsigned char **buffer,
-			                int length);
+			                unsigned length);
 static void		asn1_set_oid(unsigned char **buffer,
 			             const int *oid);
 static void		asn1_set_packed(unsigned char **buffer,
@@ -608,6 +608,8 @@ _cupsSNMPWalk(int            fd,	/* I - SNMP socket */
  int		count = 0;		/* Number of OIDs found */
  int		request_id = 0;		/* Current request ID */
  cups_snmp_t	packet;			/* Current response packet */
+  int		lastoid[CUPS_SNMP_MAX_OID];
+					/* Last OID we got */


 /*
@@ -631,14 +633,15 @@ _cupsSNMPWalk(int            fd,	/* I - SNMP socket */
  */

  _cupsSNMPCopyOID(packet.object_name, prefix, CUPS_SNMP_MAX_OID);
+  lastoid[0] = -1;

  for (;;)
  {
    request_id ++;

    if (!_cupsSNMPWrite(fd, address, version, community,
-                       CUPS_ASN1_GET_NEXT_REQUEST, request_id,
-		       packet.object_name))
+                        CUPS_ASN1_GET_NEXT_REQUEST, request_id,
+		        packet.object_name))
    {
      DEBUG_puts("5_cupsSNMPWalk: Returning -1");

@@ -652,7 +655,8 @@ _cupsSNMPWalk(int            fd,	/* I - SNMP socket */
      return (-1);
    }

-    if (!_cupsSNMPIsOIDPrefixed(&packet, prefix))
+    if (!_cupsSNMPIsOIDPrefixed(&packet, prefix) ||
+        _cupsSNMPIsOID(&packet, lastoid))
    {
      DEBUG_printf(("5_cupsSNMPWalk: Returning %d", count));

@@ -666,6 +670,8 @@ _cupsSNMPWalk(int            fd,	/* I - SNMP socket */
      return (count > 0 ? count : -1);
    }

+    _cupsSNMPCopyOID(lastoid, packet.object_name, CUPS_SNMP_MAX_OID);
+
    count ++;

    (*cb)(&packet, data);
@@ -1280,7 +1286,13 @@ asn1_get_integer(
  int	value;				/* Integer value */


-  for (value = 0;
+  if (length > sizeof(int))
+  {
+    (*buffer) += length;
+    return (0);
+  }
+
+  for (value = (**buffer & 0x80) ? -1 : 0;
       length > 0 && *buffer < bufend;
       length --, (*buffer) ++)
    value = (value << 8) | **buffer;
@@ -1293,18 +1305,32 @@ asn1_get_integer(
 * 'asn1_get_length()' - Get a value length.
 */

-static int				/* O  - Length */
+static unsigned				/* O  - Length */
 asn1_get_length(unsigned char **buffer,	/* IO - Pointer in buffer */
 		unsigned char *bufend)	/* I  - End of buffer */
 {
-  int	length;				/* Length */
+  unsigned	length;			/* Length */


  length = **buffer;
  (*buffer) ++;

  if (length & 128)
-    length = asn1_get_integer(buffer, bufend, length & 127);
+  {
+    int	count;				/* Number of bytes for length */
+
+
+    if ((count = length & 127) > sizeof(unsigned))
+    {
+      (*buffer) += count;
+      return (0);
+    }
+
+    for (length = 0;
+	 count > 0 && *buffer < bufend;
+	 count --, (*buffer) ++)
+      length = (length << 8) | **buffer;
+  }

  return (length);
 }
@@ -1523,7 +1549,7 @@ asn1_set_integer(unsigned char **buffer,/* IO - Pointer in buffer */

 static void
 asn1_set_length(unsigned char **buffer,	/* IO - Pointer in buffer */
-		int           length)	/* I  - Length value */
+		unsigned      length)	/* I  - Length value */
 {
  if (length > 255)
  {
@@ -1,9 +1,9 @@
 /*
 * "$Id$"
 *
- *   String definitions for the Common UNIX Printing System (CUPS).
+ *   String definitions for CUPS.
 *
- *   Copyright 2007-2009 by Apple Inc.
+ *   Copyright 2007-2010 by Apple Inc.
 *   Copyright 1997-2006 by Easy Software Products.
 *
 *   These coded instructions, statements, and computer programs are the
@@ -27,6 +27,7 @@
 #  include <stdarg.h>
 #  include <ctype.h>
 #  include <locale.h>
+#  include <errno.h>

 #  include <config.h>

--- a/Mostrar Mais
+++ b/Mostrar Mais