Import cups.org releases

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/tags/release-1.7b1@4306 a1ca3aef-8c08-0410-bb20-df032aa958be
2013-05-10 18:56:23 +00:00
@@ -1,6 +1,90 @@
 CHANGES-1.5.txt
 ---------------

+CHANGES IN CUPS V1.5.4
+
+	- Documentation updates (STR #4112, STR #4130, STR #4134)
+	- Fixes for libusb-based USB backend (STR #4128)
+	- The lpq command did not show the owner or title of jobs unless passed
+	  a username on the command-line (STR #4135)
+	- Localized empty strings contained the message catalog metadata
+	  (STR #4119)
+	- Fixed a crash in the libusb-based USB backend (STR #4099)
+	- The cups-lpd mini-daemon no longer handled jobs with multiple copies
+	  (STR #4118)
+	- Multiple libusb backend fixes (STR #4098, STR #4100)
+	- The IPP backend no longer tries to get the job status for printers
+	  that do not implement the required operation (STR #4083)
+	- Sending a document in an unsupported format to an IPP printer now
+	  automatically cancels the job (STR #4093)
+	- Fix some error reporting issues when printing from /dev/null and
+	  other unusual situations (STR #4015)
+	- The scheduler now sets the CUPS_MAX_MESSAGE environment variable for
+	  filters (STR #4074)
+	- Fixed a build issue when using older versions of autoconf (STR #4084)
+	- The IPP backend now treats the client-error-not-possible status code
+	  as a job history issue, allowing IPP printing to Windows to work
+	  (STR #4047)
+	- The IPP backend incorrectly included the document-format and
+	  compression attributes in Create-Job requests (STR #4086)
+	- The libusb-based USB backend did not work on non-Linux platforms
+	  (STR #4088)
+
+
+CHANGES IN CUPS V1.5.3
+
+	- httpReconnect() did not reset the read/write buffers (STR #4065)
+	- Compiling without threading support failed (STR #4060)
+	- Fixed compile problem with old versions of OpenSSL (STR #4036)
+	- The network backends did not check SNMP supply levels regularly
+	  (STR #4040)
+	- The online help always included the "help on help" text (STR #4042)
+	- Fixed a SSL handshake issue on OS X (STR #4045)
+	- The scheduler could crash if a PPD file contained an invalid paper
+	  size (STR #4049)
+	- The CUPS polling daemon did not reinitialize its connection to the
+	  remote server on errors in all cases (STR #4031)
+	- PostScript auto-configuration was slow and unreliable with some
+	  printers (STR #4028)
+	- Missing localizations caused empty output (STR #4033)
+	- The cups-driverd program could temporarily "forget" a PPD file if it
+	  was updated in place.
+	- The dnssd backend now prefers IPPS over IPP.
+	- The USB backend now uses and requires LIBUSB 1.0 or later (STR #3477)
+	- The LIBUSB-based USB backend now supports the back-channel (STR #2890)
+	- Changed how timeouts are implemented in the LPD backend (STR #4013)
+	- Added more supported color names for SNMP supplies (STR #3981)
+	- The default InputSlot setting was never used (STR #3957)
+	- POSIX ACLs are now set properly on certificate files (STR #3970)
+	- Supplies with commas in their names were not reported correctly
+	  (STR #4020)
+	- The cupsGetPPD3() function created a temporary file when one was not
+	  needed (STR #4018)
+	- The scheduler now ensures that job notifications contain a value for
+	  the notify-printer-uri attribute (STR #4014)
+	- The lp and lpr commands did not cancel jobs queued from stdin on an
+	  error (STR #4015)
+	- Fixed the IPP backend's handling of HTTP/1.0 compatibility (STR #3988)
+	- The IPP backend did not always setup username/password authentication
+	  for printers (STR #3985)
+	- The IPP backend no longer re-queues print jobs that are too large for
+	  the printer/server (STR #3977)
+	- The RPM spec file did not work (STR #4021, STR #4057)
+	- Encryption did not work when the server name ended with "."
+	  (STR #4011)
+	- The multi-purpose tray is now mapped to the IPP "by-pass-tray"
+	  (STR #4009)
+	- The correct media size was not always passed to IPP printers
+	  (STR #4001)
+	- Finishing options were not passed to IPP printers (STR #3995)
+	- Fixed iCloud-based Back to My Mac printing (STR #3996)
+
+
+CHANGES IN CUPS V1.5.2
+
+	- Reposted what should have been CUPS 1.5.1.
+
+
 CHANGES IN CUPS V1.5.1

 	- Documentation updates (STR #3885, STR #3886, STR #3946, STR #3969)
@@ -0,0 +1,202 @@
+CHANGES-1.6.txt
+---------------
+
+CHANGES IN CUPS V1.6.3
+
+	- The configure script now prefers Clang over GCC.
+	- Fixed a compile problem on AIX (STR #4307)
+	- Insecure ICC profiles prevented installation of user profiles for a
+	  printer on OS X.
+	- Added more USB quirks for the libusb-based backend (STR #4311)
+	- The Russian web interface templates were broken (STR #4310)
+	- The scheduler no longer tries to do Kerberos authentication over the
+	  loopback interface.
+	- The IPP backend could fail to pause a job for authentication
+	  (STR #4298)
+	- Fixed a regression on the handling of auth keys on OS X if the
+	  cups-files.conf was not present or did not contain a SystemAuthKey
+	  value.
+	- The scheduler incorrectly did a reverse lookup of the server address
+	  when HostNameLookups was turned off (STR #4302)
+	- The scheduler incorrectly computed the final content type value when
+	  null filters were present.
+
+
+CHANGES IN CUPS V1.6.2
+
+	- Documentation fixes (STR #4229, STR #4239, STR #4234, STR #4248,
+	  STR #4259)
+	- Security: All file, directory, user, and group settings are now stored
+	  in a separate cups-files.conf configuration file that cannot be set
+	  through the CUPS web interface or APIs (STR #4223)
+	- Added a Czech localization (STR #4201)
+	- Added a French localization (STR #4247)
+	- Added a Russian localization (STR #4228, STR #4285)
+	- Updated the Catalan localization (STR #4202)
+	- Local certificate authentication did not guard against an empty
+	  certification file (STR #4293)
+	- The scheduler did not reject device URIs with spaces.
+	- Added USB quirk rule for Epson Stylus Photo 750 (STR #4286)
+	- The IPP backend could crash if the printer disconnects early
+	  (STR #4284)
+	- cupsGetPPD did not work with statically-configured CUPS shared
+	  queues (STR #4178)
+	- The scheduler did not support long MIME media types (STR #4270)
+	- The cupsfilter command did not set the CHARSET environment variable
+	  for the text filters (STR #4273)
+	- The lp command did not show errors for unknown "--foo" (STR #4261)
+	- Bad IPP responses could crash ipptool (STR #4262)
+	- Updated USB quirk rules for Canon and Xerox printers (STR #4217,
+	  STR #4263)
+	- Added USB blacklisting for printers that require a custom backend
+	  (STR #4218)
+	- The PPD compiler did not correctly JCL options (STR #4115, STR #4203)
+	- The ipptool program now supports DEFINE-MATCH and DEFINE-NO-MATCH
+	  predicates for STATUS directives.
+	- Fixed a problem with local Kerberos authentication (STR #4140)
+	- Coverity scan: fixed some minor issues (STR #4242)
+	- The scheduler did not remove color profiles after deleting a printer
+	  (STR #4232, STR #4276)
+	- The CUPS library did not always detect a timed out connection to the
+	  server which could cause temporary loss of printing from applications
+	  (STR #4187)
+	- The ipptool program now supports variable substitution in OPERATION
+	  and DELAY directives (STR #4175)
+	- The IPP backend now stops queues when the server configuration
+	  prevents successful job submission (STR #4125)
+	- The XML output of ipptool contained empty dictionaries (STR #4136)
+	- The scheduler did not delete job control backup files (STR #4244)
+	- cupsGetPPD3 could return a local PPD instead of the correct remote
+	  PPD.
+	- The scheduler incorrectly advertised auth-info-required for local
+	  queues needing local authentication (STR #4205)
+	- CUPS 1.6 clients using the ServerName directive in client.conf did not
+	  work with CUPS 1.3.x or older servers (STR #4231, STR #4291)
+	- The SNMP backend now tries to work around broken printers that use a
+	  newline to separate key/value pairs.
+	- The IPP backend did not send a cancel request to printers when a job
+	  was canceled and the printer did not support Create-Job.
+	- Fixed EPM packaging files (STR #4199)
+	- OpenBSD build fix (STR #4195, STR #4196, STR #4197)
+	- The scheduler could crash when using Avahi (STR #4183, STR #4192,
+	  STR #4200, STR #4213)
+	- The IPP backend could get stuck in an endless loop on certain network
+	  errors (STR #4194)
+	- 32-bit builds failed on Debian (STR #4133)
+	- The scheduler no longer accepts or sends job description attributes.
+	- The IPP backend now works around some conformance issues for broken
+	  printers (STR #4190)
+	- cupsBackendReport() now filters out all control characters from the
+	  reported 1284 device IDs (STR #4124)
+	- The scheduler no longer allows job-name values that are not valid
+	  network Unicode strings (STR #4072)
+	- The web interface did not preserve the order of classes, jobs, or
+	  printers (STR #4170)
+	- The network backends now support disabling of SNMP supply level
+	  queries via the "snmp" URI option (STR #4106)
+	- The IPP backend did not specify the compression used (STR #4181)
+	- ipptool did not support octetString values.
+	- The scheduler did not recognize dnssd: or ipps: URIs as Bonjour shared
+	  queues (STR #4158)
+	- Applications could not get the PPD file for statically-configured
+	  Bonjour-shared print queues (STR #4159)
+	- The cupsd.conf file included obsolete browsing directives (STR #4157)
+	- Fixed a USB backend compatibility issue on systems using libusb
+	  (STR #4155, STR #4191)
+	- Some Bonjour features were not available on systems with Avahi
+	  (STR #4156)
+	- CUPS now includes the port number in the Host: header for HTTP
+	  requests.
+	- Fixed REPEAT-MATCH for STATUS and EXPECT - was incorrectly erroring
+	  out.
+
+
+CHANGES IN CUPS V1.6.1
+
+	- Documentation fix (STR #4149)
+	- RPM packaging fixes (STR #4129, #4145)
+	- The Japanese and English web interface headers were swapped
+	  (STR #4148)
+
+
+CHANGES IN CUPS V1.6.0
+
+	- Document changes (STR #4131)
+	- Added new Catalan (STR #4107) and Spanish (STR #4137) localizations.
+
+
+CHANGES IN CUPS V1.6rc1
+
+	- Added a new Japanese localization (STR #4122)
+	- The SNMP backend no longer exits if it is unable to obtain an IPv6
+	  socket (STR #4109)
+	- The LPD backend incorrectly used "localhost" in the control file
+	  instead of the current hostname.
+
+
+CHANGES IN CUPS V1.6b1
+
+	- Documentation updates (STR #3927, STR #3980, STR #4010, STR #4068)
+	- The scheduler now consolidates all PPD updates from filters at the
+	  end of the job (STR #4075)
+	- CUPS now supports color management using colord (STR #3808)
+	- CUPS now supports Bonjour using Avahi (STR #3066)
+	- The PreserveJobFiles and PreserveJobHistory directives now support
+	  specification of a time interval (STR #3143)
+	- PPD files can now be archived in (gzip'd) tar files to further reduce
+	  the disk space used by PPD files (STR #3772)
+	- The network backends now deal with printers that report their levels
+	  in percent but do not specify a maximum capacity of 100 (STR #3551)
+	- The network backends now report full/almost-full waste bins in
+	  printers along with end-of-life for cleaning pads (STR #4017)
+	- Added a configure option to set the permissions of the installed
+	  cupsd (STR #3459)
+	- Added a new WITH-ALL-VALUES directive to ipptool EXPECT predicates
+	  (STR #3949)
+	- CUPS now supports a User directive in client.conf and the CUPS_USER
+	  environment variable for overriding the default username (STR #3114)
+	- Now set the PJL USERNAME variable as needed (STR #3100)
+	- Added support for usernames and passwords longer than 32 characters
+	  (STR #2856)
+	- Added a new MaxHoldTime directive to automatically cancel jobs that
+	  have been held indefinitely after a specific number of seconds
+	  (STR #2291)
+	- The LPD backend now uses the originating host name when it is not the
+	  local system (STR #2053)
+	- CUPS now prefers the suffix "dpcm" when reporting resolution in dots-
+	  per-centimeter (STR #4006)
+	- The configure script and build system no longer support building of
+	  separate 32-bit and 64-bit libraries.
+	- The "brightness", "columns", "fitplot", "gamma", "hue",
+	  "natural-scaling", "penwidth", "position", "ppi", "saturation", and
+	  "scaling" options are not longer supported (STR #4010)
+	- The "page-bottom", "page-left", "page-right", "page-top",
+	  "prettyprint", and "wrap" options have been deprecated (STR #4010)
+	- The scheduler now reports the standard "number-of-documents" attribute
+	  instead of the CUPS-specific "document-count" attribute in
+	  job objects.
+	- Added new destination connection and enumeration functions (STR #3924)
+	- Added new option, localization, and job submission functions that do
+	  not depend on PPD files (STR #3925)
+	- Added a new MaxJobTime directive for cupsd that specifies the maximum
+	  amount of time allowed for a job to complete before it is canceled.
+	- The default password callback now supports passwords up to 127
+	  characters.
+	- The scheduler now supports a DefaultAuthType of "auto" to
+	  automatically choose between Basic (username/password) and Negotiate
+	  (Kerberos) authentication.
+	- cupsSideChannelSNMPGet/Walk now support OIDs and values up to 64k in
+	  length.
+	- CUPS no longer supports automatic remote printers or implicit classes
+	  via the CUPS, LDAP, or SLP protocols (STR #3922, STR #3923)
+	- The PPD APIs are now deprecated and will be removed in a future
+	  version of CUPS (STR #3927)
+	- The default IPP version for requests is now 2.0 (STR #3929)
+	- The IPP APIs no longer expose the ipp_t or ipp_attribute_t structures
+	  and instead provide accessor functions (STR #3928)
+	- The scheduler will no longer run programs with group write permission.
+	- The PHP module has been removed (STR #3932)
+	- The bannertops, commandtoescpx, commandtopclx, imagetops,
+	  imagetoraster, pdftops, rastertoescpx, rastertopclx, and texttops
+	  filters have been removed (STR #3930)
+	- The serial and parallel backends have been removed (STR 3935)
@@ -1,10 +1,57 @@
-CHANGES-IPPTOOL.txt - 2012-01-10
+CHANGES-IPPTOOL.txt - 2013-04-18
 --------------------------------

 This file provides a list of changes to the ipptool binary distribution posted
 on cups.org.


+2013-04-18
+
+	- Fixed some HTTP issues with authentication and compression.
+	- The IPP/1.1 test file did not allow for sufficient retries when
+	  printing.
+	- The IPP/1.1 test file did not allow for empty printer-name values.
+	- The IPP Everywhere test file contained numerous errors.
+	- The color.jpg test file used a progressive mode instead of the
+	  baseline JPEG mode.
+	- The IPP/1.1 test file referenced "color.jpeg" instead of "color.jpg".
+
+
+2013-01-31
+
+	- Added support for DEFINE-MATCH and DEFINE-NO-MATCH as STATUS
+	  predicates.
+	- Added support for WITH-VALUE and resolution values.
+	- Added support for SKIP-IF-MISSING (skip test if file is missing)
+	- Added support for octetString values.
+	- Added support for document compression in Print-Job and Send-Document
+	  requests.
+	- Fixed REPEAT-MATCH for STATUS and EXPECT - was incorrectly erroring
+	  out.
+	- Fixed a bug where bad IPP responses would cause ipptool to crash.
+
+
+2012-02-28
+
+	- Changed behavior of WITH-VALUES "/regex/" to not require all values to
+	  match.
+	- Added WITH-ALL-VALUES directive for EXPECT predicates that require all
+	  values to match.
+	- Updated test files to use WITH-ALL-VALUES where necessary.
+	- Updated test files to use new ABNF for media names from PWG Media
+	  Names 2.0.
+
+
+2012-02-06
+
+	- Fixed the packaging of ipptool on Windows (removed unnecessary DLLs)
+	- Fixed an crash in ipptool when mixing DISPLAY with -I and a failed
+	  request.
+	- Added a Print-Job test file.
+	- Added a "setdebug" batch file for Windows
+	- Added support for a CUPS_DISABLE_ASYNC_CONNECT environment variable.
+
+
 2012-01-10

 	- Fixed an issue with the IPP/1.1 test file where the "waiting for job
@@ -1,40 +1,37 @@
-CHANGES.txt - 1.6b1 - 2012-01-30
+CHANGES.txt - 1.7b1 - 2013-04-18
 --------------------------------

-CHANGES IN CUPS V1.6b1
+CHANGES IN CUPS V1.7b1

-	- The configure script and build system no longer support building of
-	  separate 32-bit and 64-bit libraries.
-	- The "brightness", "columns", "fitplot", "gamma", "hue",
-	  "natural-scaling", "penwidth", "position", "ppi", "saturation", and
-	  "scaling" options are not longer supported (STR #4010)
-	- The "page-bottom", "page-left", "page-right", "page-top",
-	  "prettyprint", and "wrap" options have been deprecated (STR #4010)
-	- The scheduler now reports the standard "number-of-documents" attribute
-	  instead of the CUPS-specific "document-count" attribute in
-	  job objects.
-	- Added new destination connection and enumeration functions (STR #3924)
-	- Added new option, localization, and job submission functions that do
-	  not depend on PPD files (STR #3925)
-	- Added a new MaxJobTime directive for cupsd that specifies the maximum
-	  amount of time allowed for a job to complete before it is canceled.
-	- The default password callback now supports passwords up to 127
-	  characters.
-	- The scheduler now supports a DefaultAuthType of "auto" to
-	  automatically choose between Basic (username/password) and Negotiate
-	  (Kerberos) authentication.
-	- cupsSideChannelSNMPGet/Walk now support OIDs and values up to 64k in
-	  length.
-	- CUPS no longer supports automatic remote printers or implicit classes
-	  via the CUPS, LDAP, or SLP protocols (STR #3922, STR #3923)
-	- The PPD APIs are now deprecated and will be removed in a future
-	  version of CUPS (STR #3927)
-	- The default IPP version for requests is now 2.0 (STR #3929)
-	- The IPP APIs no longer expose the ipp_t or ipp_attribute_t structures
-	  and instead provide accessor functions (STR #3928)
-	- The scheduler will no longer run programs with group write permission.
-	- The PHP module has been removed (STR #3932)
-	- The bannertops, commandtoescpx, commandtopclx, imagetops,
-	  imagetoraster, pdftops, rastertoescpx, rastertopclx, and texttops
-	  filters have been removed (STR #3930)
-	- The serial and parallel backends have been removed (STR 3935)
+	- The configure script now supports a --with-rundir option to change
+	  the transient run-time state directory from the default to other
+	  locations like /run/cups (STR #4306)
+	- The scheduler now supports PPD lookups for classes (STR #4296)
+	- The cupsfilter program did not set the FINAL_CONTENT_TYPE
+	  environment variable for filters.
+	- Added a new "-x" option to the cancel command (STR #4103)
+	- Made the PWG media handling APIs public (STR #4267)
+	- Implemented ready media support for the cupsGetDestMediaXxx APIs
+	  (STR #4289)
+	- Added new cupsFindDestDefault, cupsFindDestReady, and
+	  cupsFindDestSupported APIs (STR #4289)
+	- Added new cupsGetDestMediaByIndex, cupsGetDestMediaCount, and
+	  cupsGetDestMediaDefault APIs (STR #4289)
+	- Added new ippGet/SetOctetString APIs for getting and setting an
+	  octetString value (STR #4289)
+	- Added new ippCreateRequestedArray API for generating a array of
+	  attributes from the requested-attributes attribute.
+	- The ipptool utility now supports compression, conditional tests based
+	  on the presence of files, and new DEFINE predicates for STATUS.
+	- Added new IPP APIs for checking values (STR #4167)
+	- Added new IPP APis for adding and setting formatted strings.
+	- Added new HTTP APIs to support basic server functionality via libcups.
+	- The dnssd backend now generates a 1284 device ID as needed (STR #3702)
+	- CUPS now supports compressing and decompressing streamed data
+	  (STR #4168)
+	- CUPS now supports higher-level PIN printing, external accounting
+	  systems, and "print here" printing environments (STR #4169)
+	- IRIX is no longer a supported operating system (STR #4092)
+	- The PPD compiler now supports JCL options properly (STR #4115)
+	- The web interface now checks whether the web browser has cookies
+	  enabled and displays a suitable error message (STR #4141)
@@ -1,4 +1,4 @@
-CREDITS.txt - 2010-03-13
+CREDITS.txt - 2012-07-16
 ------------------------

 Few projects are completed by one person, and CUPS is no exception.  We'd
@@ -17,7 +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.
+    Iñaki Larrañaga                - Basque localization.
    Kenshi Muto                    - Japanese localization, patches, and
                                     testing.
    Tomohiro Kato                  - Japanese localization.
@@ -27,16 +27,18 @@ like to thank the following individuals for their contributions:
    Mark Lawrence                  - Microsoft interoperability testing.
    Jeff Licquia                   - Bug fixes, beta testing, evangelism.
    Jason McMullan                 - Original CUPS RPM distributions.
+    Àngel Mompó                    - Catalan localization.
    Wes Morgan                     - *BSD fixes.
    Daniel Nylander                - Swedish localization.
-    Niklas 'Nille' �kerstršm       - Swedish localization.
+    Niklas 'Nille' Åkerström       - Swedish localization.
+    Naruiko Ogasawara              - Japanese localization.
    Giulio Orsero                  - Bug fixes and testing.
    Michal Osowiecki               - Polish localization.
    Citra Paska                    - Indonesian localization.
    Kurt Pfeifle                   - Bug fixes, beta testing, evangelism.
    Vincenzo Reale                 - Italian localization.
    Petter Reinholdtsen            - HP-UX compiler stuff.
-    Juan Pablo Gonz‡lez Riopedre   - Spanish localization.
+    Juan Pablo González Riopedre   - Spanish localization.
    Opher Shachar                  - Hebrew localization.
    Stuart Stevens                 - HP JetDirect IPP information.
    Andrea Suatoni                 - IRIX desktop integration and testing.
@@ -1,14 +1,20 @@
-INSTALL - CUPS v1.5.0 - 2011-07-25
+INSTALL - CUPS v1.7b1 - 2013-04-18
 ----------------------------------

 This file describes how to compile and install CUPS from source code. For more
 information on CUPS see the file called "README.txt".  A complete change log can
 be found in "CHANGES.txt".

-**** IF YOU HAVE A NON-POSTSCRIPT PRINTER AND ARE NOT       ****
-**** RUNNING MAC OS X, YOU WILL ALSO NEED TO INSTALL GPL    ****
-**** GHOSTSCRIPT WITH THE "cups" DRIVER AFTER YOU INSTALL   ****
-**** CUPS.                                                  ****
+*******************************************************************************
+*******************************************************************************
+****                                                                       ****
+****  USING CUPS REQUIRES ADDITIONAL THIRD-PARTY SUPPORT SOFTWARE AND      ****
+****  PRINTER DRIVERS.  THESE ARE TYPICALLY INCLUDED WITH YOUR OPERATING   ****
+****  SYSTEM DISTRIBUTION.  APPLE DOES NOT ENDORSE OR SUPPORT THIRD-PARTY  ****
+****  SUPPORT SOFTWARE FOR CUPS.                                           ****
+****                                                                       ****
+*******************************************************************************
+*******************************************************************************


 BEFORE YOU BEGIN
@@ -23,18 +29,16 @@ BEFORE YOU BEGIN
    Compaq, HP, SGI, and Sun.  BSD users should use GNU make (gmake) since BSD
    make does not support "include".

-    Besides these tools you'll want the JPEG, PNG, TIFF, and ZLIB libraries for
-    image support, the CDSA, GNU TLS, or OpenSSL libraries for encryption
-    support, the OpenLDAP and OpenSLP libraries for directory services support,
-    and either MIT (1.6.3 or higher) or Heimdal Kerberos for Kerberos support.
-    CUPS will compile and run without these, however you'll miss out on many of
-    the features provided by CUPS.
+    Besides these tools you'll want ZLIB library for compression support, the
+    CDSA, GNU TLS, or OpenSSL libraries for encryption support, and either MIT
+    (1.6.3 or higher) or Heimdal Kerberos for Kerberos support.  CUPS will
+    compile and run without these, however you'll miss out on many of the
+    features provided by CUPS.

-    Also, please note that CUPS does not include the Ghostscript-based
-    PostScript filter needed by non-PostScript printers.  You *must* download
-    GPL Ghostscript separately from the CUPS web site if you want to print
-    PostScript files to non-PostScript printers on operating systems other than
-    Mac OS X.
+    Also, please note that CUPS does not include print filters to support PDF
+    or raster printing.  You *must* download GPL Ghostscript and/or the Open
+    Printing CUPS filters package separately to print on operating systems
+    other than OS X.


 COMPILING THE SUBVERSION REPOSITORY CODE
@@ -1,4 +1,4 @@
-IPPTOOL.txt - 2011-12-02
+IPPTOOL.txt - 2013-04-18
 ------------------------

 See the file CHANGES-IPPTOOL.txt for a list of changes to this software.
@@ -6,11 +6,11 @@ See the file CHANGES-IPPTOOL.txt for a list of changes to this software.

 INTRODUCTION

-    Starting with CUPS 1.5, CUPS now installs a user program called ipptool that
-    can be used to send arbitrary IPP requests to a CUPS server or IPP printer.
-    This tool started life as part of the CUPS automated test suite and has
-    grown to support complex conformance tests and a simple way to query
-    printer, job, and subscription attributes.
+    CUPS includes a user program called ipptool that can be used to send
+    arbitrary IPP requests to a CUPS server or IPP printer.  This tool started
+    life as part of the CUPS automated test suite and has grown to support
+    complex conformance tests and a simple way to query printer, job, and
+    subscription attributes.


 BASIC USAGE
@@ -46,11 +46,37 @@ BASIC USAGE
 	75,pending-held,testfile.txt,msweet


+STANDARD TEST FILES
+
+    The following standard test files are included with ipptool:
+
+        create-printer-subscription.test    Creates a printer subscription for
+                                            state change notifications
+        get-completed-jobs.test             Shows a list of completed jobs
+        get-jobs.test                       Shows a list of pending jobs
+        get-notifications.test              Shows events for an ippget
+	                                    subscription.
+        get-printer-attributes.test         Shows printer attributes
+        get-subscription.test               Shows a list of subscriptions
+        ipp-1.1.test                        IPP/1.1 conformance test suite
+        ipp-2.0.test                        IPP/2.0 conformance test suite
+        ipp-2.1.test                        IPP/2.1 conformance test suite
+        ipp-2.2.test                        IPP/2.2 conformance test suite
+        ipp-everywhere.test                 IPP Everywhere conformance test
+                                            suite
+        print-job.test                      Prints a file
+        print-job-deflate.test              Prints a file, compressing with
+                                            deflate.
+        print-job-gzip.test                 Prints a file, compressing with gzip
+        validate-job.test                   Validates attributes for a job
+                                            submission.
+
+
 CONFORMANCE TESTS

-    We provide basic IPP conformance tests for IPP/1.1, IPP/2.0, IPP/2.1, and
-    IPP/2.2.  For a given printer URI, the following commands perform tests at
-    each level:
+    We provide basic IPP conformance tests for IPP/1.1, IPP/2.0, IPP/2.1,
+    IPP/2.2, and IPP Everywhere.  For a given printer URI, the following
+    commands perform tests at each level:

        ipptool -tf filename [options] -I printer-uri ipp-1.1.test
        ipptool -tf filename [options] -I -V 2.0 printer-uri ipp-2.0.test
@@ -71,26 +97,65 @@ CONFORMANCE TESTS
 	onepage-a4.ps
 	onepage-letter.pdf
 	onepage-letter.ps
+	testfile.jpg
+	testfile.pcl
+	testfile.pdf
+	testfile.ps
+	testfile.txt
+
+    Useful options include the following:
+
+        -4           Connect using IPv4
+        -6           Connect using IPv6
+        -C           Send chunked requests (default)
+        -d name=val  Define a variable
+        -E           Test IPP with HTTP Upgrade to TLS
+        -L           Send requests using the Content-Length header (HTTP/1.0)
+        -S           Test IPP over HTTPS (default for ipps: URIs)
+        -T seconds   Set a timeout for responses in seconds
+        -v           Be verbose, showing all attributes sent and received
+        -X           Produce XML (Apple plist) output
+
+    The printer-uri must be a URI supported by the printer using the "ipp" or
+    "ipps" scheme, for example:
+
+        ipp://192.168.0.1/ipp
+        ipps://192.168.0.1/ipp/print

    Print-by-reference (URL) printing can be tested by defining the document-uri
-    variable to a URL, for example:
+    variable as a URL, for example:

        ipptool -tf filename -d document-uri=url -I printer-uri ipp-1.1.test

    The standard test files are available on cups.org under the "test"
    directory, for example:

-	http://www.cups.org/test/document-a4.pdf
+        ipptool -tf document-a4.pdf \
+            -d document-uri=http://www.cups.org/test/document-a4.pdf \
+            ipp://192.168.0.1/ipp -I -V 2.0 ipp-2.0.test

    The "document" test files contain 4 pages each.  Doing the IPP conformance
    tests will will produce up to 90 pages on various media, depending on the
    printer.


+IPP EVERYWHERE TESTING
+
+    The IPP Everywhere tests use sample PWG raster files available from:
+
+        ftp://ftp.pwg.org/pub/pwg/ipp/examples
+
+    Extract the corresponding ZIP archives into the current directory before
+    running the ipp-everywhere.test file.  The test file will attempt to print
+    each PWG Raster file that is supported by the printer being tested - up to
+    372 pages including the 90 pages produced by the regular IPP test suite.
+
+
 READING THE DOCUMENTATION

    The command usage is described in the ipptest(1) man page, while the file
-    format is described in the ipptestfile(5) man page.
+    format is described in the ipptestfile(5) man page.  Both are provided in
+    HTML format with the standalone releases of ipptool.


 GETTING SUPPORT AND OTHER RESOURCES
@@ -118,8 +183,7 @@ REPORTING BUGS
    test with debug logging enabled.  Run the following commands on Windows to
    enable debug logging:

-	set CUPS_DEBUG_LOG=ipptool.log
-	set CUPS_DEBUG_LEVEL=6
+        setdebug.bat

    For Linux and Mac OS X use:

@@ -133,7 +197,7 @@ REPORTING BUGS

 LEGAL STUFF

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

    The MD5 Digest code is Copyright 1999 Aladdin Enterprises.
@@ -1,6 +1,6 @@
                          CUPS License Agreement

-		      Copyright 2007-2011 by Apple Inc.
+		      Copyright 2007-2012 by Apple Inc.
 			     1 Infinite Loop
 			  Cupertino, CA 95014 USA

@@ -68,11 +68,11 @@ the following special exceptions:
 	   source code of the Apple OS-Developed Software.

 	b. An Apple Operating System means any operating system
-	   software developed and/or marketed by Apple Computer,
-	   Inc., including but not limited to all existing
-	   releases and versions of Apple's Darwin, Mac OS X,
-	   and Mac OS X Server products and all follow-on
-	   releases and future versions thereof.
+	   software developed and/or marketed by Apple Inc.,
+	   including but not limited to all existing releases and
+	   versions of Apple's Darwin, OS X, and OS X Server
+	   products and all follow-on releases and future
+	   versions thereof.

 	c. This exception is only available for Apple
 	   OS-Developed Software and does not apply to software
@@ -24,7 +24,7 @@ CHMOD		=	@CHMOD@
 CXX		=	@LIBTOOL@ @CXX@
 DSO		=	@DSO@
 DSOXX		=	@DSOXX@
-HTMLDOC		=	@HTMLDOC@
+GZIP		=	@GZIP@
 INSTALL		=	@INSTALL@
 LD		=	@LD@
 LIBTOOL		=	@LIBTOOL@
@@ -41,6 +41,7 @@ SHELL		=	/bin/sh
 #

 INSTALL_BIN	=	$(LIBTOOL) $(INSTALL) -c -m 555 @INSTALL_STRIP@
+INSTALL_COMPDATA =	$(INSTALL) -c -m 444 @INSTALL_GZIP@
 INSTALL_CONFIG	=	$(INSTALL) -c -m @CUPS_CONFIG_FILE_PERM@
 INSTALL_DATA	=	$(INSTALL) -c -m 444
 INSTALL_DIR	=	$(INSTALL) -d
@@ -62,6 +63,7 @@ CUPS_PRIMARY_SYSTEM_GROUP =	@CUPS_PRIMARY_SYSTEM_GROUP@
 #

 CUPS_CONFIG_FILE_PERM = @CUPS_CONFIG_FILE_PERM@
+CUPS_CUPSD_FILE_PERM = @CUPS_CUPSD_FILE_PERM@
 CUPS_LOG_FILE_PERM = @CUPS_LOG_FILE_PERM@

 #
@@ -3,7 +3,7 @@
 #
 #   Top-level Makefile for CUPS.
 #
-#   Copyright 2007-2010 by Apple Inc.
+#   Copyright 2007-2012 by Apple Inc.
 #   Copyright 1997-2007 by Easy Software Products, all rights reserved.
 #
 #   These coded instructions, statements, and computer programs are the
@@ -275,10 +275,10 @@ docset:	apihelp
 		doc/help/api-*.tokens
 	$(RM) doc/help/api-*.tokens
 	echo Indexing docset...
-	/Developer/usr/bin/docsetutil index org.cups.docset
+	/Applications/Xcode.app/Contents/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 \
+	/Applications/Xcode.app/Contents/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 \
 		org.cups.docset
@@ -316,7 +316,6 @@ dist:	all
 	case `uname` in \
 		*BSD*) $(MAKE) $(MFLAGS) bsd;; \
 		Darwin*) $(MAKE) $(MFLAGS) osx;; \
-		IRIX*) $(MAKE) $(MFLAGS) tardist;; \
 		Linux*) test ! -x /usr/bin/rpm || $(MAKE) $(MFLAGS) rpm;; \
 		SunOS*) $(MAKE) $(MFLAGS) pkg;; \
 	esac
@@ -1,14 +1,21 @@
-README - CUPS v1.5.0 - 2011-07-25
----------------------------------
+README - CUPS v1.7b1 - 2013-04-18
+---------------------------------

-Looking for compile instructions?  Read the file "INSTALL.txt"
-instead...
+************************************************
+************************************************
+****                                        ****
+****  BETA SOFTWARE - USE AT YOUR OWN RISK  ****
+****                                        ****
+************************************************
+************************************************
+
+Looking for compile instructions?  Read the file "INSTALL.txt" instead...


 INTRODUCTION

    CUPS is a standards-based, open source printing system developed by Apple
-    Inc. for Mac OS® X and other UNIX®-like operating systems.  CUPS uses the
+    Inc. for OS® X and other UNIX®-like operating systems.  CUPS uses the
    Internet Printing Protocol ("IPP") and provides System V and Berkeley
    command-line interfaces, a web interface, and a C API to manage printers and
    print jobs.  It supports printing to both local (parallel, serial, USB) and
@@ -150,7 +157,7 @@ PRINTING FILES

 LEGAL STUFF

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

    The MD5 Digest code is Copyright 1999 Aladdin Enterprises.
@@ -1,72 +1,70 @@
-ipp.o: ipp.c backend-private.h ../cups/cups-private.h ../cups/cups.h \
-  ../cups/file.h ../cups/versioning.h ../cups/ipp.h ../cups/http.h \
-  ../cups/array.h ../cups/language.h ../cups/string-private.h \
-  ../config.h ../cups/debug-private.h ../cups/ppd-private.h \
-  ../cups/ppd.h ../cups/pwg-private.h ../cups/http-private.h \
-  ../cups/md5-private.h ../cups/ipp-private.h ../cups/language-private.h \
-  ../cups/transcode.h ../cups/thread-private.h ../cups/snmp-private.h \
-  ../cups/backend.h ../cups/sidechannel.h ../cups/array-private.h
+ipp.o: ipp.c backend-private.h ../cups/cups-private.h \
+  ../cups/string-private.h ../config.h ../cups/debug-private.h \
+  ../cups/versioning.h ../cups/ipp-private.h ../cups/ipp.h \
+  ../cups/http.h ../cups/array.h ../cups/http-private.h \
+  ../cups/md5-private.h ../cups/language-private.h ../cups/transcode.h \
+  ../cups/language.h ../cups/pwg-private.h ../cups/cups.h ../cups/file.h \
+  ../cups/ppd-private.h ../cups/ppd.h ../cups/thread-private.h \
+  ../cups/snmp-private.h ../cups/backend.h ../cups/sidechannel.h \
+  ../cups/array-private.h
 lpd.o: lpd.c ../cups/http-private.h ../config.h ../cups/http.h \
  ../cups/versioning.h ../cups/array.h ../cups/md5-private.h \
  ../cups/ipp-private.h ../cups/ipp.h backend-private.h \
-  ../cups/cups-private.h ../cups/cups.h ../cups/file.h \
-  ../cups/language.h ../cups/string-private.h ../cups/debug-private.h \
-  ../cups/ppd-private.h ../cups/ppd.h ../cups/pwg-private.h \
-  ../cups/language-private.h ../cups/transcode.h \
-  ../cups/thread-private.h ../cups/snmp-private.h ../cups/backend.h \
-  ../cups/sidechannel.h
-dnssd.o: dnssd.c backend-private.h ../cups/cups-private.h ../cups/cups.h \
-  ../cups/file.h ../cups/versioning.h ../cups/ipp.h ../cups/http.h \
-  ../cups/array.h ../cups/language.h ../cups/string-private.h \
-  ../config.h ../cups/debug-private.h ../cups/ppd-private.h \
-  ../cups/ppd.h ../cups/pwg-private.h ../cups/http-private.h \
-  ../cups/md5-private.h ../cups/ipp-private.h ../cups/language-private.h \
-  ../cups/transcode.h ../cups/thread-private.h ../cups/snmp-private.h \
-  ../cups/backend.h ../cups/sidechannel.h
-snmp.o: snmp.c backend-private.h ../cups/cups-private.h ../cups/cups.h \
-  ../cups/file.h ../cups/versioning.h ../cups/ipp.h ../cups/http.h \
-  ../cups/array.h ../cups/language.h ../cups/string-private.h \
-  ../config.h ../cups/debug-private.h ../cups/ppd-private.h \
-  ../cups/ppd.h ../cups/pwg-private.h ../cups/http-private.h \
-  ../cups/md5-private.h ../cups/ipp-private.h ../cups/language-private.h \
-  ../cups/transcode.h ../cups/thread-private.h ../cups/snmp-private.h \
-  ../cups/backend.h ../cups/sidechannel.h
+  ../cups/cups-private.h ../cups/string-private.h \
+  ../cups/debug-private.h ../cups/language-private.h ../cups/transcode.h \
+  ../cups/language.h ../cups/pwg-private.h ../cups/cups.h ../cups/file.h \
+  ../cups/ppd-private.h ../cups/ppd.h ../cups/thread-private.h \
+  ../cups/snmp-private.h ../cups/backend.h ../cups/sidechannel.h
+dnssd.o: dnssd.c backend-private.h ../cups/cups-private.h \
+  ../cups/string-private.h ../config.h ../cups/debug-private.h \
+  ../cups/versioning.h ../cups/ipp-private.h ../cups/ipp.h \
+  ../cups/http.h ../cups/array.h ../cups/http-private.h \
+  ../cups/md5-private.h ../cups/language-private.h ../cups/transcode.h \
+  ../cups/language.h ../cups/pwg-private.h ../cups/cups.h ../cups/file.h \
+  ../cups/ppd-private.h ../cups/ppd.h ../cups/thread-private.h \
+  ../cups/snmp-private.h ../cups/backend.h ../cups/sidechannel.h
+snmp.o: snmp.c backend-private.h ../cups/cups-private.h \
+  ../cups/string-private.h ../config.h ../cups/debug-private.h \
+  ../cups/versioning.h ../cups/ipp-private.h ../cups/ipp.h \
+  ../cups/http.h ../cups/array.h ../cups/http-private.h \
+  ../cups/md5-private.h ../cups/language-private.h ../cups/transcode.h \
+  ../cups/language.h ../cups/pwg-private.h ../cups/cups.h ../cups/file.h \
+  ../cups/ppd-private.h ../cups/ppd.h ../cups/thread-private.h \
+  ../cups/snmp-private.h ../cups/backend.h ../cups/sidechannel.h
 socket.o: socket.c ../cups/http-private.h ../config.h ../cups/http.h \
  ../cups/versioning.h ../cups/array.h ../cups/md5-private.h \
  ../cups/ipp-private.h ../cups/ipp.h backend-private.h \
-  ../cups/cups-private.h ../cups/cups.h ../cups/file.h \
-  ../cups/language.h ../cups/string-private.h ../cups/debug-private.h \
-  ../cups/ppd-private.h ../cups/ppd.h ../cups/pwg-private.h \
-  ../cups/language-private.h ../cups/transcode.h \
-  ../cups/thread-private.h ../cups/snmp-private.h ../cups/backend.h \
-  ../cups/sidechannel.h
+  ../cups/cups-private.h ../cups/string-private.h \
+  ../cups/debug-private.h ../cups/language-private.h ../cups/transcode.h \
+  ../cups/language.h ../cups/pwg-private.h ../cups/cups.h ../cups/file.h \
+  ../cups/ppd-private.h ../cups/ppd.h ../cups/thread-private.h \
+  ../cups/snmp-private.h ../cups/backend.h ../cups/sidechannel.h
 test1284.o: test1284.c ../cups/string-private.h ../config.h ieee1284.c \
-  backend-private.h ../cups/cups-private.h ../cups/cups.h ../cups/file.h \
-  ../cups/versioning.h ../cups/ipp.h ../cups/http.h ../cups/array.h \
-  ../cups/language.h ../cups/debug-private.h ../cups/ppd-private.h \
-  ../cups/ppd.h ../cups/pwg-private.h ../cups/http-private.h \
-  ../cups/md5-private.h ../cups/ipp-private.h ../cups/language-private.h \
-  ../cups/transcode.h ../cups/thread-private.h ../cups/snmp-private.h \
-  ../cups/backend.h ../cups/sidechannel.h
+  backend-private.h ../cups/cups-private.h ../cups/debug-private.h \
+  ../cups/versioning.h ../cups/ipp-private.h ../cups/ipp.h \
+  ../cups/http.h ../cups/array.h ../cups/http-private.h \
+  ../cups/md5-private.h ../cups/language-private.h ../cups/transcode.h \
+  ../cups/language.h ../cups/pwg-private.h ../cups/cups.h ../cups/file.h \
+  ../cups/ppd-private.h ../cups/ppd.h ../cups/thread-private.h \
+  ../cups/snmp-private.h ../cups/backend.h ../cups/sidechannel.h
 testbackend.o: testbackend.c ../cups/string-private.h ../config.h \
  ../cups/cups.h ../cups/file.h ../cups/versioning.h ../cups/ipp.h \
  ../cups/http.h ../cups/array.h ../cups/language.h \
  ../cups/sidechannel.h
 testsupplies.o: testsupplies.c backend-private.h ../cups/cups-private.h \
-  ../cups/cups.h ../cups/file.h ../cups/versioning.h ../cups/ipp.h \
-  ../cups/http.h ../cups/array.h ../cups/language.h \
  ../cups/string-private.h ../config.h ../cups/debug-private.h \
-  ../cups/ppd-private.h ../cups/ppd.h ../cups/pwg-private.h \
-  ../cups/http-private.h ../cups/md5-private.h ../cups/ipp-private.h \
-  ../cups/language-private.h ../cups/transcode.h \
-  ../cups/thread-private.h ../cups/snmp-private.h ../cups/backend.h \
-  ../cups/sidechannel.h
-usb.o: usb.c backend-private.h ../cups/cups-private.h ../cups/cups.h \
-  ../cups/file.h ../cups/versioning.h ../cups/ipp.h ../cups/http.h \
-  ../cups/array.h ../cups/language.h ../cups/string-private.h \
-  ../config.h ../cups/debug-private.h ../cups/ppd-private.h \
-  ../cups/ppd.h ../cups/pwg-private.h ../cups/http-private.h \
-  ../cups/md5-private.h ../cups/ipp-private.h ../cups/language-private.h \
-  ../cups/transcode.h ../cups/thread-private.h ../cups/snmp-private.h \
-  ../cups/backend.h ../cups/sidechannel.h usb-darwin.c \
-  ../cups/file-private.h
+  ../cups/versioning.h ../cups/ipp-private.h ../cups/ipp.h \
+  ../cups/http.h ../cups/array.h ../cups/http-private.h \
+  ../cups/md5-private.h ../cups/language-private.h ../cups/transcode.h \
+  ../cups/language.h ../cups/pwg-private.h ../cups/cups.h ../cups/file.h \
+  ../cups/ppd-private.h ../cups/ppd.h ../cups/thread-private.h \
+  ../cups/snmp-private.h ../cups/backend.h ../cups/sidechannel.h
+usb.o: usb.c backend-private.h ../cups/cups-private.h \
+  ../cups/string-private.h ../config.h ../cups/debug-private.h \
+  ../cups/versioning.h ../cups/ipp-private.h ../cups/ipp.h \
+  ../cups/http.h ../cups/array.h ../cups/http-private.h \
+  ../cups/md5-private.h ../cups/language-private.h ../cups/transcode.h \
+  ../cups/language.h ../cups/pwg-private.h ../cups/cups.h ../cups/file.h \
+  ../cups/ppd-private.h ../cups/ppd.h ../cups/thread-private.h \
+  ../cups/snmp-private.h ../cups/backend.h ../cups/sidechannel.h \
+  usb-darwin.c ../cups/file-private.h
@@ -21,6 +21,12 @@ include ../Makedefs
 # Object files...
 #

+# RBACKENDS are installed mode 0700 so cupsd will run them as root...
+#
+# UBACKENDS are installed mode 0755 so cupsd will run them as an unprivileged
+# user...
+#
+# See http://www.cups.org/documentation.php/api-filter.html for more info...
 RBACKENDS =	\
 		ipp \
 		lpd \
@@ -122,14 +128,15 @@ install-exec:	$(INSTALLXPC)
 		$(RM) $(SERVERBIN)/backend/$$file; \
 		$(LN) ipp $(SERVERBIN)/backend/$$file; \
 	done
-	if test "x$(DNSSD_BACKEND)" != x; then \
+	if test "x$(DNSSD_BACKEND)" != x -a `uname` = Darwin; then \
 		$(RM) $(SERVERBIN)/backend/mdns; \
 		$(LN) $(DNSSD_BACKEND) $(SERVERBIN)/backend/mdns; \
 	fi
 	if test "x$(SYMROOT)" != "x"; then \
 		$(INSTALL_DIR) $(SYMROOT); \
-		for file in $(TARGETS); do \
+		for file in $(RBACKENDS) $(UBACKENDS); do \
 			cp $$file $(SYMROOT); \
+			dsymutil $(SYMROOT)/$$file; \
 		done \
 	fi

@@ -226,8 +233,10 @@ libbackend.a:	$(LIBOBJS)
 dnssd:	dnssd.o ../cups/$(LIBCUPS) libbackend.a
 	echo Linking $@...
 	$(CC) $(LDFLAGS) -o dnssd dnssd.o libbackend.a $(LIBS)
-	$(RM) mdns
-	$(LN) dnssd mdns
+	if test `uname` = Darwin; then \
+		$(RM) mdns; \
+		$(LN) dnssd mdns; \
+	fi


 #
@@ -274,7 +283,7 @@ socket:	socket.o ../cups/$(LIBCUPS) libbackend.a

 usb:	usb.o ../cups/$(LIBCUPS) libbackend.a
 	echo Linking $@...
-	$(CC) $(LDFLAGS) -o usb usb.o libbackend.a $(LIBUSB) \
+	$(CC) $(ARCHFLAGS) $(LDFLAGS) -o usb usb.o libbackend.a $(LIBUSB) \
 		$(BACKLIBS) $(LIBS)
 usb.o:	usb.c usb-darwin.c usb-libusb.c usb-unix.c

@@ -3,7 +3,7 @@
 *
 *   Backend support definitions for CUPS.
 *
- *   Copyright 2007-2011 by Apple Inc.
+ *   Copyright 2007-2012 by Apple Inc.
 *   Copyright 1997-2007 by Easy Software Products, all rights reserved.
 *
 *   These coded instructions, statements, and computer programs are the
@@ -259,6 +259,20 @@ extern "C" {
 #define CUPS_TC_inserts				33
 #define CUPS_TC_covers				34

+#define CUPS_TC_tenThousandthsOfInches		3
+#define CUPS_TC_micrometers			4
+#define CUPS_TC_impressions			7
+#define CUPS_TC_sheets				8
+#define CUPS_TC_hours				11
+#define CUPS_TC_thousandthsOfOunces		12
+#define CUPS_TC_tenthsOfGrams			13
+#define CUPS_TC_hundrethsOfFluidOunces		14
+#define CUPS_TC_tenthsOfMilliliters		15
+#define CUPS_TC_feet				16
+#define CUPS_TC_meters				17
+#define CUPS_TC_items				18
+#define CUPS_TC_percent				19
+
 /* These come from RFC 3808 to define character sets we support */
 /* Also see http://www.iana.org/assignments/character-sets */
 #define CUPS_TC_csASCII				3
@@ -3,7 +3,7 @@
 *
 *   Line Printer Daemon backend for CUPS.
 *
- *   Copyright 2007-2011 by Apple Inc.
+ *   Copyright 2007-2012 by Apple Inc.
 *   Copyright 1997-2007 by Easy Software Products, all rights reserved.
 *
 *   These coded instructions, statements, and computer programs are the
@@ -19,7 +19,6 @@
 *   main()            - Send a file to the printer or server.
 *   lpd_command()     - Send an LPR command sequence and wait for a reply.
 *   lpd_queue()       - Queue a file using the Line Printer Daemon protocol.
- *   lpd_timeout()     - Handle timeout alarms...
 *   lpd_write()       - Write a buffer of data to an LPD server.
 *   rresvport_af()    - A simple implementation of rresvport_af().
 *   sigterm_handler() - Handle 'terminate' signals that stop the backend.
@@ -87,14 +86,13 @@ static int	abort_job = 0;		/* Non-zero if we get SIGTERM */
 * Local functions...
 */

-static int	lpd_command(int lpd_fd, int timeout, char *format, ...);
+static int	lpd_command(int lpd_fd, char *format, ...);
 static int	lpd_queue(const char *hostname, http_addrlist_t *addrlist,
 			  const char *printer, int print_fd, int snmp_fd,
 			  int mode, const char *user, const char *title,
 			  int copies, int banner, int format, int order,
 			  int reserve, int manual_copies, int timeout,
-			  int contimeout);
-static void	lpd_timeout(int sig);
+			  int contimeout, const char *orighost);
 static int	lpd_write(int lpd_fd, char *buffer, int length);
 #ifndef HAVE_RRESVPORT_AF
 static int	rresvport_af(int *port, int family);
@@ -128,6 +126,7 @@ main(int  argc,				/* I - Number of command-line arguments (6 or 7) */
  int		port;			/* Port number */
  char		portname[256];		/* Port name (string) */
  http_addrlist_t *addrlist;		/* List of addresses for printer */
+  int		snmp_enabled = 1;	/* Is SNMP enabled? */
  int		snmp_fd;		/* SNMP socket */
  int		fd;			/* Print file */
  int		status;			/* Status of LPD job */
@@ -146,6 +145,8 @@ main(int  argc,				/* I - Number of command-line arguments (6 or 7) */
 #if defined(HAVE_SIGACTION) && !defined(HAVE_SIGSET)
  struct sigaction action;		/* Actions for POSIX signals */
 #endif /* HAVE_SIGACTION && !HAVE_SIGSET */
+  int		num_jobopts;		/* Number of job options */
+  cups_option_t	*jobopts = NULL;	/* Job options */


 /*
@@ -193,6 +194,8 @@ main(int  argc,				/* I - Number of command-line arguments (6 or 7) */
    return (CUPS_BACKEND_FAILED);
  }

+  num_jobopts = cupsParseOptions(argv[5], 0, &jobopts);
+
 /*
  * Extract the hostname and printer name from the URI...
  */
@@ -354,7 +357,8 @@ main(int  argc,				/* I - Number of command-line arguments (6 or 7) */
 	*/

        if (!value[0] || !_cups_strcasecmp(value, "on") ||
-	    !_cups_strcasecmp(value, "yes") || !_cups_strcasecmp(value, "true") ||
+	    !_cups_strcasecmp(value, "yes") ||
+	    !_cups_strcasecmp(value, "true") ||
 	    !_cups_strcasecmp(value, "rfc1179"))
 	  reserve = RESERVE_RFC1179;
 	else if (!_cups_strcasecmp(value, "any"))
@@ -369,7 +373,8 @@ main(int  argc,				/* I - Number of command-line arguments (6 or 7) */
 	*/

        manual_copies = !value[0] || !_cups_strcasecmp(value, "on") ||
-	 		!_cups_strcasecmp(value, "yes") || !_cups_strcasecmp(value, "true");
+	 		!_cups_strcasecmp(value, "yes") ||
+	 		!_cups_strcasecmp(value, "true");
      }
      else if (!_cups_strcasecmp(name, "sanitize_title"))
      {
@@ -378,7 +383,18 @@ main(int  argc,				/* I - Number of command-line arguments (6 or 7) */
 	*/

        sanitize_title = !value[0] || !_cups_strcasecmp(value, "on") ||
-	 		 !_cups_strcasecmp(value, "yes") || !_cups_strcasecmp(value, "true");
+	 		 !_cups_strcasecmp(value, "yes") ||
+	 		 !_cups_strcasecmp(value, "true");
+      }
+      else if (!_cups_strcasecmp(name, "snmp"))
+      {
+        /*
+         * Enable/disable SNMP stuff...
+         */
+
+         snmp_enabled = !value[0] || !_cups_strcasecmp(value, "on") ||
+                        _cups_strcasecmp(value, "yes") ||
+                        _cups_strcasecmp(value, "true");
      }
      else if (!_cups_strcasecmp(name, "timeout"))
      {
@@ -426,7 +442,10 @@ main(int  argc,				/* I - Number of command-line arguments (6 or 7) */
    }
  }

-  snmp_fd = _cupsSNMPOpen(addrlist->addr.addr.sa_family);
+  if (snmp_enabled)
+    snmp_fd = _cupsSNMPOpen(addrlist->addr.addr.sa_family);
+  else
+    snmp_fd = -1;

 /*
  * Wait for data from the filter...
@@ -527,7 +546,9 @@ main(int  argc,				/* I - Number of command-line arguments (6 or 7) */

    status = lpd_queue(hostname, addrlist, resource + 1, fd, snmp_fd, mode,
                       username, title, copies, banner, format, order, reserve,
-		       manual_copies, timeout, contimeout);
+		       manual_copies, timeout, contimeout,
+		       cupsGetOption("job-originating-host-name", num_jobopts,
+		                     jobopts));

    if (!status)
      fprintf(stderr, "PAGE: 1 %d\n", atoi(argv[4]));
@@ -535,7 +556,9 @@ main(int  argc,				/* I - Number of command-line arguments (6 or 7) */
  else
    status = lpd_queue(hostname, addrlist, resource + 1, fd, snmp_fd, mode,
                       username, title, 1, banner, format, order, reserve, 1,
-		       timeout, contimeout);
+		       timeout, contimeout,
+		       cupsGetOption("job-originating-host-name", num_jobopts,
+		                     jobopts));

 /*
  * Remove the temporary file if necessary...
@@ -564,7 +587,6 @@ main(int  argc,				/* I - Number of command-line arguments (6 or 7) */

 static int			/* O - Status of command */
 lpd_command(int  fd,		/* I - Socket connection to LPD host */
-            int  timeout,	/* I - Seconds to wait for a response */
            char *format,	/* I - printf()-style format string */
            ...)		/* I - Additional args as necessary */
 {
@@ -609,18 +631,12 @@ lpd_command(int  fd,		/* I - Socket connection to LPD host */

  fputs("DEBUG: Reading command status...\n", stderr);

-  alarm(timeout);
-
  if (recv(fd, &status, 1, 0) < 1)
  {
-    _cupsLangPrintFilter(stderr, "WARNING",
-		         _("Printer did not respond after %d seconds."),
-			 timeout);
+    _cupsLangPrintFilter(stderr, "WARNING", _("The printer did not respond."));
    status = errno;
  }

-  alarm(0);
-
  fprintf(stderr, "DEBUG: lpd_command returning %d\n", status);

  return (status);
@@ -647,7 +663,8 @@ lpd_queue(const char      *hostname,	/* I - Host to connect to */
 	  int             reserve,	/* I - Reserve ports? */
 	  int             manual_copies,/* I - Do copies by hand... */
 	  int             timeout,	/* I - Timeout... */
-	  int             contimeout)	/* I - Connection timeout */
+	  int             contimeout,	/* I - Connection timeout */
+	  const char      *orighost)	/* I - job-originating-host-name */
 {
  char			localhost[255];	/* Local host name */
  int			error;		/* Error number */
@@ -666,26 +683,12 @@ lpd_queue(const char      *hostname,	/* I - Host to connect to */
  size_t		nbytes;		/* Number of bytes written */
  off_t			tbytes;		/* Total bytes written */
  char			buffer[32768];	/* Output buffer */
-#if defined(HAVE_SIGACTION) && !defined(HAVE_SIGSET)
-  struct sigaction	action;		/* Actions for POSIX signals */
-#endif /* HAVE_SIGACTION && !HAVE_SIGSET */
-
-
- /*
-  * Setup an alarm handler for timeouts...
-  */
-
-#ifdef HAVE_SIGSET /* Use System V signals over POSIX to avoid bugs */
-  sigset(SIGALRM, lpd_timeout);
-#elif defined(HAVE_SIGACTION)
-  memset(&action, 0, sizeof(action));
-
-  sigemptyset(&action.sa_mask);
-  action.sa_handler = lpd_timeout;
-  sigaction(SIGALRM, &action, NULL);
+#ifdef WIN32
+  DWORD			tv;		/* Timeout in milliseconds */
 #else
-  signal(SIGALRM, lpd_timeout);
-#endif /* HAVE_SIGSET */
+  struct timeval	tv;		/* Timeout in secs and usecs */
+#endif /* WIN32 */
+

 /*
  * Remember when we started trying to connect to the printer...
@@ -704,7 +707,7 @@ lpd_queue(const char      *hostname,	/* I - Host to connect to */
    */

    fprintf(stderr, "DEBUG: Connecting to %s:%d for printer %s\n", hostname,
-            _httpAddrPort(&(addrlist->addr)), printer);
+            httpAddrPort(&(addrlist->addr)), printer);
    _cupsLangPrintFilter(stderr, "INFO", _("Connecting to printer."));

    for (lport = reserve == RESERVE_RFC1179 ? 732 : 1024, addr = addrlist,
@@ -839,7 +842,7 @@ lpd_queue(const char      *hostname,	/* I - Host to connect to */
 	  case ECONNREFUSED :
 	  default :
 	      _cupsLangPrintFilter(stderr, "WARNING",
-	                           _("The printer is busy."));
+	                           _("The printer is in use."));
 	      break;
        }

@@ -864,12 +867,29 @@ lpd_queue(const char      *hostname,	/* I - Host to connect to */
      }
    }

+   /*
+    * Set the timeout...
+    */
+
+#ifdef WIN32
+    tv = (DWORD)(timeout * 1000);
+
+    setsockopt(fd, SOL_SOCKET, SO_RCVTIMEO, (char *)&tv, sizeof(tv));
+    setsockopt(fd, SOL_SOCKET, SO_SNDTIMEO, (char *)&tv, sizeof(tv));
+#else
+    tv.tv_sec  = timeout;
+    tv.tv_usec = 0;
+
+    setsockopt(fd, SOL_SOCKET, SO_RCVTIMEO, &tv, sizeof(tv));
+    setsockopt(fd, SOL_SOCKET, SO_SNDTIMEO, &tv, sizeof(tv));
+#endif /* WIN32 */
+
    fputs("STATE: -connecting-to-device\n", stderr);
    _cupsLangPrintFilter(stderr, "INFO", _("Connected to printer."));

    fprintf(stderr, "DEBUG: Connected to %s:%d (local port %d)...\n",
 	    httpAddrString(&(addr->addr), addrname, sizeof(addrname)),
-	    _httpAddrPort(&(addr->addr)), lport);
+	    httpAddrPort(&(addr->addr)), lport);

   /*
    * See if the printer supports SNMP...
@@ -926,14 +946,17 @@ lpd_queue(const char      *hostname,	/* I - Host to connect to */
    * literal output...
    */

-    if (lpd_command(fd, timeout, "\002%s\n",
+    if (lpd_command(fd, "\002%s\n",
                    printer))		/* Receive print job(s) */
    {
      close(fd);
      return (CUPS_BACKEND_FAILED);
    }

-    httpGetHostname(NULL, localhost, sizeof(localhost));
+    if (orighost && _cups_strcasecmp(orighost, "localhost"))
+      strlcpy(localhost, orighost, sizeof(localhost));
+    else
+      httpGetHostname(NULL, localhost, sizeof(localhost));

    snprintf(control, sizeof(control),
             "H%.31s\n"		/* RFC 1179, Section 7.2 - host name <= 31 chars */
@@ -978,7 +1001,7 @@ lpd_queue(const char      *hostname,	/* I - Host to connect to */
      * Send the control file...
      */

-      if (lpd_command(fd, timeout, "\002%d cfA%03.3d%.15s\n", strlen(control),
+      if (lpd_command(fd, "\002%d cfA%03.3d%.15s\n", strlen(control),
                      (int)getpid() % 1000, localhost))
      {
 	close(fd);
@@ -997,17 +1020,12 @@ lpd_queue(const char      *hostname,	/* I - Host to connect to */
      }
      else
      {
-        alarm(timeout);
-
        if (read(fd, &status, 1) < 1)
 	{
 	  _cupsLangPrintFilter(stderr, "WARNING",
-			       _("Printer did not respond after %d seconds."),
-			       timeout);
+	                       _("The printer did not respond."));
 	  status = errno;
 	}
-
-        alarm(0);
      }

      if (status != 0)
@@ -1033,7 +1051,7 @@ lpd_queue(const char      *hostname,	/* I - Host to connect to */
      * Send the print file...
      */

-      if (lpd_command(fd, timeout, "\003" CUPS_LLFMT " dfA%03.3d%.15s\n",
+      if (lpd_command(fd, "\003" CUPS_LLFMT " dfA%03.3d%.15s\n",
                      CUPS_LLCAST filestats.st_size, (int)getpid() % 1000,
 		      localhost))
      {
@@ -1084,17 +1102,12 @@ lpd_queue(const char      *hostname,	/* I - Host to connect to */
 	  * want to requeue it over and over...
 	  */

-	  alarm(timeout);
-
          if (recv(fd, &status, 1, 0) < 1)
 	  {
 	    _cupsLangPrintFilter(stderr, "WARNING",
-			         _("Printer did not respond after %d seconds."),
-			         timeout);
+			         _("The printer did not respond."));
 	    status = 0;
          }
-
-	  alarm(0);
 	}
      }
      else
@@ -1121,7 +1134,7 @@ lpd_queue(const char      *hostname,	/* I - Host to connect to */
      * Send control file...
      */

-      if (lpd_command(fd, timeout, "\002%d cfA%03.3d%.15s\n", strlen(control),
+      if (lpd_command(fd, "\002%d cfA%03.3d%.15s\n", strlen(control),
                      (int)getpid() % 1000, localhost))
      {
 	close(fd);
@@ -1139,17 +1152,12 @@ lpd_queue(const char      *hostname,	/* I - Host to connect to */
      }
      else
      {
-        alarm(timeout);
-
        if (read(fd, &status, 1) < 1)
 	{
 	  _cupsLangPrintFilter(stderr, "WARNING",
-			       _("Printer did not respond after %d seconds."),
-			       timeout);
+			       _("The printer did not respond."));
 	  status = errno;
 	}
-
-	alarm(0);
      }

      if (status != 0)
@@ -1192,21 +1200,6 @@ lpd_queue(const char      *hostname,	/* I - Host to connect to */
 }


-/*
- * 'lpd_timeout()' - Handle timeout alarms...
- */
-
-static void
-lpd_timeout(int sig)			/* I - Signal number */
-{
-  (void)sig;
-
-#if !defined(HAVE_SIGSET) && !defined(HAVE_SIGACTION)
-  signal(SIGALRM, lpd_timeout);
-#endif /* !HAVE_SIGSET && !HAVE_SIGACTION */
-}
-
-
 /*
 * 'lpd_write()' - Write a buffer of data to an LPD server.
 */
@@ -92,7 +92,7 @@ backendNetworkSideCB(
 	  status = CUPS_SC_STATUS_NOT_IMPLEMENTED;
 	else if (backendDrainOutput(print_fd, device_fd))
 	  status = CUPS_SC_STATUS_IO_ERROR;
-	else 
+	else
          status = CUPS_SC_STATUS_OK;

 	datalen = 0;
@@ -119,8 +119,35 @@ backendNetworkSideCB(

        if (snmp_fd >= 0)
 	{
+	  char		*dataptr;	/* Pointer into data */
 	  cups_snmp_t	packet;		/* Packet from printer */
+          const char	*snmp_value;	/* CUPS_SNMP_VALUE env var */

+          if ((snmp_value = getenv("CUPS_SNMP_VALUE")) != NULL)
+          {
+            const char	*snmp_count;	/* CUPS_SNMP_COUNT env var */
+            int		count;		/* Repetition count */
+
+            if ((snmp_count = getenv("CUPS_SNMP_COUNT")) != NULL)
+            {
+              if ((count = atoi(snmp_count)) <= 0)
+                count = 1;
+            }
+            else
+              count = 1;
+
+	    for (dataptr = data + strlen(data) + 1;
+	         count > 0 && dataptr < (data + sizeof(data) - 1);
+	         count --, dataptr += strlen(dataptr))
+	      strlcpy(dataptr, snmp_value, sizeof(data) - (dataptr - data));
+
+	    fprintf(stderr, "DEBUG: Returning %s %s\n", data,
+	            data + strlen(data) + 1);
+
+	    status  = CUPS_SC_STATUS_OK;
+	    datalen = dataptr - data;
+	    break;
+          }

          if (!_cupsSNMPStringToOID(data, packet.object_name, CUPS_SNMP_MAX_OID))
 	  {
@@ -141,7 +168,6 @@ backendNetworkSideCB(
          {
 	    if (_cupsSNMPRead(snmp_fd, &packet, 1.0))
 	    {
-	      char	*dataptr;	/* Pointer into data */
 	      int	i;		/* Looping var */


@@ -172,7 +198,7 @@ backendNetworkSideCB(
 	        case CUPS_ASN1_OCTET_STRING :
 		    if (packet.object_value.string.num_bytes < 0)
 		      i = 0;
-		    else if (packet.object_value.string.num_bytes < 
+		    else if (packet.object_value.string.num_bytes <
 			     (sizeof(data) - (dataptr - data)))
 		      i = packet.object_value.string.num_bytes;
 		    else
@@ -3,7 +3,7 @@
 *
 *   Common run loop APIs for CUPS backends.
 *
- *   Copyright 2007-2011 by Apple Inc.
+ *   Copyright 2007-2012 by Apple Inc.
 *   Copyright 2006-2007 by Easy Software Products, all rights reserved.
 *
 *   These coded instructions, statements, and computer programs are the
@@ -92,7 +92,8 @@ backendDrainOutput(int print_fd,	/* I - Print file descriptor */

      if (errno != EAGAIN || errno != EINTR)
      {
-        _cupsLangPrintError("ERROR", _("Unable to read print data"));
+	fprintf(stderr, "DEBUG: Read failed: %s\n", strerror(errno));
+	_cupsLangPrintFilter(stderr, "ERROR", _("Unable to read print data."));
 	return (-1);
      }

@@ -250,7 +251,7 @@ backendRunLoop(
 	{
 	  fputs("STATE: +offline-report\n", stderr);
 	  _cupsLangPrintFilter(stderr, "INFO",
-	                       _("Printer is not currently connected."));
+	                       _("The printer is not connected."));
 	  offline = 1;
 	}
 	else if (errno == EINTR && total_bytes == 0)
@@ -319,7 +320,9 @@ backendRunLoop(

 	if (errno != EAGAIN || errno != EINTR)
 	{
-	  _cupsLangPrintError("ERROR", _("Unable to read print data"));
+	  fprintf(stderr, "DEBUG: Read failed: %s\n", strerror(errno));
+	  _cupsLangPrintFilter(stderr, "ERROR",
+	                       _("Unable to read print data."));
 	  return (-1);
 	}

@@ -368,7 +371,7 @@ backendRunLoop(
 	  {
 	    fputs("STATE: +offline-report\n", stderr);
 	    _cupsLangPrintFilter(stderr, "INFO",
-	                         _("Printer is not currently connected."));
+	                         _("The printer is not connected."));
 	    offline = 1;
 	  }
 	}
@@ -389,7 +392,8 @@ backendRunLoop(
 	if (offline && update_state)
 	{
 	  fputs("STATE: -offline-report\n", stderr);
-	  _cupsLangPrintFilter(stderr, "INFO", _("Printer is now connected."));
+	  _cupsLangPrintFilter(stderr, "INFO",
+	                       _("The printer is now connected."));
 	  offline = 0;
 	}

@@ -434,9 +438,11 @@ backendWaitLoop(
    int          use_bc,		/* I - Use back-channel? */
    _cups_sccb_t side_cb)		/* I - Side-channel callback */
 {
-  fd_set	input;			/* Input set for reading */
-  time_t	curtime,		/* Current time */
-		snmp_update = 0;	/* Last SNMP status update */
+  int			nfds;		/* Number of file descriptors */
+  fd_set		input;		/* Input set for reading */
+  time_t		curtime = 0,	/* Current time */
+			snmp_update = 0;/* Last SNMP status update */
+  struct timeval	timeout;	/* Timeout for select() */


  fprintf(stderr, "DEBUG: backendWaitLoop(snmp_fd=%d, addr=%p, side_cb=%p)\n",
@@ -446,6 +452,9 @@ backendWaitLoop(
  * Now loop until we receive data from stdin...
  */

+  if (snmp_fd >= 0)
+    snmp_update = time(NULL) + 5;
+
  for (;;)
  {
   /*
@@ -457,7 +466,18 @@ backendWaitLoop(
    if (side_cb)
      FD_SET(CUPS_SC_FD, &input);

-    if (select(CUPS_SC_FD + 1, &input, NULL, NULL, NULL) < 0)
+    if (snmp_fd >= 0)
+    {
+      curtime         = time(NULL);
+      timeout.tv_sec  = curtime >= snmp_update ? 0 : snmp_update - curtime;
+      timeout.tv_usec = 0;
+
+      nfds = select(CUPS_SC_FD + 1, &input, NULL, NULL, &timeout);
+    }
+    else
+      nfds = select(CUPS_SC_FD + 1, &input, NULL, NULL, NULL);
+
+    if (nfds < 0)
    {
     /*
      * Pause printing to clear any pending errors...
@@ -501,10 +521,10 @@ backendWaitLoop(
    * Do SNMP updates periodically...
    */

-    if (snmp_fd >= 0 && time(&curtime) >= snmp_update)
+    if (snmp_fd >= 0 && curtime >= snmp_update)
    {
      if (backendSNMPSupplies(snmp_fd, addr, NULL, NULL))
-        snmp_update = INT_MAX;
+        snmp_fd = -1;
      else
        snmp_update = curtime + 5;
    }
@@ -3,7 +3,7 @@
 *
 *   SNMP supplies functions for CUPS.
 *
- *   Copyright 2008-2011 by Apple Inc.
+ *   Copyright 2008-2012 by Apple Inc.
 *
 *   These coded instructions, statements, and computer programs are the
 *   property of Apple Inc. and are protected by Federal copyright
@@ -36,14 +36,21 @@
 #define CUPS_MAX_SUPPLIES	32	/* Maximum number of supplies for a printer */
 #define CUPS_SUPPLY_TIMEOUT	2.0	/* Timeout for SNMP lookups */

-#define CUPS_DEVELOPER_LOW		1
-#define CUPS_DEVELOPER_EMPTY		2
-#define CUPS_MARKER_SUPPLY_LOW		4
-#define CUPS_MARKER_SUPPLY_EMPTY	8
-#define CUPS_OPC_NEAR_EOL		16
-#define CUPS_OPC_LIFE_OVER		32
-#define CUPS_TONER_LOW			64
-#define CUPS_TONER_EMPTY		128
+#define CUPS_DEVELOPER_LOW	0x0001
+#define CUPS_DEVELOPER_EMPTY	0x0002
+#define CUPS_MARKER_SUPPLY_LOW	0x0004
+#define CUPS_MARKER_SUPPLY_EMPTY 0x0008
+#define CUPS_OPC_NEAR_EOL	0x0010
+#define CUPS_OPC_LIFE_OVER	0x0020
+#define CUPS_TONER_LOW		0x0040
+#define CUPS_TONER_EMPTY	0x0080
+#define CUPS_WASTE_ALMOST_FULL	0x0100
+#define CUPS_WASTE_FULL		0x0200
+#define CUPS_CLEANER_NEAR_EOL	0x0400	/* Proposed JPS3 */
+#define CUPS_CLEANER_LIFE_OVER	0x0800	/* Proposed JPS3 */
+
+#define CUPS_SNMP_NONE		0x0000
+#define CUPS_SNMP_CAPACITY	0x0001	/* Supply levels reported as percentages */


 /*
@@ -75,6 +82,8 @@ static http_addr_t	current_addr;	/* Current address */
 static int		current_state = -1;
 					/* Current device state bits */
 static int		charset = -1;	/* Character set for supply names */
+static unsigned		quirks = CUPS_SNMP_NONE;
+					/* Quirks we have to work around */
 static int		num_supplies = 0;
 					/* Number of supplies found */
 static backend_supplies_t supplies[CUPS_MAX_SUPPLIES];
@@ -146,10 +155,17 @@ static const int	prtMarkerSuppliesType[] =
 			(sizeof(prtMarkerSuppliesType) /
 			 sizeof(prtMarkerSuppliesType[0]));
 			 		/* Offset to supply index */
+static const int	prtMarkerSuppliesSupplyUnit[] =
+			{ CUPS_OID_prtMarkerSuppliesSupplyUnit, -1 },
+					/* Units OID */
+			prtMarkerSuppliesSupplyUnitOffset =
+			(sizeof(prtMarkerSuppliesSupplyUnit) /
+			 sizeof(prtMarkerSuppliesSupplyUnit[0]));
+					/* Offset to supply index */

-static const backend_state_t const printer_states[] =
+static const backend_state_t printer_states[] =
 			{
-			  { CUPS_TC_lowPaper, "media-low-report" },
+			  /* { CUPS_TC_lowPaper, "media-low-report" }, */
 			  { CUPS_TC_noPaper | CUPS_TC_inputTrayEmpty, "media-empty-warning" },
 			  /* { CUPS_TC_lowToner, "toner-low-report" }, */ /* now use prtMarkerSupplies */
 			  /* { CUPS_TC_noToner, "toner-empty-warning" }, */ /* now use prtMarkerSupplies */
@@ -164,7 +180,7 @@ static const backend_state_t const printer_states[] =
 			  { CUPS_TC_outputFull, "output-area-full-warning" }
 			};

-static const backend_state_t const supply_states[] =
+static const backend_state_t supply_states[] =
 			{
 			  { CUPS_DEVELOPER_LOW, "developer-low-report" },
 			  { CUPS_DEVELOPER_EMPTY, "developer-empty-warning" },
@@ -173,7 +189,11 @@ static const backend_state_t const supply_states[] =
 			  { CUPS_OPC_NEAR_EOL, "opc-near-eol-report" },
 			  { CUPS_OPC_LIFE_OVER, "opc-life-over-warning" },
 			  { CUPS_TONER_LOW, "toner-low-report" },
-			  { CUPS_TONER_EMPTY, "toner-empty-warning" }
+			  { CUPS_TONER_EMPTY, "toner-empty-warning" },
+			  { CUPS_WASTE_ALMOST_FULL, "waste-receptacle-almost-full-report" },
+			  { CUPS_WASTE_FULL, "waste-receptacle-full-warning" },
+			  { CUPS_CLEANER_NEAR_EOL, "cleaner-life-almost-over-report" },
+			  { CUPS_CLEANER_LIFE_OVER, "cleaner-life-over-warning" },
 			};


@@ -231,6 +251,9 @@ backendSNMPSupplies(
    {
      if (supplies[i].max_capacity > 0 && supplies[i].level >= 0)
 	percent = 100 * supplies[i].level / supplies[i].max_capacity;
+      else if (supplies[i].level >= 0 && supplies[i].level <= 100 &&
+               (quirks & CUPS_SNMP_CAPACITY))
+        percent = supplies[i].level;
      else
        percent = 50;

@@ -245,9 +268,6 @@ backendSNMPSupplies(
              else
                new_supply_state |= CUPS_TONER_LOW;
              break;
-          case CUPS_TC_wasteToner :
-          case CUPS_TC_wasteInk :
-              break;
          case CUPS_TC_ink :
          case CUPS_TC_inkCartridge :
          case CUPS_TC_inkRibbon :
@@ -273,16 +293,34 @@ backendSNMPSupplies(
              else
                new_supply_state |= CUPS_OPC_NEAR_EOL;
              break;
+          case CUPS_TC_wasteInk :
+          case CUPS_TC_wastePaper :
+          case CUPS_TC_wasteToner :
+          case CUPS_TC_wasteWater :
+          case CUPS_TC_wasteWax :
+              if (percent <= 1)
+                new_supply_state |= CUPS_WASTE_FULL;
+              else
+                new_supply_state |= CUPS_WASTE_ALMOST_FULL;
+              break;
+          case CUPS_TC_cleanerUnit :
+          case CUPS_TC_fuserCleaningPad :
+              if (percent <= 1)
+                new_supply_state |= CUPS_CLEANER_LIFE_OVER;
+              else
+                new_supply_state |= CUPS_CLEANER_NEAR_EOL;
+              break;
        }
      }

      if (i)
        *ptr++ = ',';

-      if (supplies[i].max_capacity > 0 && supplies[i].level >= 0)
-        sprintf(ptr, "%d", percent);
+      if ((supplies[i].max_capacity > 0 || (quirks & CUPS_SNMP_CAPACITY)) &&
+          supplies[i].level >= 0)
+        snprintf(ptr, sizeof(value) - (ptr - value), "%d", percent);
      else
-        strcpy(ptr, "-1");
+        strlcpy(ptr, "-1", sizeof(value) - (ptr - value));
    }

    fprintf(stderr, "ATTR: marker-levels=%s\n", value);
@@ -408,7 +446,7 @@ backend_init_supplies(
 		cachefilename[1024],	/* Cache filename */
 		description[CUPS_SNMP_MAX_STRING],
 					/* Device description string */
-		value[CUPS_MAX_SUPPLIES * (CUPS_SNMP_MAX_STRING * 2 + 3)],
+		value[CUPS_MAX_SUPPLIES * (CUPS_SNMP_MAX_STRING * 4 + 3)],
 					/* Value string */
 		*ptr,			/* Pointer into value string */
 		*name_ptr;		/* Pointer into name string */
@@ -420,34 +458,34 @@ backend_init_supplies(
 		  "other",
 		  "unknown",
 		  "toner",
-		  "wasteToner",
+		  "waste-toner",
 		  "ink",
-		  "inkCartridge",
-		  "inkRibbon",
-		  "wasteInk",
+		  "ink-cartridge",
+		  "ink-ribbon",
+		  "waste-ink",
 		  "opc",
 		  "developer",
-		  "fuserOil",
-		  "solidWax",
-		  "ribbonWax",
-		  "wasteWax",
+		  "fuser-oil",
+		  "solid-wax",
+		  "ribbon-wax",
+		  "waste-wax",
 		  "fuser",
-		  "coronaWire",
-		  "fuserOilWick",
-		  "cleanerUnit",
-		  "fuserCleaningPad",
-		  "transferUnit",
-		  "tonerCartridge",
-		  "fuserOiler",
+		  "corona-wire",
+		  "fuser-oil-wick",
+		  "cleaner-unit",
+		  "fuser-cleaning-pad",
+		  "transfer-unit",
+		  "toner-cartridge",
+		  "fuser-oiler",
 		  "water",
-		  "wasteWater",
-		  "glueWaterAdditive",
-		  "wastePaper",
-		  "bindingSupply",
-		  "bandingSupply",
-		  "stitchingWire",
-		  "shrinkWrap",
-		  "paperWrap",
+		  "waste-water",
+		  "glue-water-additive",
+		  "waste-paper",
+		  "binding-supply",
+		  "banding-supply",
+		  "stitching-wire",
+		  "shrink-wrap",
+		  "paper-wrap",
 		  "staples",
 		  "inserts",
 		  "covers"
@@ -477,6 +515,12 @@ backend_init_supplies(
    return;
  }

+  if ((ppdattr = ppdFindAttr(ppd, "cupsSNMPQuirks", NULL)) != NULL)
+  {
+    if (!_cups_strcasecmp(ppdattr->value, "capacity"))
+      quirks |= CUPS_SNMP_CAPACITY;
+  }
+
  ppdClose(ppd);

 /*
@@ -638,7 +682,7 @@ backend_init_supplies(
  */

  for (i = 0; i < num_supplies; i ++)
-    strcpy(supplies[i].color, "none");
+    strlcpy(supplies[i].color, "none", sizeof(supplies[i].color));

  _cupsSNMPWalk(snmp_fd, &current_addr, CUPS_SNMP_VERSION_1,
                _cupsSNMPDefaultCommunity(), prtMarkerColorantValue,
@@ -653,13 +697,14 @@ backend_init_supplies(
    if (i)
      *ptr++ = ',';

-    strcpy(ptr, supplies[i].color);
+    strlcpy(ptr, supplies[i].color, sizeof(value) - (ptr - value));
  }

  fprintf(stderr, "ATTR: marker-colors=%s\n", value);

 /*
-  * Output the marker-names attribute...
+  * Output the marker-names attribute (the double quoting is necessary to deal
+  * with embedded quotes and commas in the marker names...)
  */

  for (i = 0, ptr = value; i < num_supplies; i ++)
@@ -667,15 +712,21 @@ backend_init_supplies(
    if (i)
      *ptr++ = ',';

+    *ptr++ = '\'';
    *ptr++ = '\"';
    for (name_ptr = supplies[i].name; *name_ptr;)
    {
-      if (*name_ptr == '\\' || *name_ptr == '\"')
+      if (*name_ptr == '\\' || *name_ptr == '\"' || *name_ptr == '\'')
+      {
        *ptr++ = '\\';
+        *ptr++ = '\\';
+        *ptr++ = '\\';
+      }

      *ptr++ = *name_ptr++;
    }
    *ptr++ = '\"';
+    *ptr++ = '\'';
  }

  *ptr = '\0';
@@ -694,9 +745,9 @@ backend_init_supplies(
    type = supplies[i].type;

    if (type < CUPS_TC_other || type > CUPS_TC_covers)
-      strcpy(ptr, "unknown");
+      strlcpy(ptr, "unknown", sizeof(value) - (ptr - value));
    else
-      strcpy(ptr, types[type - CUPS_TC_other]);
+      strlcpy(ptr, types[type - CUPS_TC_other], sizeof(value) - (ptr - value));
  }

  fprintf(stderr, "ATTR: marker-types=%s\n", value);
@@ -712,16 +763,33 @@ backend_walk_cb(cups_snmp_t *packet,	/* I - SNMP packet */
                void        *data)	/* I - User data (unused) */
 {
  int	i, j, k;			/* Looping vars */
-  static const char * const colors[8][2] =
+  static const char * const colors[][2] =
  {					/* Standard color names */
-    { "black",   "#000000" },
-    { "blue",    "#0000FF" },
-    { "cyan",    "#00FFFF" },
-    { "green",   "#00FF00" },
-    { "magenta", "#FF00FF" },
-    { "red",     "#FF0000" },
-    { "white",   "#FFFFFF" },
-    { "yellow",  "#FFFF00" }
+    { "black",         "#000000" },
+    { "blue",          "#0000FF" },
+    { "brown",         "#A52A2A" },
+    { "cyan",          "#00FFFF" },
+    { "dark-gray",     "#404040" },
+    { "dark gray",     "#404040" },
+    { "dark-yellow",   "#FFCC00" },
+    { "dark yellow",   "#FFCC00" },
+    { "gold",          "#FFD700" },
+    { "gray",          "#808080" },
+    { "green",         "#00FF00" },
+    { "light-black",   "#606060" },
+    { "light black",   "#606060" },
+    { "light-cyan",    "#E0FFFF" },
+    { "light cyan",    "#E0FFFF" },
+    { "light-gray",    "#D3D3D3" },
+    { "light gray",    "#D3D3D3" },
+    { "light-magenta", "#FF77FF" },
+    { "light magenta", "#FF77FF" },
+    { "magenta",       "#FF00FF" },
+    { "orange",        "#FFA500" },
+    { "red",           "#FF0000" },
+    { "silver",        "#C0C0C0" },
+    { "white",         "#FFFFFF" },
+    { "yellow",        "#FFFF00" }
  };


@@ -743,9 +811,10 @@ backend_walk_cb(cups_snmp_t *packet,	/* I - SNMP packet */
      if (supplies[j].colorant == i)
      {
 	for (k = 0; k < (int)(sizeof(colors) / sizeof(colors[0])); k ++)
-	  if (!strcmp(colors[k][0], (char *)packet->object_value.string.bytes))
+	  if (!_cups_strcasecmp(colors[k][0],
+	                        (char *)packet->object_value.string.bytes))
 	  {
-	    strcpy(supplies[j].color, colors[k][1]);
+	    strlcpy(supplies[j].color, colors[k][1], sizeof(supplies[j].color));
 	    break;
 	  }
      }
@@ -834,7 +903,6 @@ backend_walk_cb(cups_snmp_t *packet,	/* I - SNMP packet */
          {
 	    char	*src, *dst;	/* Pointers into strings */

-
           /*
 	    * Loop safe because both the object_value and supplies char arrays
 	    * are CUPS_SNMP_MAX_STRING elements long.
@@ -879,7 +947,8 @@ backend_walk_cb(cups_snmp_t *packet,	/* I - SNMP packet */

    supplies[i - 1].level = packet->object_value.integer;
  }
-  else if (_cupsSNMPIsOIDPrefixed(packet, prtMarkerSuppliesMaxCapacity))
+  else if (_cupsSNMPIsOIDPrefixed(packet, prtMarkerSuppliesMaxCapacity) &&
+           !(quirks & CUPS_SNMP_CAPACITY))
  {
   /*
    * Get max capacity...
@@ -896,7 +965,9 @@ backend_walk_cb(cups_snmp_t *packet,	/* I - SNMP packet */
    if (i > num_supplies)
      num_supplies = i;

-    supplies[i - 1].max_capacity = packet->object_value.integer;
+    if (supplies[i - 1].max_capacity == 0 &&
+        packet->object_value.integer > 0)
+      supplies[i - 1].max_capacity = packet->object_value.integer;
  }
  else if (_cupsSNMPIsOIDPrefixed(packet, prtMarkerSuppliesType))
  {
@@ -917,6 +988,26 @@ backend_walk_cb(cups_snmp_t *packet,	/* I - SNMP packet */

    supplies[i - 1].type = packet->object_value.integer;
  }
+  else if (_cupsSNMPIsOIDPrefixed(packet, prtMarkerSuppliesSupplyUnit))
+  {
+   /*
+    * Get units for capacity...
+    */
+
+    i = packet->object_name[prtMarkerSuppliesSupplyUnitOffset];
+    if (i < 1 || i > CUPS_MAX_SUPPLIES ||
+        packet->object_type != CUPS_ASN1_INTEGER)
+      return;
+
+    fprintf(stderr, "DEBUG2: prtMarkerSuppliesSupplyUnit.1.%d = %d\n", i,
+            packet->object_value.integer);
+
+    if (i > num_supplies)
+      num_supplies = i;
+
+    if (packet->object_value.integer == CUPS_TC_percent)
+      supplies[i - 1].max_capacity = 100;
+  }
 }


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

 #ifdef AF_INET6
  if ((ipv6 = _cupsSNMPOpen(AF_INET6)) < 0)
-    return (1);
+    perror("DEBUG: Unable to create IPv6 socket");
 #else
  ipv6 = -1;
 #endif /* AF_INET6 */
@@ -1025,6 +1025,11 @@ read_snmp_response(int fd)		/* I - SNMP socket file descriptor */
 	    * Description is the IEEE-1284 device ID...
 	    */

+            char *ptr;			/* Pointer into device ID */
+
+            for (ptr = (char *)packet.object_value.string.bytes; *ptr; ptr ++)
+              if (*ptr == '\n')
+                *ptr = ';';		/* A lot of bad printers put a newline */
 	    if (!device->id)
 	      device->id = strdup((char *)packet.object_value.string.bytes);

@@ -1066,8 +1071,11 @@ read_snmp_response(int fd)		/* I - SNMP socket file descriptor */
 	  */

 	  char	make_model[256];	/* Make and model */
+          char *ptr;			/* Pointer into device ID */

-
+          for (ptr = (char *)packet.object_value.string.bytes; *ptr; ptr ++)
+            if (*ptr == '\n')
+              *ptr = ';';		/* A lot of bad printers put a newline */
 	  if (device->id)
 	    free(device->id);

@@ -3,7 +3,7 @@
 *
 *   AppSocket backend for CUPS.
 *
- *   Copyright 2007-2011 by Apple Inc.
+ *   Copyright 2007-2012 by Apple Inc.
 *   Copyright 1997-2007 by Easy Software Products, all rights reserved.
 *
 *   These coded instructions, statements, and computer programs are the
@@ -73,10 +73,6 @@ main(int  argc,				/* I - Number of command-line arguments (6 or 7) */
  int		print_fd;		/* Print file */
  int		copies;			/* Number of copies to print */
  time_t	start_time;		/* Time of first connect */
-#ifdef __APPLE__
-  time_t	current_time,		/* Current time */
-		wait_time;		/* Time to wait before shutting down socket */
-#endif /* __APPLE__ */
  int		contimeout;		/* Connection timeout */
  int		waiteof;		/* Wait for end-of-file? */
  int		port;			/* Port number */
@@ -87,6 +83,7 @@ main(int  argc,				/* I - Number of command-line arguments (6 or 7) */
  http_addrlist_t *addrlist,		/* Address list */
 		*addr;			/* Connected address */
  char		addrname[256];		/* Address name */
+  int		snmp_enabled = 1;	/* Is SNMP enabled? */
  int		snmp_fd,		/* SNMP socket */
 		start_count,		/* Page count via SNMP at start */
 		page_count,		/* Page count via SNMP */
@@ -246,6 +243,16 @@ main(int  argc,				/* I - Number of command-line arguments (6 or 7) */
        waiteof = !value[0] || !_cups_strcasecmp(value, "on") ||
 		  !_cups_strcasecmp(value, "yes") || !_cups_strcasecmp(value, "true");
      }
+      else if (!_cups_strcasecmp(name, "snmp"))
+      {
+        /*
+         * Enable/disable SNMP stuff...
+         */
+
+         snmp_enabled = !value[0] || !_cups_strcasecmp(value, "on") ||
+                        _cups_strcasecmp(value, "yes") ||
+                        _cups_strcasecmp(value, "true");
+      }
      else if (!_cups_strcasecmp(name, "contimeout"))
      {
       /*
@@ -286,11 +293,14 @@ main(int  argc,				/* I - Number of command-line arguments (6 or 7) */
  * See if the printer supports SNMP...
  */

-  if ((snmp_fd = _cupsSNMPOpen(addrlist->addr.addr.sa_family)) >= 0)
-  {
+  if (snmp_enabled)
+    snmp_fd = _cupsSNMPOpen(addrlist->addr.addr.sa_family);
+  else
+    snmp_fd = -1;
+
+  if (snmp_fd >= 0)
    have_supplies = !backendSNMPSupplies(snmp_fd, &(addrlist->addr),
                                         &start_count, NULL);
-  }
  else
    have_supplies = start_count = 0;

@@ -371,7 +381,7 @@ main(int  argc,				/* I - Number of command-line arguments (6 or 7) */
 	  case ECONNREFUSED :
 	  default :
 	      _cupsLangPrintFilter(stderr, "WARNING",
-	                           _("The printer is busy."));
+	                           _("The printer is in use."));
 	      break;
        }

@@ -396,7 +406,7 @@ main(int  argc,				/* I - Number of command-line arguments (6 or 7) */

  fprintf(stderr, "DEBUG: Connected to %s:%d...\n",
 	  httpAddrString(&(addr->addr), addrname, sizeof(addrname)),
-	  _httpAddrPort(&(addr->addr)));
+	  httpAddrPort(&(addr->addr)));

 /*
  * Print everything...
@@ -424,17 +434,6 @@ main(int  argc,				/* I - Number of command-line arguments (6 or 7) */
      _cupsLangPrintFilter(stderr, "INFO", _("Print file sent."));
  }

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

-  _cupsLangPrintFilter(stderr, "INFO", _("Ready to print."));
-
  return (CUPS_BACKEND_OK);
 }

@@ -98,12 +98,18 @@ main(int  argc,				/* I - Number of command-line args */
      (ptr = strrchr(libpath, '/')) != NULL && !strcmp(ptr, "/backend"))
  {
    strlcpy(ptr, "/cups", sizeof(libpath) - (ptr - libpath));
-    if (access(libpath, 0))
+    if (!access(libpath, 0))
+    {
 #ifdef __APPLE__
+      fprintf(stderr, "Setting DYLD_LIBRARY_PATH to \"%s\".\n", libpath);
      setenv("DYLD_LIBRARY_PATH", libpath, 1);
 #else
+      fprintf(stderr, "Setting LD_LIBRARY_PATH to \"%s\".\n", libpath);
      setenv("LD_LIBRARY_PATH", libpath, 1);
 #endif /* __APPLE__ */
+    }
+    else
+      perror(libpath);
  }

 /*
@@ -567,13 +573,13 @@ main(int  argc,				/* I - Number of command-line args */

      length   = sizeof(buffer);
      scstatus = cupsSideChannelSNMPGet(oid, buffer, &length, 5.0);
-      printf("CUPS_SC_CMD_SNMP_GET %s returned %s, %s\n", oid,
-	     statuses[scstatus], buffer);
+      printf("CUPS_SC_CMD_SNMP_GET %s returned %s, %d bytes (%s)\n", oid,
+	     statuses[scstatus], (int)length, buffer);

      length   = sizeof(buffer);
      scstatus = cupsSideChannelSNMPGet(oid, buffer, &length, 5.0);
-      printf("CUPS_SC_CMD_SNMP_GET %s returned %s, %s\n", oid,
-	     statuses[scstatus], buffer);
+      printf("CUPS_SC_CMD_SNMP_GET %s returned %s, %d bytes (%s)\n", oid,
+	     statuses[scstatus], (int)length, buffer);
    }

    length   = 0;
@@ -632,13 +638,13 @@ sigterm_handler(int sig)		/* I - Signal */
 static void
 usage(void)
 {
-  puts("Usage: testbackend [-cancel] [-d] [-ps | -pcl] [-s [-oid OID] "
+  puts("Usage: testbackend [-cancel] [-d] [-ps | -pcl] [-s [-get 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("  -get 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)");
  puts("  -pcl        Send PCL+PJL query and test page to backend.");
  puts("  -ps         Send PostScript query and test page to backend.");
@@ -661,7 +667,7 @@ walk_cb(const char *oid,		/* I - OID */
 	int        datalen,		/* I - Length of data */
 	void       *context)		/* I - Context (unused) */
 {
-  printf("CUPS_SC_CMD_SNMP_WALK %s=%s (%d bytes)\n", oid, data, datalen);
+  printf("CUPS_SC_CMD_SNMP_WALK %s, %d bytes (%s)\n", oid, datalen, data);
 }


@@ -1,7 +1,7 @@
 /*
 * "$Id$"
 *
-* Copyright 2005-2011 Apple Inc. All rights reserved.
+* Copyright 2005-2013 Apple Inc. All rights reserved.
 *
 * IMPORTANT:  This Apple software is supplied to you by Apple Computer,
 * Inc. ("Apple") in consideration of your agreement to the following
@@ -96,6 +96,7 @@
 #include <CoreFoundation/CoreFoundation.h>
 #include <IOKit/usb/IOUSBLib.h>
 #include <IOKit/IOCFPlugIn.h>
+#include <libproc.h>

 #include <spawn.h>
 #include <pthread.h>
@@ -134,6 +135,26 @@ extern char **environ;
 #define kUSBGenericTOPrinterClassDriver	CFSTR("/System/Library/Printers/Libraries/USBGenericPrintingClass.plugin")
 #define kUSBPrinterClassDeviceNotOpen	-9664	/*kPMInvalidIOMContext*/

+#define CRSetCrashLogMessage(m) _crc_make_setter(message, m)
+#define _crc_make_setter(attr, arg) (gCRAnnotations.attr = (uint64_t)(unsigned long)(arg))
+#define CRASH_REPORTER_CLIENT_HIDDEN __attribute__((visibility("hidden")))
+#define CRASHREPORTER_ANNOTATIONS_VERSION 4
+#define CRASHREPORTER_ANNOTATIONS_SECTION "__crash_info"
+
+struct crashreporter_annotations_t {
+	uint64_t version;		// unsigned long
+	uint64_t message;		// char *
+	uint64_t signature_string;	// char *
+	uint64_t backtrace;		// char *
+	uint64_t message2;		// char *
+	uint64_t thread;		// uint64_t
+	uint64_t dialog_mode;		// unsigned int
+};
+
+CRASH_REPORTER_CLIENT_HIDDEN
+struct crashreporter_annotations_t gCRAnnotations
+	__attribute__((section("__DATA," CRASHREPORTER_ANNOTATIONS_SECTION)))
+	= { CRASHREPORTER_ANNOTATIONS_VERSION, 0, 0, 0, 0, 0, 0 };

 /*
 * Section 5.3 USB Printing Class spec
@@ -179,7 +200,7 @@ typedef struct classdriver_s		/**** g.classdriver context ****/
  UInt16		vendorID;		/* Vendor id */
  UInt16		productID;		/* Product id */
  printer_interface_t	interface;		/* identify the device to IOKit */
-  UInt8		  	outpipe;		/* mandatory bulkOut pipe */
+  UInt8			outpipe;		/* mandatory bulkOut pipe */
  UInt8			inpipe;			/* optional bulkIn pipe */

  /* general class requests */
@@ -259,6 +280,7 @@ typedef struct globals_s
 */

 globals_t g = { 0 };			/* Globals */
+int Iterating = 0;			/* Are we iterating the bus? */


 /*
@@ -293,6 +315,7 @@ 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 void sigterm_handler(int sig);	/* SIGTERM handler */
+static void sigquit_handler(int sig, siginfo_t *si, void *unused);

 #ifdef PARSE_PS_ERRORS
 static const char *next_line (const char *buffer);
@@ -344,10 +367,20 @@ print_device(const char *uri,		/* I - Device URI */
  struct timeval  *timeout,		/* Timeout pointer */
 		  tv;			/* Time value */
  struct timespec cond_timeout;		/* pthread condition timeout */
+  struct sigaction action;		/* Actions for POSIX signals */


  (void)uri;

+ /*
+  * Catch SIGQUIT to determine who is sending it...
+  */
+
+  memset(&action, 0, sizeof(action));
+  action.sa_sigaction = sigquit_handler;
+  action.sa_flags = SA_SIGINFO;
+  sigaction(SIGQUIT, &action, NULL);
+
 /*
  * See if the side-channel descriptor is valid...
  */
@@ -472,9 +505,6 @@ print_device(const char *uri,		/* I - Device URI */

  if (!print_fd)
  {
-    struct sigaction	action;		/* POSIX signal action */
-
-
    memset(&action, 0, sizeof(action));

    sigemptyset(&action.sa_mask);
@@ -684,7 +714,7 @@ print_device(const char *uri,		/* I - Device URI */

       /*
 	* Ignore timeout errors, but retain the number of bytes written to
-	* avoid sending duplicate data (<rdar://problem/6254911>)...
+	* avoid sending duplicate data...
 	*/

 	if (iostatus == kIOUSBTransactionTimeout)
@@ -707,7 +737,7 @@ print_device(const char *uri,		/* I - Device URI */

       /*
 	* Retry a write after an aborted write since we probably just got
-	* SIGTERM (<rdar://problem/6860126>)...
+	* SIGTERM...
 	*/

 	else if (iostatus == kIOReturnAborted)
@@ -820,10 +850,10 @@ print_device(const char *uri,		/* I - Device URI */
   /*
    * If it didn't exit abort the pending read and wait an additional second...
    */
-  
+
    if (!g.read_thread_done)
    {
-      fputs("DEBUG: Read thread still active, aborting the pending read...\n", 
+      fputs("DEBUG: Read thread still active, aborting the pending read...\n",
 	    stderr);

      g.wait_eof = 0;
@@ -833,7 +863,7 @@ print_device(const char *uri,		/* I - Device URI */
      gettimeofday(&tv, NULL);
      cond_timeout.tv_sec  = tv.tv_sec + 1;
      cond_timeout.tv_nsec = tv.tv_usec * 1000;
-  
+
      while (!g.read_thread_done)
      {
 	if (pthread_cond_timedwait(&g.read_thread_cond, &g.read_thread_mutex,
@@ -1077,6 +1107,8 @@ sidechannel_thread(void *reference)
 static void iterate_printers(iterator_callback_t callBack,
 			     void *userdata)
 {
+  Iterating = 1;
+
  mach_port_t	masterPort = 0x0;
  kern_return_t kr = IOMasterPort (bootstrap_port, &masterPort);

@@ -1100,7 +1132,7 @@ static void iterate_printers(iterator_callback_t callBack,
    CFRelease(usb_klass);
    CFRelease(usb_subklass);

-    kr = IOServiceAddMatchingNotification(addNotification, kIOMatchedNotification, usbPrinterMatchDictionary, &device_added, &reference, &addIterator);
+    IOServiceAddMatchingNotification(addNotification, kIOMatchedNotification, usbPrinterMatchDictionary, &device_added, &reference, &addIterator);
    if (addIterator != 0x0)
    {
      device_added (&reference, addIterator);
@@ -1114,6 +1146,8 @@ static void iterate_printers(iterator_callback_t callBack,
    }
    mach_port_deallocate(mach_task_self(), masterPort);
  }
+
+  Iterating = 0;
 }


@@ -1137,7 +1171,7 @@ static void device_added(void *userdata,

  /* One last call to the call back now that we are not longer have printers left to iterate...
   */
-  if (reference->keepRunning)
+  if (reference->keepRunning && reference->callback)
    reference->keepRunning = reference->callback(reference->userdata, 0x0);

  if (!reference->keepRunning)
@@ -1180,12 +1214,12 @@ static Boolean list_device_cb(void *refcon,
      if (!make ||
          !CFStringGetCString(make, makestr, sizeof(makestr),
 			      kCFStringEncodingUTF8))
-        strcpy(makestr, "Unknown");
+        strlcpy(makestr, "Unknown", sizeof(makestr));

      if (!model ||
          !CFStringGetCString(model, &modelstr[1], sizeof(modelstr)-1,
 			      kCFStringEncodingUTF8))
-        strcpy(modelstr + 1, "Printer");
+        strlcpy(modelstr + 1, "Printer", sizeof(modelstr) - 1);

      optionsstr[0] = '\0';
      if (serial != NULL)
@@ -1283,7 +1317,7 @@ static Boolean find_device_cb(void *refcon,
  if (!keepLooking && g.status_timer != NULL)
  {
    fputs("STATE: -offline-report\n", stderr);
-    _cupsLangPrintFilter(stderr, "INFO", _("Printer is now online."));
+    _cupsLangPrintFilter(stderr, "INFO", _("The printer is now online."));
    CFRunLoopRemoveTimer(CFRunLoopGetCurrent(), g.status_timer, kCFRunLoopDefaultMode);
    CFRelease(g.status_timer);
    g.status_timer = NULL;
@@ -1304,7 +1338,7 @@ static void status_timer_cb(CFRunLoopTimerRef timer,
  (void)info;

  fputs("STATE: +offline-report\n", stderr);
-  _cupsLangPrintFilter(stderr, "INFO", _("Printer is offline."));
+  _cupsLangPrintFilter(stderr, "INFO", _("The printer is offline."));

  if (getenv("CLASS") != NULL)
  {
@@ -1402,7 +1436,7 @@ static kern_return_t load_classdriver(CFStringRef	    driverPath,

  _cups_fc_result_t result = _cupsFileCheck(bundlestr,
                                            _CUPS_FILE_CHECK_DIRECTORY, 1,
-                                            _cupsFileCheckFilter, NULL);
+                                            Iterating ? NULL : _cupsFileCheckFilter, NULL);

  if (result && driverPath)
    return (load_classdriver(NULL, interface, printerDriver));
@@ -1569,11 +1603,12 @@ static kern_return_t registry_close(void)
 static OSStatus copy_deviceid(classdriver_t **classdriver,
 			      CFStringRef *deviceID)
 {
-  CFStringRef devID = NULL,
-
-  deviceMake = NULL,
-  deviceModel = NULL,
-  deviceSerial = NULL;
+  CFStringRef devID = NULL;
+  CFStringRef deviceMake = NULL;
+  CFStringRef deviceModel = NULL;
+  CFStringRef deviceSerial = NULL;
+  
+  *deviceID = NULL;

  OSStatus err = (*classdriver)->GetDeviceID(classdriver, &devID, DEFAULT_TIMEOUT);

@@ -1619,12 +1654,10 @@ static OSStatus copy_deviceid(classdriver_t **classdriver,

      if (deviceSerial == NULL && desc.iSerialNumber != 0)
      {
-	CFStringRef data = NULL;
-	err = (*classdriver)->GetString(classdriver, desc.iSerialNumber, kUSBLanguageEnglish, DEFAULT_TIMEOUT, &data);
-	if (data != NULL)
+	err = (*classdriver)->GetString(classdriver, desc.iSerialNumber, kUSBLanguageEnglish, DEFAULT_TIMEOUT, &deviceSerial);
+	if (deviceSerial != NULL)
 	{
-	  CFStringAppendFormat(newDevID, NULL, CFSTR("SERN:%@;"), data);
-	  CFRelease(data);
+	  CFStringAppendFormat(newDevID, NULL, CFSTR("SERN:%@;"), deviceSerial);
 	}
      }

@@ -1641,6 +1674,21 @@ static OSStatus copy_deviceid(classdriver_t **classdriver,
  {
    *deviceID = devID;
  }
+
+  if (*deviceID == NULL)
+      return err;
+
+  /* Remove special characters from the serial number */
+  CFRange range = (deviceSerial != NULL ? CFStringFind(deviceSerial, CFSTR("+"), 0) : CFRangeMake(0, 0));
+  if (range.length == 1) {
+      range = CFStringFind(*deviceID, deviceSerial, 0);
+      
+      CFMutableStringRef deviceIDString = CFStringCreateMutableCopy(NULL, 0, *deviceID);
+      CFStringFindAndReplace(deviceIDString, CFSTR("+"), CFSTR(""), range, 0);
+      CFRelease(*deviceID);
+      *deviceID = deviceIDString;
+  }
+  
  release_deviceinfo(&deviceMake, &deviceModel, &deviceSerial);

  return err;
@@ -1685,7 +1733,7 @@ static void copy_devicestring(io_service_t usbInterface,
 	kr = load_classdriver(NULL, interface, &klassDriver);

      if (kr == kIOReturnSuccess && klassDriver != NULL)
-	  kr = copy_deviceid(klassDriver, deviceID);
+	  copy_deviceid(klassDriver, deviceID);

      unload_classdriver(&klassDriver);

@@ -2094,6 +2142,32 @@ sigterm_handler(int sig)		/* I - Signal */
 }


+/*
+ * 'sigquit_handler()' - SIGQUIT handler.
+ */
+
+static void sigquit_handler(int sig, siginfo_t *si, void *unused)
+{
+  char  *path;
+  char	pathbuf[PROC_PIDPATHINFO_MAXSIZE];
+  static char msgbuf[256] = "";
+
+
+  (void)sig;
+  (void)unused;
+
+  if (proc_pidpath(si->si_pid, pathbuf, sizeof(pathbuf)) > 0 &&
+      (path = basename(pathbuf)) != NULL)
+    snprintf(msgbuf, sizeof(msgbuf), "SIGQUIT sent by %s(%d)", path, (int)si->si_pid);
+  else
+    snprintf(msgbuf, sizeof(msgbuf), "SIGQUIT sent by PID %d", (int)si->si_pid);
+
+  CRSetCrashLogMessage(msgbuf);
+
+  abort();
+}
+
+
 #ifdef PARSE_PS_ERRORS
 /*
 * 'next_line()' - Find the next line in a buffer.
@@ -2164,7 +2238,7 @@ static void parse_pserror(char *sockBuffer,
    }

    /* move everything over... */
-    strcpy(gErrorBuffer, pLineEnd);
+    strlcpy(gErrorBuffer, pLineEnd, sizeof(gErrorBuffer));
    gErrorBufferPtr = gErrorBuffer;
    pLineEnd = (char *)next_line((const char *)gErrorBuffer);
  }
@@ -5,7 +5,7 @@
 *
 *   This file is included from "usb.c" when compiled on UNIX/Linux.
 *
- *   Copyright 2007-2011 by Apple Inc.
+ *   Copyright 2007-2012 by Apple Inc.
 *   Copyright 1997-2007 by Easy Software Products, all rights reserved.
 *
 *   These coded instructions, statements, and computer programs are the
@@ -128,16 +128,12 @@ print_device(const char *uri,		/* I - Device URI */

      if (errno == EBUSY)
      {
-        _cupsLangPrintFilter(stderr, "INFO",
-			     _("Printer busy, will retry in 10 seconds."));
+        _cupsLangPrintFilter(stderr, "INFO", _("The printer is in use."));
 	sleep(10);
      }
      else if (errno == ENXIO || errno == EIO || errno == ENOENT ||
               errno == ENODEV)
      {
-        _cupsLangPrintFilter(stderr, "INFO",
-			     _("Printer not connected, will retry in 30 "
-			       "seconds."));
 	sleep(30);
      }
      else
@@ -261,7 +257,6 @@ list_devices(void)

    close(fd);
  }
-#elif defined(__sgi)
 #elif defined(__sun) && defined(ECPPIOC_GETDEVID)
  int	i;			/* Looping var */
  int	fd;			/* File descriptor */
@@ -425,8 +420,7 @@ open_device(const char *uri,		/* I - Device URI */
      */

      if (busy)
-	_cupsLangPrintFilter(stderr, "INFO",
-			     _("Printer is busy, will retry in 5 seconds."));
+	_cupsLangPrintFilter(stderr, "INFO", _("The printer is in use."));

      sleep(5);
    }
@@ -509,8 +503,7 @@ open_device(const char *uri,		/* I - Device URI */

      if (busy)
      {
-	_cupsLangPrintFilter(stderr, "INFO",
-			     _("Printer is busy, will retry in 5 seconds."));
+	_cupsLangPrintFilter(stderr, "INFO", _("The printer is in use."));
 	sleep(5);
      }
    }
@@ -3,7 +3,7 @@
 *
 *   USB port backend for CUPS.
 *
- *   Copyright 2007-2011 by Apple Inc.
+ *   Copyright 2007-2012 by Apple Inc.
 *   Copyright 1997-2007 by Easy Software Products, all rights reserved.
 *
 *   These coded instructions, statements, and computer programs are the
@@ -55,7 +55,7 @@ int	print_device(const char *uri, const char *hostname,
 * Include the vendor-specific USB implementation...
 */

-#ifdef HAVE_USB_H
+#ifdef HAVE_LIBUSB
 #  include "usb-libusb.c"
 #elif defined(__APPLE__)
 #  include "usb-darwin.c"
@@ -118,7 +118,7 @@ print_device(const char *uri,		/* I - Device URI */

  return (CUPS_BACKEND_FAILED);
 }
-#endif /* __APPLE__ */
+#endif /* HAVE_LIBUSB */


 /*
@@ -1,28 +1,25 @@
-lpc.o: lpc.c ../cups/cups-private.h ../cups/cups.h ../cups/file.h \
-  ../cups/versioning.h ../cups/ipp.h ../cups/http.h ../cups/array.h \
-  ../cups/language.h ../cups/string-private.h ../config.h \
-  ../cups/debug-private.h ../cups/ppd-private.h ../cups/ppd.h \
-  ../cups/pwg-private.h ../cups/http-private.h ../cups/md5-private.h \
-  ../cups/ipp-private.h ../cups/language-private.h ../cups/transcode.h \
-  ../cups/thread-private.h
-lpq.o: lpq.c ../cups/cups-private.h ../cups/cups.h ../cups/file.h \
-  ../cups/versioning.h ../cups/ipp.h ../cups/http.h ../cups/array.h \
-  ../cups/language.h ../cups/string-private.h ../config.h \
-  ../cups/debug-private.h ../cups/ppd-private.h ../cups/ppd.h \
-  ../cups/pwg-private.h ../cups/http-private.h ../cups/md5-private.h \
-  ../cups/ipp-private.h ../cups/language-private.h ../cups/transcode.h \
-  ../cups/thread-private.h
-lpr.o: lpr.c ../cups/cups-private.h ../cups/cups.h ../cups/file.h \
-  ../cups/versioning.h ../cups/ipp.h ../cups/http.h ../cups/array.h \
-  ../cups/language.h ../cups/string-private.h ../config.h \
-  ../cups/debug-private.h ../cups/ppd-private.h ../cups/ppd.h \
-  ../cups/pwg-private.h ../cups/http-private.h ../cups/md5-private.h \
-  ../cups/ipp-private.h ../cups/language-private.h ../cups/transcode.h \
-  ../cups/thread-private.h
-lprm.o: lprm.c ../cups/cups-private.h ../cups/cups.h ../cups/file.h \
-  ../cups/versioning.h ../cups/ipp.h ../cups/http.h ../cups/array.h \
-  ../cups/language.h ../cups/string-private.h ../config.h \
-  ../cups/debug-private.h ../cups/ppd-private.h ../cups/ppd.h \
-  ../cups/pwg-private.h ../cups/http-private.h ../cups/md5-private.h \
-  ../cups/ipp-private.h ../cups/language-private.h ../cups/transcode.h \
-  ../cups/thread-private.h
+lpc.o: lpc.c ../cups/cups-private.h ../cups/string-private.h ../config.h \
+  ../cups/debug-private.h ../cups/versioning.h ../cups/ipp-private.h \
+  ../cups/ipp.h ../cups/http.h ../cups/array.h ../cups/http-private.h \
+  ../cups/md5-private.h ../cups/language-private.h ../cups/transcode.h \
+  ../cups/language.h ../cups/pwg-private.h ../cups/cups.h ../cups/file.h \
+  ../cups/ppd-private.h ../cups/ppd.h ../cups/thread-private.h
+lpq.o: lpq.c ../cups/cups-private.h ../cups/string-private.h ../config.h \
+  ../cups/debug-private.h ../cups/versioning.h ../cups/ipp-private.h \
+  ../cups/ipp.h ../cups/http.h ../cups/array.h ../cups/http-private.h \
+  ../cups/md5-private.h ../cups/language-private.h ../cups/transcode.h \
+  ../cups/language.h ../cups/pwg-private.h ../cups/cups.h ../cups/file.h \
+  ../cups/ppd-private.h ../cups/ppd.h ../cups/thread-private.h
+lpr.o: lpr.c ../cups/cups-private.h ../cups/string-private.h ../config.h \
+  ../cups/debug-private.h ../cups/versioning.h ../cups/ipp-private.h \
+  ../cups/ipp.h ../cups/http.h ../cups/array.h ../cups/http-private.h \
+  ../cups/md5-private.h ../cups/language-private.h ../cups/transcode.h \
+  ../cups/language.h ../cups/pwg-private.h ../cups/cups.h ../cups/file.h \
+  ../cups/ppd-private.h ../cups/ppd.h ../cups/thread-private.h
+lprm.o: lprm.c ../cups/cups-private.h ../cups/string-private.h \
+  ../config.h ../cups/debug-private.h ../cups/versioning.h \
+  ../cups/ipp-private.h ../cups/ipp.h ../cups/http.h ../cups/array.h \
+  ../cups/http-private.h ../cups/md5-private.h \
+  ../cups/language-private.h ../cups/transcode.h ../cups/language.h \
+  ../cups/pwg-private.h ../cups/cups.h ../cups/file.h \
+  ../cups/ppd-private.h ../cups/ppd.h ../cups/thread-private.h
@@ -88,6 +88,7 @@ install-exec:
 		$(INSTALL_DIR) $(SYMROOT); \
 		for file in $(TARGETS); do \
 			cp $$file $(SYMROOT); \
+			dsymutil $(SYMROOT)/$$file; \
 		done \
 	fi

@@ -3,7 +3,7 @@
 *
 *   "lpc" command for CUPS.
 *
- *   Copyright 2007-2010 by Apple Inc.
+ *   Copyright 2007-2012 by Apple Inc.
 *   Copyright 1997-2006 by Easy Software Products.
 *
 *   These coded instructions, statements, and computer programs are the
@@ -364,7 +364,8 @@ show_status(http_t     *http,		/* I - HTTP connection to server */

 	  for (ptr = printer;
 	       *ptr != '\0' && *dptr != '\0' && *ptr == *dptr;
-	       ptr ++, dptr ++);
+	       ptr ++, dptr ++)
+	    /* do nothing */;

          if (*ptr == '\0' && (*dptr == '\0' || *dptr == ',' ||
 	                       isspace(*dptr & 255)))
@@ -3,7 +3,7 @@
 *
 *   "lpq" command for CUPS.
 *
- *   Copyright 2007-2011 by Apple Inc.
+ *   Copyright 2007-2012 by Apple Inc.
 *   Copyright 1997-2006 by Easy Software Products.
 *
 *   These coded instructions, statements, and computer programs are the
@@ -371,6 +371,7 @@ show_jobs(const char *command,		/* I - Command name */
  *    attributes-natural-language
  *    job-uri or printer-uri
  *    requested-attributes
+  *    requesting-user-name
  */

  request = ippNewRequest(id ? IPP_GET_JOB_ATTRIBUTES : IPP_GET_JOBS);
@@ -399,6 +400,9 @@ show_jobs(const char *command,		/* I - Command name */
                 "requesting-user-name", NULL, user);
    ippAddBoolean(request, IPP_TAG_OPERATION, "my-jobs", 1);
  }
+  else
+    ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_NAME,
+                 "requesting-user-name", NULL, cupsUser());

  ippAddStrings(request, IPP_TAG_OPERATION, IPP_TAG_KEYWORD,
                "requested-attributes",
@@ -447,8 +451,8 @@ show_jobs(const char *command,		/* I - Command name */
      jobpriority = 50;
 #endif /* __osf__ */
      jobstate    = IPP_JOB_PENDING;
-      jobname     = "untitled";
-      jobuser     = NULL;
+      jobname     = "unknown";
+      jobuser     = "unknown";
      jobdest     = NULL;
      jobcopies   = 1;

@@ -523,7 +527,7 @@ show_jobs(const char *command,		/* I - Command name */
      */

      if (jobstate == IPP_JOB_PROCESSING)
-	strcpy(rankstr, "active");
+	strlcpy(rankstr, "active", sizeof(rankstr));
      else
      {
       /*
@@ -3,7 +3,7 @@
 *
 *   "lpr" command for CUPS.
 *
- *   Copyright 2007-2011 by Apple Inc.
+ *   Copyright 2007-2012 by Apple Inc.
 *   Copyright 1997-2007 by Easy Software Products.
 *
 *   These coded instructions, statements, and computer programs are the
@@ -89,7 +89,7 @@ main(int  argc,				/* I - Number of command-line arguments */
              cupsSetUser(argv[i]);
 	    }
 	    break;
-	    
+
        case 'H' : /* Connect to host */
 	    if (argv[i][2] != '\0')
              cupsSetServer(argv[i] + 2);
@@ -377,7 +377,6 @@ main(int  argc,				/* I - Number of command-line arguments */
    const char		*format;	/* Document format */
    ssize_t		bytes;		/* Bytes read */

-
    if (cupsGetOption("raw", num_options, options))
      format = CUPS_FORMAT_RAW;
    else if ((format = cupsGetOption("document-format", num_options,
@@ -395,11 +394,17 @@ main(int  argc,				/* I - Number of command-line arguments */
    {
      _cupsLangPrintf(stderr, _("%s: Error - unable to queue from stdin - %s."),
 		      argv[0], httpStatus(status));
+      cupsFinishDocument(CUPS_HTTP_DEFAULT, printer);
+      cupsCancelJob2(CUPS_HTTP_DEFAULT, printer, job_id, 0);
      return (1);
    }

    if (cupsFinishDocument(CUPS_HTTP_DEFAULT, printer) != IPP_OK)
-      job_id = 0;
+    {
+      _cupsLangPrintf(stderr, "%s: %s", argv[0], cupsLastErrorString());
+      cupsCancelJob2(CUPS_HTTP_DEFAULT, printer, job_id, 0);
+      return (1);
+    }
  }

  if (job_id < 1)
@@ -120,6 +120,7 @@ install-exec:
 		$(INSTALL_DIR) $(SYMROOT); \
 		for file in $(CGIS); do \
 			cp $$file $(SYMROOT); \
+			dsymutil $(SYMROOT)/$$file; \
 		done \
 	fi

@@ -154,6 +155,7 @@ install-libs: $(INSTALLSTATIC)
 	if test "x$(SYMROOT)" != "x"; then \
 		$(INSTALL_DIR) $(SYMROOT); \
 		cp $(LIBCUPSCGI) $(SYMROOT); \
+		dsymutil $(SYMROOT)/$(LIBCUPSCGI); \
 	fi

 installstatic:
@@ -3,7 +3,7 @@
 *
 *   Administration CGI for CUPS.
 *
- *   Copyright 2007-2011 by Apple Inc.
+ *   Copyright 2007-2012 by Apple Inc.
 *   Copyright 1997-2007 by Easy Software Products.
 *
 *   These coded instructions, statements, and computer programs are the
@@ -523,7 +523,7 @@ do_add_rss_subscription(http_t *http)	/* I - HTTP connection */
  else if (cupsLastError() > IPP_OK_CONFLICT)
  {
    cgiStartHTML(_("Add RSS Subscription"));
-    cgiShowIPPError(_("Unable to add RSS subscription:"));
+    cgiShowIPPError(_("Unable to add RSS subscription"));
  }
  else
  {
@@ -810,8 +810,8 @@ do_am_class(http_t *http,		/* I - HTTP connection */
  else if (cupsLastError() > IPP_OK_CONFLICT)
  {
    cgiStartHTML(title);
-    cgiShowIPPError(modify ? _("Unable to modify class:") :
-                             _("Unable to add class:"));
+    cgiShowIPPError(modify ? _("Unable to modify class") :
+                             _("Unable to add class"));
  }
  else
  {
@@ -962,13 +962,13 @@ do_am_printer(http_t *http,		/* I - HTTP connection */
      else if (!_cups_strncasecmp(make, "laserjet", 8) ||
               !_cups_strncasecmp(make, "deskjet", 7) ||
               !_cups_strncasecmp(make, "designjet", 9))
-        strcpy(make, "HP");
+        strlcpy(make, "HP", sizeof(make));
      else if (!_cups_strncasecmp(make, "phaser", 6))
-        strcpy(make, "Xerox");
+        strlcpy(make, "Xerox", sizeof(make));
      else if (!_cups_strncasecmp(make, "stylus", 6))
-        strcpy(make, "Epson");
+        strlcpy(make, "Epson", sizeof(make));
      else
-        strcpy(make, "Generic");
+        strlcpy(make, "Generic", sizeof(make));

      if (!cgiGetVariable("CURRENT_MAKE"))
        cgiSetVariable("CURRENT_MAKE", make);
@@ -1055,8 +1055,8 @@ do_am_printer(http_t *http,		/* I - HTTP connection */
      else
      {
 	cgiStartHTML(title);
-	cgiShowIPPError(modify ? _("Unable to modify printer:") :
-				 _("Unable to add printer:"));
+	cgiShowIPPError(modify ? _("Unable to modify printer") :
+				 _("Unable to add printer"));
 	cgiEndHTML();
        return;
      }
@@ -1317,7 +1317,7 @@ do_am_printer(http_t *http,		/* I - HTTP connection */
    else
    {
      cgiStartHTML(title);
-      cgiShowIPPError(_("Unable to get list of printer drivers:"));
+      cgiShowIPPError(_("Unable to get list of printer drivers"));
      cgiCopyTemplateLang("error.tmpl");
      cgiEndHTML();
    }
@@ -1415,8 +1415,8 @@ do_am_printer(http_t *http,		/* I - HTTP connection */
    else if (cupsLastError() > IPP_OK_CONFLICT)
    {
      cgiStartHTML(title);
-      cgiShowIPPError(modify ? _("Unable to modify printer:") :
-                               _("Unable to add printer:"));
+      cgiShowIPPError(modify ? _("Unable to modify printer") :
+                               _("Unable to add printer"));
    }
    else if (modify)
    {
@@ -1522,7 +1522,7 @@ do_cancel_subscription(http_t *http)/* I - HTTP connection */
  else if (cupsLastError() > IPP_OK_CONFLICT)
  {
    cgiStartHTML(_("Cancel RSS Subscription"));
-    cgiShowIPPError(_("Unable to cancel RSS subscription:"));
+    cgiShowIPPError(_("Unable to cancel RSS subscription"));
  }
  else
  {
@@ -1557,6 +1557,8 @@ do_config_server(http_t *http)		/* I - HTTP connection */
    int			advanced,	/* Advanced settings shown? */
 			changed;	/* Have settings changed? */
    const char		*debug_logging,	/* DEBUG_LOGGING value */
+			*preserve_jobs = NULL,
+					/* PRESERVE_JOBS value */
 			*remote_admin,	/* REMOTE_ADMIN value */
 			*remote_any,	/* REMOTE_ANY value */
 			*share_printers,/* SHARE_PRINTERS value */
@@ -1611,19 +1613,36 @@ do_config_server(http_t *http)		/* I - HTTP connection */
      */

      browse_web_if        = cgiGetVariable("BROWSE_WEB_IF") ? "Yes" : "No";
-      preserve_job_history = cgiGetVariable("PRESERVE_JOB_HISTORY") ? "Yes" : "No";
-      preserve_job_files   = cgiGetVariable("PRESERVE_JOB_FILES") ? "Yes" : "No";
      max_clients          = cgiGetVariable("MAX_CLIENTS");
-      max_jobs             = cgiGetVariable("MAX_JOBS");
      max_log_size         = cgiGetVariable("MAX_LOG_SIZE");
+      preserve_jobs        = cgiGetVariable("PRESERVE_JOBS");
+
+      if (preserve_jobs)
+      {
+        max_jobs             = cgiGetVariable("MAX_JOBS");
+	preserve_job_history = cgiGetVariable("PRESERVE_JOB_HISTORY");
+	preserve_job_files   = cgiGetVariable("PRESERVE_JOB_FILES");
+
+	if (!max_jobs || atoi(max_jobs) < 0)
+	  max_jobs = "500";
+
+	if (!preserve_job_history)
+	  preserve_job_history = "On";
+
+	if (!preserve_job_files)
+	  preserve_job_files = "1d";
+      }
+      else
+      {
+        max_jobs             = "0";
+        preserve_job_history = "No";
+        preserve_job_files   = "No";
+      }

      if (!max_clients || atoi(max_clients) <= 0)
 	max_clients = "100";

-      if (!max_jobs || atoi(max_jobs) <= 0)
-	max_jobs = "500";
-
-      if (!max_log_size || atof(max_log_size) <= 0.0)
+      if (!max_log_size || atoi(max_log_size) <= 0.0)
 	max_log_size = "1m";
    }

@@ -1635,7 +1654,7 @@ do_config_server(http_t *http)		/* I - HTTP connection */
    {
      cgiStartHTML(cgiText(_("Change Settings")));
      cgiSetVariable("MESSAGE",
-                     cgiText(_("Unable to change server settings:")));
+                     cgiText(_("Unable to change server settings")));
      cgiSetVariable("ERROR", cupsLastErrorString());
      cgiCopyTemplateLang("error.tmpl");
      cgiEndHTML();
@@ -1674,7 +1693,7 @@ do_config_server(http_t *http)		/* I - HTTP connection */
    if ((current_preserve_job_files = cupsGetOption("PreserveJobFiles",
                                                    num_settings,
 						    settings)) == NULL)
-      current_preserve_job_files = "No";
+      current_preserve_job_files = "1d";

    if ((current_max_clients = cupsGetOption("MaxClients", num_settings,
                                             settings)) == NULL)
@@ -1777,7 +1796,7 @@ do_config_server(http_t *http)		/* I - HTTP connection */

 	cgiStartHTML(cgiText(_("Change Settings")));
 	cgiSetVariable("MESSAGE",
-                       cgiText(_("Unable to change server settings:")));
+                       cgiText(_("Unable to change server settings")));
 	cgiSetVariable("ERROR", cupsLastErrorString());
 	cgiCopyTemplateLang("error.tmpl");
      }
@@ -1828,7 +1847,7 @@ do_config_server(http_t *http)		/* I - HTTP connection */
    if ((tempfd = cupsTempFd(tempfile, sizeof(tempfile))) < 0)
    {
      cgiStartHTML(cgiText(_("Edit Configuration File")));
-      cgiSetVariable("MESSAGE", cgiText(_("Unable to create temporary file:")));
+      cgiSetVariable("MESSAGE", cgiText(_("Unable to create temporary file")));
      cgiSetVariable("ERROR", strerror(errno));
      cgiCopyTemplateLang("error.tmpl");
      cgiEndHTML();
@@ -1840,7 +1859,7 @@ do_config_server(http_t *http)		/* I - HTTP connection */
    if ((temp = cupsFileOpenFd(tempfd, "w")) == NULL)
    {
      cgiStartHTML(cgiText(_("Edit Configuration File")));
-      cgiSetVariable("MESSAGE", cgiText(_("Unable to create temporary file:")));
+      cgiSetVariable("MESSAGE", cgiText(_("Unable to create temporary file")));
      cgiSetVariable("ERROR", strerror(errno));
      cgiCopyTemplateLang("error.tmpl");
      cgiEndHTML();
@@ -1890,7 +1909,7 @@ do_config_server(http_t *http)		/* I - HTTP connection */
    else if (status != HTTP_CREATED)
    {
      cgiSetVariable("MESSAGE",
-                     cgiText(_("Unable to upload cupsd.conf file:")));
+                     cgiText(_("Unable to upload cupsd.conf file")));
      cgiSetVariable("ERROR", httpStatus(status));

      cgiStartHTML(cgiText(_("Edit Configuration File")));
@@ -1937,7 +1956,7 @@ do_config_server(http_t *http)		/* I - HTTP connection */
    {
      cgiStartHTML(cgiText(_("Edit Configuration File")));
      cgiSetVariable("MESSAGE",
-                     cgiText(_("Unable to access cupsd.conf file:")));
+                     cgiText(_("Unable to access cupsd.conf file")));
      cgiSetVariable("ERROR", strerror(errno));
      cgiCopyTemplateLang("error.tmpl");
      cgiEndHTML();
@@ -1950,7 +1969,7 @@ do_config_server(http_t *http)		/* I - HTTP connection */
    {
      cgiStartHTML(cgiText(_("Edit Configuration File")));
      cgiSetVariable("MESSAGE",
-                     cgiText(_("Unable to access cupsd.conf file:")));
+                     cgiText(_("Unable to access cupsd.conf file")));
      cgiSetVariable("ERROR",
                     cgiText(_("Unable to edit cupsd.conf files larger than "
 		               "1MB")));
@@ -1974,7 +1993,7 @@ do_config_server(http_t *http)		/* I - HTTP connection */

      cgiStartHTML(cgiText(_("Edit Configuration File")));
      cgiSetVariable("MESSAGE",
-                     cgiText(_("Unable to access cupsd.conf file:")));
+                     cgiText(_("Unable to access cupsd.conf file")));
      cgiSetVariable("ERROR", strerror(errno));
      cgiCopyTemplateLang("error.tmpl");
      cgiEndHTML();
@@ -2131,7 +2150,7 @@ do_delete_class(http_t *http)		/* I - HTTP connection */
  cgiStartHTML(cgiText(_("Delete Class")));

  if (cupsLastError() > IPP_OK_CONFLICT)
-    cgiShowIPPError(_("Unable to delete class:"));
+    cgiShowIPPError(_("Unable to delete class"));
  else
    cgiCopyTemplateLang("class-deleted.tmpl");

@@ -2216,7 +2235,7 @@ do_delete_printer(http_t *http)		/* I - HTTP connection */
  cgiStartHTML(cgiText(_("Delete Printer")));

  if (cupsLastError() > IPP_OK_CONFLICT)
-    cgiShowIPPError(_("Unable to delete printer:"));
+    cgiShowIPPError(_("Unable to delete printer"));
  else
    cgiCopyTemplateLang("printer-deleted.tmpl");

@@ -2620,10 +2639,6 @@ do_menu(http_t *http)			/* I - HTTP connection */
 #endif /* HAVE_GSSAPI */
  cgiSetVariable("KERBEROS", "");

-#ifdef HAVE_DNSSD
-  cgiSetVariable("HAVE_DNSSD", "1");
-#endif /* HAVE_DNSSD */
-
  if ((val = cupsGetOption("BrowseWebIF", num_settings,
                           settings)) == NULL)
    val = "No";
@@ -2636,18 +2651,25 @@ do_menu(http_t *http)			/* I - HTTP connection */
                           settings)) == NULL)
    val = "Yes";

-  if (!_cups_strcasecmp(val, "yes") || !_cups_strcasecmp(val, "on") ||
-      !_cups_strcasecmp(val, "true"))
+  if (val &&
+      (!_cups_strcasecmp(val, "0") || !_cups_strcasecmp(val, "no") ||
+       !_cups_strcasecmp(val, "off") || !_cups_strcasecmp(val, "false") ||
+       !_cups_strcasecmp(val, "disabled")))
  {
-    cgiSetVariable("PRESERVE_JOB_HISTORY", "CHECKED");
+    cgiSetVariable("PRESERVE_JOB_HISTORY", "0");
+    cgiSetVariable("PRESERVE_JOB_FILES", "0");
+  }
+  else
+  {
+    cgiSetVariable("PRESERVE_JOBS", "CHECKED");
+    cgiSetVariable("PRESERVE_JOB_HISTORY", val);

    if ((val = cupsGetOption("PreserveJobFiles", num_settings,
 			     settings)) == NULL)
-      val = "No";
+      val = "1d";
+
+    cgiSetVariable("PRESERVE_JOB_FILES", val);

-    if (!_cups_strcasecmp(val, "yes") || !_cups_strcasecmp(val, "on") ||
-	!_cups_strcasecmp(val, "true"))
-      cgiSetVariable("PRESERVE_JOB_FILES", "CHECKED");
  }

  if ((val = cupsGetOption("MaxClients", num_settings, settings)) == NULL)
@@ -2815,7 +2837,7 @@ do_set_allowed_users(http_t *http)	/* I - HTTP connection */
      exit(0);
    }
    else if (cupsLastError() > IPP_OK_CONFLICT)
-      cgiShowIPPError(_("Unable to get printer attributes:"));
+      cgiShowIPPError(_("Unable to get printer attributes"));
    else
      cgiCopyTemplateLang("users.tmpl");

@@ -2965,7 +2987,7 @@ do_set_allowed_users(http_t *http)	/* I - HTTP connection */
    else if (cupsLastError() > IPP_OK_CONFLICT)
    {
      cgiStartHTML(cgiText(_("Set Allowed Users")));
-      cgiShowIPPError(_("Unable to change printer:"));
+      cgiShowIPPError(_("Unable to change printer"));
    }
    else
    {
@@ -3052,7 +3074,7 @@ do_set_default(http_t *http)		/* I - HTTP connection */
  else if (cupsLastError() > IPP_OK_CONFLICT)
  {
    cgiStartHTML(title);
-    cgiShowIPPError(_("Unable to set server default:"));
+    cgiShowIPPError(_("Unable to set server default"));
  }
  else
  {
@@ -3161,7 +3183,7 @@ do_set_options(http_t *http,		/* I - HTTP connection */
    if ((ppd = ppdOpenFile(filename)) == NULL)
    {
      cgiSetVariable("ERROR", ppdErrorString(ppdLastError(&i)));
-      cgiSetVariable("MESSAGE", cgiText(_("Unable to open PPD file:")));
+      cgiSetVariable("MESSAGE", cgiText(_("Unable to open PPD file")));
      cgiStartHTML(title);
      cgiCopyTemplateLang("error.tmpl");
      cgiEndHTML();
@@ -3782,7 +3804,7 @@ do_set_options(http_t *http,		/* I - HTTP connection */
    else if (cupsLastError() > IPP_OK_CONFLICT)
    {
      cgiStartHTML(title);
-      cgiShowIPPError(_("Unable to set options:"));
+      cgiShowIPPError(_("Unable to set options"));
    }
    else
    {
@@ -3881,7 +3903,7 @@ do_set_sharing(http_t *http)		/* I - HTTP connection */
  else if (cupsLastError() > IPP_OK_CONFLICT)
  {
    cgiStartHTML(cgiText(_("Set Publishing")));
-    cgiShowIPPError(_("Unable to change printer-is-shared attribute:"));
+    cgiShowIPPError(_("Unable to change printer-is-shared attribute"));
  }
  else
  {
@@ -4165,7 +4187,7 @@ get_option_value(
    if (bufptr == buffer || (bufend - bufptr) < 2)
      return (NULL);

-    strcpy(bufptr, "}");
+    memcpy(bufptr, "}", 2);
  }

  return (buffer);
@@ -3,7 +3,7 @@
 *
 *   Class status CGI for CUPS.
 *
- *   Copyright 2007-2011 by Apple Inc.
+ *   Copyright 2007-2012 by Apple Inc.
 *   Copyright 1997-2006 by Easy Software Products.
 *
 *   These coded instructions, statements, and computer programs are the
@@ -257,7 +257,7 @@ do_class_op(http_t      *http,		/* I - HTTP connection */
  else if (cupsLastError() > IPP_OK_CONFLICT)
  {
    cgiStartHTML(title);
-    cgiShowIPPError(_("Unable to do maintenance command:"));
+    cgiShowIPPError(_("Unable to do maintenance command"));
  }
  else
  {
@@ -380,7 +380,7 @@ show_all_classes(http_t     *http,	/* I - Connection to server */
    sprintf(val, "%d", count);
    cgiSetVariable("TOTAL", val);

-    if ((var = cgiGetVariable("ORDER")) != NULL)
+    if ((var = cgiGetVariable("ORDER")) != NULL && *var)
      ascending = !_cups_strcasecmp(var, "asc");
    else
      ascending = 1;
@@ -447,7 +447,7 @@ show_all_classes(http_t     *http,	/* I - Connection to server */
    * Show the error...
    */

-    cgiShowIPPError(_("Unable to get class list:"));
+    cgiShowIPPError(_("Unable to get class list"));
  }

   cgiEndHTML();
@@ -546,7 +546,7 @@ show_class(http_t     *http,		/* I - Connection to server */
    */

    cgiStartHTML(pclass);
-    cgiShowIPPError(_("Unable to get class status:"));
+    cgiShowIPPError(_("Unable to get class status"));
  }

   cgiEndHTML();
@@ -3,7 +3,7 @@
 *
 *   Online help index routines for CUPS.
 *
- *   Copyright 2007-2011 by Apple Inc.
+ *   Copyright 2007-2012 by Apple Inc.
 *   Copyright 1997-2007 by Easy Software Products.
 *
 *   These coded instructions, statements, and computer programs are the
@@ -910,7 +910,7 @@ help_load_file(
  node   = NULL;
  offset = 0;

-  strcpy(section, "Other");
+  strlcpy(section, "Other", sizeof(section));

  while (cupsFileGets(fp, line, sizeof(line)))
  {
@@ -39,7 +39,8 @@ main(int  argc,				/* I - Number of command-line arguments */
  const char	*query;			/* Search query */
  const char	*cache_dir;		/* CUPS_CACHEDIR environment variable */
  const char	*docroot;		/* CUPS_DOCROOT environment variable */
-  const char	*helpfile;		/* Current help file */
+  const char	*helpfile,		/* Current help file */
+		*helptitle = NULL;	/* Current help title */
  const char	*topic;			/* Current topic */
  char		topic_data[1024];	/* Topic form data */
  const char	*section;		/* Current section */
@@ -88,7 +89,7 @@ main(int  argc,				/* I - Number of command-line arguments */
    perror(filename);

    cgiStartHTML(cgiText(_("Online Help")));
-    cgiSetVariable("ERROR", "Unable to load help index!");
+    cgiSetVariable("ERROR", cgiText(_("Unable to load help index.")));
    cgiCopyTemplateLang("error.tmpl");
    cgiEndHTML();

@@ -129,7 +130,7 @@ main(int  argc,				/* I - Number of command-line arguments */
      perror(filename);

      cgiStartHTML(cgiText(_("Online Help")));
-      cgiSetVariable("ERROR", "Unable to access help file!");
+      cgiSetVariable("ERROR", cgiText(_("Unable to access help file.")));
      cgiCopyTemplateLang("error.tmpl");
      cgiEndHTML();

@@ -139,7 +140,7 @@ main(int  argc,				/* I - Number of command-line arguments */
    if ((n = helpFindNode(hi, helpfile, NULL)) == NULL)
    {
      cgiStartHTML(cgiText(_("Online Help")));
-      cgiSetVariable("ERROR", "Help file not in index!");
+      cgiSetVariable("ERROR", cgiText(_("Help file not in index.")));
      cgiCopyTemplateLang("error.tmpl");
      cgiEndHTML();

@@ -147,12 +148,11 @@ main(int  argc,				/* I - Number of command-line arguments */
    }

   /*
-    * Set the page title and save the help file...
+    * Save the page title and help file...
    */

-    cgiSetVariable("HELPFILE", helpfile);
-    cgiSetVariable("HELPTITLE", n->text);
-    cgiSetVariable("TOPIC", n->section);
+    helptitle = n->text;
+    topic     = n->section;

   /*
    * Send a standard page header...
@@ -170,6 +170,8 @@ main(int  argc,				/* I - Number of command-line arguments */
    */

    cgiStartHTML(cgiText(_("Online Help")));
+
+    topic = cgiGetVariable("TOPIC");
  }

 /*
@@ -180,7 +182,6 @@ main(int  argc,				/* I - Number of command-line arguments */
    cgiSetVariable("QUERY", "");

  query = cgiGetVariable("QUERY");
-  topic = cgiGetVariable("TOPIC");
  si    = helpSearchIndex(hi, query, topic, helpfile);

  cgiClearVariables();
@@ -188,6 +189,10 @@ main(int  argc,				/* I - Number of command-line arguments */
    cgiSetVariable("QUERY", query);
  if (topic)
    cgiSetVariable("TOPIC", topic);
+  if (helpfile)
+    cgiSetVariable("HELPFILE", helpfile);
+  if (helptitle)
+    cgiSetVariable("HELPTITLE", helptitle);

  fprintf(stderr, "DEBUG: query=\"%s\", topic=\"%s\"\n",
          query ? query : "(null)", topic ? topic : "(null)");
@@ -356,7 +361,7 @@ main(int  argc,				/* I - Number of command-line arguments */
    else
    {
      perror(filename);
-      cgiSetVariable("ERROR", "Unable to open help file.");
+      cgiSetVariable("ERROR", cgiText(_("Unable to open help file.")));
      cgiCopyTemplateLang("error.tmpl");
    }
  }
@@ -3,7 +3,7 @@
 *
 *   CGI <-> IPP variable routines for CUPS.
 *
- *   Copyright 2007-2011 by Apple Inc.
+ *   Copyright 2007-2012 by Apple Inc.
 *   Copyright 1997-2007 by Easy Software Products.
 *
 *   These coded instructions, statements, and computer programs are the
@@ -129,7 +129,7 @@ cgiGetAttributes(ipp_t      *request,	/* I - IPP request */
      *nameptr = '\0';

      if (!strncmp(name, "printer_state_history", 21))
-        strcpy(name, "printer_state_history");
+        strlcpy(name, "printer_state_history", sizeof(name));

     /*
      * Possibly add it to the list of attributes...
@@ -554,7 +554,7 @@ cgiPrintCommand(http_t     *http,	/* I - Connection to server */
  ipp_t		*request,		/* Get-Job-Attributes request */
 		*response;		/* Get-Job-Attributes response */
  ipp_attribute_t *attr;		/* Current job attribute */
-  static const char const *job_attrs[] =/* Job attributes we want */
+  static const char * const job_attrs[] =/* Job attributes we want */
 		{
 		  "job-state",
 		  "job-printer-state-message"
@@ -792,7 +792,7 @@ cgiPrintTestPage(http_t     *http,	/* I - Connection to server */
  cgiStartHTML(cgiText(_("Print Test Page")));

  if (cupsLastError() > IPP_OK_CONFLICT)
-    cgiShowIPPError(_("Unable to print test page:"));
+    cgiShowIPPError(_("Unable to print test page"));
  else
  {
    cgiSetVariable("PRINTER_NAME", dest);
@@ -1219,7 +1219,7 @@ cgiSetIPPObjectVars(
 	             "%dx%d%s", attr->values[i].resolution.xres,
 		     attr->values[i].resolution.yres,
 		     attr->values[i].resolution.units == IPP_RES_PER_INCH ?
-			 "dpi" : "dpc");
+			 "dpi" : "dpcm");
 	    break;

 	case IPP_TAG_URI :
@@ -1432,7 +1432,7 @@ cgiShowJobs(http_t     *http,		/* I - Connection to server */
    ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, "printer-uri", NULL,
        	 "ipp://localhost/");

-  if ((which_jobs = cgiGetVariable("which_jobs")) != NULL)
+  if ((which_jobs = cgiGetVariable("which_jobs")) != NULL && *which_jobs)
    ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_KEYWORD, "which-jobs",
                 NULL, which_jobs);

@@ -1480,10 +1480,11 @@ cgiShowJobs(http_t     *http,		/* I - Connection to server */
    if (first < 0)
      first = 0;

-    if ((var = cgiGetVariable("ORDER")) != NULL)
+    if ((var = cgiGetVariable("ORDER")) != NULL && *var)
      ascending = !_cups_strcasecmp(var, "asc");
    else
-      ascending = !which_jobs || !_cups_strcasecmp(which_jobs, "not-completed");
+      ascending = !which_jobs || !*which_jobs ||
+                  !_cups_strcasecmp(which_jobs, "not-completed");

    section = cgiGetVariable("SECTION");

@@ -3,7 +3,7 @@
 *
 *   Job status CGI for CUPS.
 *
- *   Copyright 2007-2011 by Apple Inc.
+ *   Copyright 2007-2012 by Apple Inc.
 *   Copyright 1997-2006 by Easy Software Products.
 *
 *   These coded instructions, statements, and computer programs are the
@@ -182,7 +182,7 @@ do_job_op(http_t      *http,		/* I - HTTP connection */
    char	url[1024];		/* Encoded URL */


-    strcpy(url, "5;URL=");
+    strlcpy(url, "5;URL=", sizeof(url));
    cgiFormEncode(url + 6, getenv("HTTP_REFERER"), sizeof(url) - 6);
    cgiSetVariable("refresh_page", url);
  }
@@ -195,7 +195,7 @@ do_job_op(http_t      *http,		/* I - HTTP connection */
  cgiStartHTML(cgiText(_("Jobs")));

  if (cupsLastError() > IPP_OK_CONFLICT)
-    cgiShowIPPError(_("Job operation failed:"));
+    cgiShowIPPError(_("Job operation failed"));
  else if (op == IPP_CANCEL_JOB)
    cgiCopyTemplateLang("job-cancel.tmpl");
  else if (op == IPP_HOLD_JOB)
@@ -3,7 +3,7 @@
 *
 *   Xcode documentation set generator.
 *
- *   Copyright 2007-2011 by Apple Inc.
+ *   Copyright 2007-2012 by Apple Inc.
 *   Copyright 1997-2007 by Easy Software Products.
 *
 *   These coded instructions, statements, and computer programs are the
@@ -31,7 +31,7 @@
 * Include necessary headers...
 */

-#include "cgi.h"
+#include "cgi-private.h"
 #include <errno.h>


@@ -3,7 +3,7 @@
 *
 *   Printer status CGI for CUPS.
 *
- *   Copyright 2007-2011 by Apple Inc.
+ *   Copyright 2007-2012 by Apple Inc.
 *   Copyright 1997-2006 by Easy Software Products.
 *
 *   These coded instructions, statements, and computer programs are the
@@ -266,7 +266,7 @@ do_printer_op(http_t      *http,	/* I - HTTP connection */
  else if (cupsLastError() > IPP_OK_CONFLICT)
  {
    cgiStartHTML(title);
-    cgiShowIPPError(_("Unable to do maintenance command:"));
+    cgiShowIPPError(_("Unable to do maintenance command"));
  }
  else
  {
@@ -397,7 +397,7 @@ show_all_printers(http_t     *http,	/* I - Connection to server */
    sprintf(val, "%d", count);
    cgiSetVariable("TOTAL", val);

-    if ((var = cgiGetVariable("ORDER")) != NULL)
+    if ((var = cgiGetVariable("ORDER")) != NULL && *var)
      ascending = !_cups_strcasecmp(var, "asc");
    else
      ascending = 1;
@@ -464,7 +464,7 @@ show_all_printers(http_t     *http,	/* I - Connection to server */
    * Show the error...
    */

-    cgiShowIPPError(_("Unable to get printer list:"));
+    cgiShowIPPError(_("Unable to get printer list"));
  }

   cgiEndHTML();
@@ -566,7 +566,7 @@ show_printer(http_t     *http,		/* I - Connection to server */
    */

    cgiStartHTML(printer);
-    cgiShowIPPError(_("Unable to get printer status:"));
+    cgiShowIPPError(_("Unable to get printer status"));
  }

   cgiEndHTML();
@@ -3,7 +3,7 @@
 *
 *   Search routines for CUPS.
 *
- *   Copyright 2007-2011 by Apple Inc.
+ *   Copyright 2007-2012 by Apple Inc.
 *   Copyright 1997-2006 by Easy Software Products.
 *
 *   These coded instructions, statements, and computer programs are the
@@ -208,7 +208,7 @@ cgiCompileSearch(const char *query)	/* I - Query string */
      * Add the prefix string...
      */

-      strcpy(sptr, prefix);
+      memcpy(sptr, prefix, strlen(prefix) + 1);
      sptr += strlen(sptr);

     /*
@@ -249,16 +249,16 @@ cgiCompileSearch(const char *query)	/* I - Query string */
 	  return (NULL);
 	}

-        strcpy(sptr, ".*|.*");
+        memcpy(sptr, ".*|.*", 6);
 	sptr += 5;

-	strcpy(sptr, lword2);
+	memcpy(sptr, lword2, strlen(lword2) + 1);
 	sptr += strlen(sptr);

-        strcpy(sptr, ".*");
+        memcpy(sptr, ".*", 3);
 	sptr += 2;

-	strcpy(sptr, lword);
+	memcpy(sptr, lword, strlen(lword) + 1);
 	sptr += strlen(sptr);

        free(lword);
@@ -287,7 +287,7 @@ cgiCompileSearch(const char *query)	/* I - Query string */
    free(lword);

  if (sptr > s)
-    strcpy(sptr, ".*");
+    memcpy(sptr, ".*", 3);
  else
  {
   /*
@@ -167,6 +167,8 @@ cgiClearVariables(void)
  _cgi_var_t	*v;			/* Current variable */


+  fputs("DEBUG: cgiClearVariables called.\n", stderr);
+
  for (v = form_vars, i = form_count; i > 0; v ++, i --)
  {
    _cupsStrFree(v->name);
@@ -401,6 +403,8 @@ cgiSetArray(const char *name,		/* I - Name of variable */
  if (name == NULL || value == NULL || element < 0 || element > 100000)
    return;

+  fprintf(stderr, "DEBUG: cgiSetArray: %s[%d]=\"%s\"\n", name, element, value);
+
  if ((var = cgi_find_variable(name)) == NULL)
  {
    cgi_add_variable(name, element, value);
@@ -532,6 +536,8 @@ cgiSetVariable(const char *name,	/* I - Name of variable */
  if (name == NULL || value == NULL)
    return;

+  fprintf(stderr, "cgiSetVariable: %s=\"%s\"\n", name, value);
+
  if ((var = cgi_find_variable(name)) == NULL)
  {
    cgi_add_variable(name, 0, value);
@@ -3,7 +3,7 @@
 #
 #   Configuration file makefile for CUPS.
 #
-#   Copyright 2007-2011 by Apple Inc.
+#   Copyright 2007-2012 by Apple Inc.
 #   Copyright 1993-2006 by Easy Software Products.
 #
 #   These coded instructions, statements, and computer programs are the
@@ -19,7 +19,7 @@ include ../Makedefs
 # Config files...
 #

-KEEP	=	cupsd.conf snmp.conf
+KEEP	=	cups-files.conf cupsd.conf snmp.conf
 REPLACE	=	mime.convs mime.types


@@ -0,0 +1,98 @@
+#
+# "$Id$"
+#
+# Sample file/directory/user/group configuration file for the CUPS scheduler.
+# See "man cups-files.conf" for a complete description of this file.
+#
+
+# List of events that are considered fatal errors for the scheduler...
+#FatalErrors @CUPS_FATAL_ERRORS@
+
+# Default user and group for filters/backends/helper programs; this cannot be
+# any user or group that resolves to ID 0 for security reasons...
+#User @CUPS_USER@
+#Group @CUPS_GROUP@
+
+# Administrator user group, used to match @SYSTEM in cupsd.conf policy rules...
+SystemGroup @CUPS_SYSTEM_GROUPS@
+@CUPS_SYSTEM_AUTHKEY@
+
+# User that is substituted for unauthenticated (remote) root accesses...
+#RemoteRoot remroot
+
+# Do we allow file: device URIs other than to /dev/null?
+#FileDevice No
+
+# Permissions for configuration and log files...
+#ConfigFilePerm 0@CUPS_CONFIG_FILE_PERM@
+#LogFilePerm 0@CUPS_LOG_FILE_PERM@
+
+# Location of the file logging all access to the scheduler; may be the name
+# "syslog". If not an absolute path, the value of ServerRoot is used as the
+# root directory.  Also see the "AccessLogLevel" directive in cupsd.conf.
+AccessLog @CUPS_LOGDIR@/access_log
+
+# Location of cache files used by the scheduler...
+#CacheDir @CUPS_CACHEDIR@
+
+# Location of data files used by the scheduler...
+#DataDir @CUPS_DATADIR@
+
+# Location of the static web content served by the scheduler...
+#DocumentRoot @CUPS_DOCROOT@
+
+# Location of the file logging all messages produced by the scheduler and any
+# helper programs; may be the name "syslog". If not an absolute path, the value
+# of ServerRoot is used as the root directory.  Also see the "LogLevel"
+# directive in cupsd.conf.
+ErrorLog @CUPS_LOGDIR@/error_log
+
+# Location of fonts used by older print filters...
+#FontPath @CUPS_FONTPATH@
+
+# Location of LPD configuration
+#LPDConfigFile @CUPS_DEFAULT_LPD_CONFIG_FILE@
+
+# Location of the file logging all pages printed by the scheduler and any
+# helper programs; may be the name "syslog". If not an absolute path, the value
+# of ServerRoot is used as the root directory.  Also see the "PageLogFormat"
+# directive in cupsd.conf.
+PageLog @CUPS_LOGDIR@/page_log
+
+# Location of the file listing all of the local printers...
+#Printcap @CUPS_DEFAULT_PRINTCAP@
+
+# Format of the Printcap file...
+#PrintcapFormat bsd
+#PrintcapFormat plist
+#PrintcapFormat solaris
+
+# Location of all spool files...
+#RequestRoot @CUPS_REQUESTS@
+
+# Location of helper programs...
+#ServerBin @CUPS_SERVERBIN@
+
+# SSL/TLS certificate for the scheduler...
+#ServerCertificate @CUPS_SERVERCERT@
+
+# SSL/TLS private key for the scheduler...
+#ServerKey @CUPS_SERVERKEY@
+
+# Location of other configuration files...
+#ServerRoot @CUPS_SERVERROOT@
+
+# Location of Samba configuration file...
+#SMBConfigFile @CUPS_DEFAULT_SMB_CONFIG_FILE@
+
+# Location of scheduler state files...
+#StateDir @CUPS_STATEDIR@
+
+# Location of scheduler/helper temporary files. This directory is emptied on
+# scheduler startup and cannot be one of the standard (public) temporary
+# directory locations for security reasons...
+#TempDir @CUPS_REQUESTS@/tmp
+
+#
+# End of "$Id$".
+#
@@ -9,18 +9,12 @@
 # for troubleshooting...
 LogLevel @CUPS_LOG_LEVEL@

-# Administrator user group...
-SystemGroup @CUPS_SYSTEM_GROUPS@
-@CUPS_SYSTEM_AUTHKEY@
-
 # Only listen for connections from the local machine.
 Listen localhost:@DEFAULT_IPP_PORT@
@CUPS_LISTEN_DOMAINSOCKET@

 # Show shared printers on the local network.
 Browsing On
-BrowseOrder allow,deny
-BrowseAllow all
 BrowseLocalProtocols @CUPS_BROWSE_LOCAL_PROTOCOLS@

 # Default authentication type, when authentication is required...
@@ -1,9 +1,9 @@
 dnl
-dnl "$Id: cups-common.m4 10192 2012-01-20 21:49:02Z mike $"
+dnl "$Id: cups-common.m4 10945 2013-04-09 19:44:01Z mike $"
 dnl
 dnl   Common configuration stuff for CUPS.
 dnl
-dnl   Copyright 2007-2011 by Apple Inc.
+dnl   Copyright 2007-2013 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,11 +20,11 @@ dnl Set the name of the config header file...
 AC_CONFIG_HEADER(config.h)

 dnl Version number information...
-CUPS_VERSION="1.6svn"
+CUPS_VERSION="1.7b1"
 CUPS_REVISION=""
-if test -z "$CUPS_REVISION" -a -d .svn; then
-	CUPS_REVISION="-r`svnversion . | awk -F: '{print $NF}' | sed -e '1,$s/[[a-zA-Z]]*//g'`"
-fi
+#if test -z "$CUPS_REVISION" -a -d .svn; then
+#	CUPS_REVISION="-r`svnversion . | awk -F: '{print $NF}' | sed -e '1,$s/[[a-zA-Z]]*//g'`"
+#fi
 CUPS_BUILD="cups-$CUPS_VERSION"

 AC_ARG_WITH(cups_build, [  --with-cups-build       set "cups-config --build" string ],
@@ -44,13 +44,13 @@ LDFLAGS="${LDFLAGS:=}"

 dnl Checks for programs...
 AC_PROG_AWK
-AC_PROG_CC
+AC_PROG_CC(clang cc gcc)
 AC_PROG_CPP
-AC_PROG_CXX
+AC_PROG_CXX(clang++ c++ g++)
 AC_PROG_RANLIB
 AC_PATH_PROG(AR,ar)
 AC_PATH_PROG(CHMOD,chmod)
-AC_PATH_PROG(HTMLDOC,htmldoc)
+AC_PATH_PROG(GZIP,gzip)
 AC_PATH_PROG(LD,ld)
 AC_PATH_PROG(LN,ln)
 AC_PATH_PROG(MV,mv)
@@ -92,8 +92,9 @@ dnl Check for pkg-config, which is used for some other tests later on...
 AC_PATH_PROG(PKGCONFIG, pkg-config)

 dnl Check for libraries...
-AC_SEARCH_LIBS(fmod, m)
+AC_SEARCH_LIBS(abs, m, AC_DEFINE(HAVE_ABS))
 AC_SEARCH_LIBS(crypt, crypt)
+AC_SEARCH_LIBS(fmod, m)
 AC_SEARCH_LIBS(getspent, sec gen)

 LIBMALLOC=""
@@ -129,6 +130,7 @@ AC_CHECK_HEADER(crypt.h,AC_DEFINE(HAVE_CRYPT_H))
 AC_CHECK_HEADER(langinfo.h,AC_DEFINE(HAVE_LANGINFO_H))
 AC_CHECK_HEADER(malloc.h,AC_DEFINE(HAVE_MALLOC_H))
 AC_CHECK_HEADER(shadow.h,AC_DEFINE(HAVE_SHADOW_H))
+AC_CHECK_HEADER(stdint.h,AC_DEFINE(HAVE_STDINT_H))
 AC_CHECK_HEADER(string.h,AC_DEFINE(HAVE_STRING_H))
 AC_CHECK_HEADER(strings.h,AC_DEFINE(HAVE_STRINGS_H))
 AC_CHECK_HEADER(bstring.h,AC_DEFINE(HAVE_BSTRING_H))
@@ -225,19 +227,20 @@ AC_ARG_ENABLE(libusb, [  --enable-libusb         use libusb for USB printing])
 LIBUSB=""
 AC_SUBST(LIBUSB)

-if test x$enable_libusb = xyes; then
-	check_libusb=yes
-elif test x$enable_libusb != xno -a $uname != Darwin; then
-	check_libusb=yes
-else
-	check_libusb=no
-fi
-
-if test $check_libusb = yes; then
-	AC_CHECK_LIB(usb, usb_get_string_simple,[
-		AC_CHECK_HEADER(usb.h,
-			AC_DEFINE(HAVE_USB_H)
-			LIBUSB="-lusb")])
+if test "x$PKGCONFIG" != x; then
+	if test x$enable_libusb = xyes -o $uname != Darwin; then
+		AC_MSG_CHECKING(for libusb-1.0)
+		if $PKGCONFIG --exists libusb-1.0; then
+			AC_MSG_RESULT(yes)
+			AC_DEFINE(HAVE_LIBUSB)
+			CFLAGS="$CFLAGS `$PKGCONFIG --cflags libusb-1.0`"
+			LIBUSB="`$PKGCONFIG --libs libusb-1.0`"
+		else
+			AC_MSG_RESULT(no)
+		fi
+	fi
+elif test x$enable_libusb = xyes; then
+	AC_MSG_ERROR(Need pkg-config to enable libusb support.)
 fi

 dnl See if we have libwrap for TCP wrappers support...
@@ -254,12 +257,18 @@ if test x$enable_tcp_wrappers = xyes; then
 fi

 dnl ZLIB
+INSTALL_GZIP=""
 LIBZ=""
 AC_CHECK_HEADER(zlib.h,
    AC_CHECK_LIB(z, gzgets,
 	AC_DEFINE(HAVE_LIBZ)
 	LIBZ="-lz"
-	LIBS="$LIBS -lz"))
+	LIBS="$LIBS -lz"
+	AC_CHECK_LIB(z, inflateCopy, AC_DEFINE(HAVE_INFLATECOPY))
+	if test "x$GZIP" != z; then
+		INSTALL_GZIP="-z"
+	fi))
+AC_SUBST(INSTALL_GZIP)
 AC_SUBST(LIBZ)

 dnl Flags for "ar" command...
@@ -297,7 +306,7 @@ else
 	DBUSDIR=""
 fi

-AC_ARG_ENABLE(dbus, [  --enable-dbus           build with DBUS support])
+AC_ARG_ENABLE(dbus, [  --disable-dbus           build without DBUS support])
 AC_ARG_WITH(dbusdir, [  --with-dbusdir          set DBUS configuration directory ],
 	DBUSDIR="$withval")

@@ -329,6 +338,7 @@ AC_SUBST(DBUS_NOTIFIERLIBS)

 dnl Extra platform-specific libraries...
 CUPS_DEFAULT_PRINTOPERATOR_AUTH="@SYSTEM"
+CUPS_DEFAULT_SYSTEM_AUTHKEY=""
 CUPS_SYSTEM_AUTHKEY=""
 INSTALLXPC=""

@@ -348,12 +358,6 @@ case $uname in
 		dnl Check for dynamic store function...
 		AC_CHECK_FUNCS(SCDynamicStoreCopyComputerName)

-		dnl Check for new ColorSync APIs...
-		SAVELIBS="$LIBS"
-		LIBS="$LIBS -framework ApplicationServices"
-		AC_CHECK_FUNCS(ColorSyncRegisterDevice)
-		LIBS="$SAVELIBS"
-
 		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))
@@ -382,10 +386,13 @@ case $uname in

 			if test "x$default_adminkey" != xdefault; then
 				CUPS_SYSTEM_AUTHKEY="SystemGroupAuthKey $default_adminkey"
+				CUPS_DEFAULT_SYSTEM_AUTHKEY="$default_adminkey"
 			elif grep -q system.print.operator /etc/authorization; then
 				CUPS_SYSTEM_AUTHKEY="SystemGroupAuthKey system.print.admin"
+				CUPS_DEFAULT_SYSTEM_AUTHKEY="system.print.admin"
 			else
 				CUPS_SYSTEM_AUTHKEY="SystemGroupAuthKey system.preferences"
+				CUPS_DEFAULT_SYSTEM_AUTHKEY="system.preferences"
 			fi

 			if test "x$default_operkey" != xdefault; then
@@ -401,8 +408,8 @@ case $uname in
 		if test $uversion -ge 100; then
 			AC_CHECK_HEADER(sandbox.h,AC_DEFINE(HAVE_SANDBOX_H))
 		fi
-		if test $uversion -ge 110; then
-			# Broken public headers in 10.7...
+		if test $uversion -ge 110 -a $uversion -lt 120; then
+			# Broken public headers in 10.7.x...
 			AC_MSG_CHECKING(for sandbox/private.h presence)
 			if test -f /usr/local/include/sandbox/private.h; then
 				AC_MSG_RESULT(yes)
@@ -416,11 +423,14 @@ case $uname in
 		AC_CHECK_HEADER(xpc/xpc.h,
 			AC_DEFINE(HAVE_XPC)
 			INSTALLXPC="install-xpc")
+		AC_CHECK_HEADER(xpc/private.h,
+			AC_DEFINE(HAVE_XPC_PRIVATE_H))
                ;;
 esac

 AC_SUBST(CUPS_DEFAULT_PRINTOPERATOR_AUTH)
 AC_DEFINE_UNQUOTED(CUPS_DEFAULT_PRINTOPERATOR_AUTH, "$CUPS_DEFAULT_PRINTOPERATOR_AUTH")
+AC_DEFINE_UNQUOTED(CUPS_DEFAULT_SYSTEM_AUTHKEY, "$CUPS_DEFAULT_SYSTEM_AUTHKEY")
 AC_SUBST(CUPS_SYSTEM_AUTHKEY)
 AC_SUBST(INSTALLXPC)

@@ -449,5 +459,5 @@ esac
 AC_SUBST(BUILDDIRS)

 dnl
-dnl End of "$Id: cups-common.m4 10192 2012-01-20 21:49:02Z mike $".
+dnl End of "$Id: cups-common.m4 10945 2013-04-09 19:44:01Z mike $".
 dnl
@@ -1,9 +1,9 @@
 dnl
-dnl "$Id: cups-compiler.m4 10190 2012-01-20 16:22:58Z mike $"
+dnl "$Id: cups-compiler.m4 10853 2013-01-31 16:27:05Z mike $"
 dnl
 dnl   Compiler stuff for CUPS.
 dnl
-dnl   Copyright 2007-2012 by Apple Inc.
+dnl   Copyright 2007-2013 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
@@ -114,29 +114,38 @@ if test -n "$GCC"; then
 	OLDCFLAGS="$CFLAGS"
 	CFLAGS="$CFLAGS -fstack-protector"
 	AC_TRY_LINK(,,
-		OPTIM="$OPTIM -fstack-protector"
+		if test "x$LSB_BUILD" = xy; then
+			# Can't use stack-protector with LSB binaries...
+			OPTIM="$OPTIM -fno-stack-protector"
+		else
+			OPTIM="$OPTIM -fstack-protector"
+		fi
 		AC_MSG_RESULT(yes),
 		AC_MSG_RESULT(no))
 	CFLAGS="$OLDCFLAGS"

-	# The -fPIE option is available with some versions of GCC and adds
-	# randomization of addresses, which avoids another class of exploits
-	# that depend on a fixed address for common functions.
-	AC_MSG_CHECKING(if GCC supports -fPIE)
-	OLDCFLAGS="$CFLAGS"
-	CFLAGS="$CFLAGS -fPIE"
-	AC_TRY_COMPILE(,,
-		[case "$CC" in
-			*clang)
-				PIEFLAGS="-fPIE -Wl,-pie"
-				;;
-			*)
-				PIEFLAGS="-fPIE -pie"
-				;;
-		esac
-		AC_MSG_RESULT(yes)],
-		AC_MSG_RESULT(no))
-	CFLAGS="$OLDCFLAGS"
+	if test "x$LSB_BUILD" != xy; then
+		# The -fPIE option is available with some versions of GCC and
+		# adds randomization of addresses, which avoids another class of
+		# exploits that depend on a fixed address for common functions.
+		#
+		# Not available to LSB binaries...
+		AC_MSG_CHECKING(if GCC supports -fPIE)
+		OLDCFLAGS="$CFLAGS"
+		CFLAGS="$CFLAGS -fPIE"
+		AC_TRY_COMPILE(,,
+			[case "$CC" in
+				*clang)
+					PIEFLAGS="-fPIE -Wl,-pie"
+					;;
+				*)
+					PIEFLAGS="-fPIE -pie"
+					;;
+			esac
+			AC_MSG_RESULT(yes)],
+			AC_MSG_RESULT(no))
+		CFLAGS="$OLDCFLAGS"
+	fi

 	if test "x$with_optim" = x; then
 		# Add useful warning options for tracking down problems...
@@ -202,19 +211,6 @@ else
 				OPTIM="+z $OPTIM"
 			fi
 			;;
-        	IRIX)
-			if test -z "$OPTIM"; then
-				if test "x$with_optim" = x; then
-					OPTIM="-O2"
-				else
-					OPTIM="$with_optim $OPTIM"
-				fi
-			fi
-
-			if test "x$with_optim" = x; then
-				OPTIM="-fullwarn -woff 1183,1209,1349,1506,3201 $OPTIM"
-			fi
-			;;
 		OSF*)
 			# Tru64 UNIX aka Digital UNIX aka OSF/1
 			if test -z "$OPTIM"; then
@@ -295,5 +291,5 @@ case $uname in
 esac

 dnl
-dnl End of "$Id: cups-compiler.m4 10190 2012-01-20 16:22:58Z mike $".
+dnl End of "$Id: cups-compiler.m4 10853 2013-01-31 16:27:05Z mike $".
 dnl
@@ -1,9 +1,9 @@
 dnl
-dnl "$Id: cups-defaults.m4 10104 2011-11-04 06:37:03Z mike $"
+dnl "$Id: cups-defaults.m4 10709 2012-11-26 18:25:58Z mike $"
 dnl
 dnl   Default cupsd configuration settings for CUPS.
 dnl
-dnl   Copyright 2007-2011 by Apple Inc.
+dnl   Copyright 2007-2012 by Apple Inc.
 dnl   Copyright 2006-2007 by Easy Software Products, all rights reserved.
 dnl
 dnl   These coded instructions, statements, and computer programs are the
@@ -14,7 +14,7 @@ dnl   file is missing or damaged, see the license at "http://www.cups.org/".
 dnl

 dnl Default languages...
-LANGUAGES="`ls -1 locale/cups_*.po | sed -e '1,$s/locale\/cups_//' -e '1,$s/\.po//' | tr '\n' ' '`"
+LANGUAGES="`ls -1 locale/cups_*.po 2>/dev/null | sed -e '1,$s/locale\/cups_//' -e '1,$s/\.po//' | tr '\n' ' '`"

 AC_ARG_WITH(languages, [  --with-languages        set installed languages, default=all ],[
 	case "$withval" in
@@ -24,8 +24,8 @@ AC_ARG_WITH(languages, [  --with-languages        set installed languages, defau
 	esac])
 AC_SUBST(LANGUAGES)

-dnl Mac OS X bundle-based localization support
-AC_ARG_WITH(bundledir, [  --with-bundledir     set Mac OS X localization bundle directory ],
+dnl OS X bundle-based localization support
+AC_ARG_WITH(bundledir, [  --with-bundledir        set OS X localization bundle directory ],
 	CUPS_BUNDLEDIR="$withval",
 	if test "x$uname" = xDarwin -a $uversion -ge 100; then
 		CUPS_BUNDLEDIR="/System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/PrintCore.framework/Versions/A"
@@ -50,6 +50,12 @@ AC_ARG_WITH(config_file_perm, [  --with-config-file-perm set default ConfigFileP
 AC_SUBST(CUPS_CONFIG_FILE_PERM)
 AC_DEFINE_UNQUOTED(CUPS_DEFAULT_CONFIG_FILE_PERM, 0$CUPS_CONFIG_FILE_PERM)

+dnl Default permissions for cupsd
+AC_ARG_WITH(cupsd_file_perm, [  --with-cupsd-file-perm  set default cupsd permissions, default=0500],
+	CUPS_CUPSD_FILE_PERM="$withval",
+	CUPS_CUPSD_FILE_PERM="500")
+AC_SUBST(CUPS_CUPSD_FILE_PERM)
+
 dnl Default LogFilePerm
 AC_ARG_WITH(log_file_perm, [  --with-log-file-perm    set default LogFilePerm value, default=0644],
 	CUPS_LOG_FILE_PERM="$withval",
@@ -96,7 +102,7 @@ AC_ARG_WITH(local_protocols, [  --with-local-protocols  set default BrowseLocalP

 if test x$with_local_protocols != xno; then
 	if test "x$default_local_protocols" = "xdefault"; then
-		if test "x$DNSSDLIBS" != "x"; then
+		if test "x$DNSSD_BACKEND" != "x"; then
 			CUPS_BROWSE_LOCAL_PROTOCOLS="dnssd"
 		else
 			CUPS_BROWSE_LOCAL_PROTOCOLS=""
@@ -299,6 +305,7 @@ else
 fi

 AC_DEFINE_UNQUOTED(CUPS_DEFAULT_LPD_CONFIG_FILE, "$CUPS_DEFAULT_LPD_CONFIG_FILE")
+AC_SUBST(CUPS_DEFAULT_LPD_CONFIG_FILE)

 dnl Default SMB config file...
 AC_ARG_WITH(smbconfigfile, [  --with-smbconfigfile    set default SMBConfigFile URI],
@@ -320,6 +327,7 @@ else
 fi

 AC_DEFINE_UNQUOTED(CUPS_DEFAULT_SMB_CONFIG_FILE, "$CUPS_DEFAULT_SMB_CONFIG_FILE")
+AC_SUBST(CUPS_DEFAULT_SMB_CONFIG_FILE)

 dnl Default MaxCopies value...
 AC_ARG_WITH(max-copies, [  --with-max-copies       set default max copies value, default=9999 ],
@@ -367,7 +375,7 @@ AC_SUBST(DEFAULT_IPP_PORT)
 AC_DEFINE_UNQUOTED(CUPS_DEFAULT_IPP_PORT,$DEFAULT_IPP_PORT)

 dnl Web interface...
-AC_ARG_ENABLE(webif, [  --enable-webif          enable the web interface by default, default=no for Mac OS X])
+AC_ARG_ENABLE(webif, [  --enable-webif          enable the web interface by default, default=no for OS X])
 case "x$enable_webif" in
 	xno)
 		CUPS_WEBIF=No
@@ -392,5 +400,5 @@ AC_SUBST(CUPS_WEBIF)
 AC_DEFINE_UNQUOTED(CUPS_DEFAULT_WEBIF, $CUPS_DEFAULT_WEBIF)

 dnl
-dnl End of "$Id: cups-defaults.m4 10104 2011-11-04 06:37:03Z mike $".
+dnl End of "$Id: cups-defaults.m4 10709 2012-11-26 18:25:58Z mike $".
 dnl
@@ -1,9 +1,9 @@
 dnl
-dnl "$Id: cups-directories.m4 9771 2011-05-12 05:21:56Z mike $"
+dnl "$Id: cups-directories.m4 10945 2013-04-09 19:44:01Z mike $"
 dnl
 dnl   Directory stuff for CUPS.
 dnl
-dnl   Copyright 2007-2011 by Apple Inc.
+dnl   Copyright 2007-2013 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
@@ -102,11 +102,8 @@ fi
 dnl Fix "libdir" variable...
 if test "$libdir" = "\${exec_prefix}/lib"; then
 	case "$uname" in
-		IRIX*)
-			libdir="$exec_prefix/lib32"
-			;;
 		Linux*)
-			if test -d /usr/lib64; then
+			if test -d /usr/lib64 -a ! -d /usr/lib64/fakeroot; then
 				libdir="$exec_prefix/lib64"
 			fi
 			;;
@@ -169,13 +166,6 @@ if test x$rcdir = x; then
 			RCSTOP="620"
 			;;

-		IRIX*)
-			# IRIX
-			INITDIR="/etc"
-			RCSTART="60"
-			RCSTOP="25"
-			;;
-
 		Linux | GNU | GNU/k*BSD*)
 			# Linux/HURD seems to choose an init.d directory at random...
 			if test -d /sbin/init.d; then
@@ -422,19 +412,20 @@ AC_DEFINE_UNQUOTED(CUPS_SERVERROOT, "$sysconfdir/cups")
 AC_SUBST(CUPS_SERVERROOT)

 # Transient run-time state
-case "$uname" in
-	Darwin*)
-		# Darwin (Mac OS X)
-		CUPS_STATEDIR="$CUPS_SERVERROOT"
-		;;
-	*)
-		# All others
-		CUPS_STATEDIR="$localstatedir/run/cups"
-		;;
-esac
+AC_ARG_WITH(rundir, [  --with-rundir           set transient run-time state directory],CUPS_STATEDIR="$withval",[
+	case "$uname" in
+		Darwin*)
+			# Darwin (OS X)
+			CUPS_STATEDIR="$CUPS_SERVERROOT"
+			;;
+		*)
+			# All others
+			CUPS_STATEDIR="$localstatedir/run/cups"
+			;;
+	esac])
 AC_DEFINE_UNQUOTED(CUPS_STATEDIR, "$CUPS_STATEDIR")
 AC_SUBST(CUPS_STATEDIR)

 dnl
-dnl End of "$Id: cups-directories.m4 9771 2011-05-12 05:21:56Z mike $".
+dnl End of "$Id: cups-directories.m4 10945 2013-04-09 19:44:01Z mike $".
 dnl
@@ -1,9 +1,9 @@
 dnl
-dnl "$Id: cups-dnssd.m4 9771 2011-05-12 05:21:56Z mike $"
+dnl "$Id: cups-dnssd.m4 10471 2012-05-16 22:57:03Z mike $"
 dnl
 dnl   DNS Service Discovery (aka Bonjour) stuff for CUPS.
 dnl
-dnl   Copyright 2007-2011 by Apple Inc.
+dnl   Copyright 2007-2012 by Apple Inc.
 dnl
 dnl   These coded instructions, statements, and computer programs are the
 dnl   property of Apple Inc. and are protected by Federal copyright
@@ -12,7 +12,8 @@ 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_ENABLE(dnssd, [  --disable-dnssd         disable DNS Service Discovery support])
+AC_ARG_ENABLE(avahi, [  --disable-avahi         disable DNS Service Discovery support using Avahi])
+AC_ARG_ENABLE(dnssd, [  --disable-dnssd         disable DNS Service Discovery support using mDNSResponder])
 AC_ARG_WITH(dnssd-libs, [  --with-dnssd-libs       set directory for DNS Service Discovery library],
 	LDFLAGS="-L$withval $LDFLAGS"
 	DSOFLAGS="-L$withval $DSOFLAGS",)
@@ -23,14 +24,25 @@ AC_ARG_WITH(dnssd-includes, [  --with-dnssd-includes   set directory for DNS Ser
 DNSSDLIBS=""
 DNSSD_BACKEND=""

-if test x$enable_dnssd != xno; then
+if test "x$PKGCONFIG" != x -a x$enable_avahi != xno; then
+	AC_MSG_CHECKING(for Avahi)
+	if $PKGCONFIG --exists avahi-client; then
+		AC_MSG_RESULT(yes)
+		CFLAGS="$CFLAGS `$PKGCONFIG --cflags avahi-client`"
+		DNSSDLIBS="`$PKGCONFIG --libs avahi-client`"
+		DNSSD_BACKEND="dnssd"
+		AC_DEFINE(HAVE_AVAHI)
+	else
+		AC_MSG_RESULT(no)
+	fi
+fi
+
+if test "x$DNSSD_BACKEND" = x -a x$enable_dnssd != xno; then
 	AC_CHECK_HEADER(dns_sd.h, [
 		case "$uname" in
 			Darwin*)
 				# Darwin and MacOS X...
 				AC_DEFINE(HAVE_DNSSD)
-				AC_DEFINE(HAVE_COREFOUNDATION)
-				AC_DEFINE(HAVE_SYSTEMCONFIGURATION)
 				DNSSDLIBS="-framework CoreFoundation -framework SystemConfiguration"
 				DNSSD_BACKEND="dnssd"
 				;;
@@ -60,5 +72,5 @@ AC_SUBST(DNSSDLIBS)
 AC_SUBST(DNSSD_BACKEND)

 dnl
-dnl End of "$Id: cups-dnssd.m4 9771 2011-05-12 05:21:56Z mike $".
+dnl End of "$Id: cups-dnssd.m4 10471 2012-05-16 22:57:03Z mike $".
 dnl
@@ -1,9 +1,9 @@
 dnl
-dnl   "$Id: cups-gssapi.m4 10137 2011-12-02 04:04:49Z mike $"
+dnl   "$Id: cups-gssapi.m4 10784 2013-01-08 16:19:32Z mike $"
 dnl
 dnl   GSSAPI/Kerberos library detection for CUPS.
 dnl
-dnl   Copyright 2007-2011 by Apple Inc.
+dnl   Copyright 2007-2012 by Apple Inc.
 dnl   Copyright 2006-2007 by Easy Software Products.
 dnl
 dnl   This file contains Kerberos support code, copyright 2006 by
@@ -26,7 +26,7 @@ if test x$enable_gssapi != xno; then
 	if test "x$KRB5CONFIG" != x; then
 		case "$uname" in
 			Darwin)
-				# Mac OS X weak-links to the Kerberos framework...
+				# OS X weak-links to the Kerberos framework...
 				LIBGSSAPI="-weak_framework Kerberos"
 				AC_MSG_CHECKING(for GSS framework)
 				if test -d /System/Library/Frameworks/GSS.framework; then
@@ -86,13 +86,6 @@ if test x$enable_gssapi != xno; then
 			else
 				AC_MSG_RESULT(no)
 			fi
-			AC_MSG_CHECKING(for GSS/gssapi_krb5.h presence)
-			if test -f $gssdir/Headers/gssapi_krb5.h; then
-				AC_DEFINE(HAVE_GSSAPI_KRB5_H)
-				AC_MSG_RESULT(yes)
-			else
-				AC_MSG_RESULT(no)
-			fi
 			AC_MSG_CHECKING(for GSS/gssapi_spi.h presence)
 			if test -f $gssdir/PrivateHeaders/gssapi_spi.h; then
 				AC_MSG_RESULT(yes)
@@ -105,16 +98,14 @@ if test x$enable_gssapi != xno; then
 				fi
 			else
 				AC_MSG_RESULT(no)
-				if test $uversion -ge 110; then
-					# Broken public headers in 10.7...
+				if test $uversion -ge 110 -a $uversion -lt 120; then
+					# Broken public headers in 10.7.x...
 					AC_MSG_ERROR(Run 'sudo mkdir -p $gssdir/PrivateHeaders' and 'sudo touch $gssdir/PrivateHeaders/gssapi_spi.h' to build CUPS.)
 				fi
 			fi
 		else
 			AC_CHECK_HEADER(gssapi.h, AC_DEFINE(HAVE_GSSAPI_H))
 			AC_CHECK_HEADER(gssapi/gssapi.h, AC_DEFINE(HAVE_GSSAPI_GSSAPI_H))
-			AC_CHECK_HEADER(gssapi/gssapi_generic.h, AC_DEFINE(HAVE_GSSAPI_GENERIC_H))
-			AC_CHECK_HEADER(gssapi/gssapi_krb5.h, AC_DEFINE(HAVE_GSSAPI_KRB5_H))
 		fi

 		SAVELIBS="$LIBS"
@@ -167,5 +158,5 @@ AC_SUBST(CUPS_DEFAULT_GSSSERVICENAME)
 AC_DEFINE_UNQUOTED(CUPS_DEFAULT_GSSSERVICENAME, "$CUPS_DEFAULT_GSSSERVICENAME")

 dnl
-dnl End of "$Id: cups-gssapi.m4 10137 2011-12-02 04:04:49Z mike $".
+dnl End of "$Id: cups-gssapi.m4 10784 2013-01-08 16:19:32Z mike $".
 dnl
@@ -1,9 +1,9 @@
 dnl
-dnl "$Id: cups-manpages.m4 9771 2011-05-12 05:21:56Z mike $"
+dnl "$Id: cups-manpages.m4 10632 2012-10-01 04:07:51Z mike $"
 dnl
 dnl   Manpage stuff for CUPS.
 dnl
-dnl   Copyright 2007-2011 by Apple Inc.
+dnl   Copyright 2007-2012 by Apple Inc.
 dnl   Copyright 1997-2006 by Easy Software Products, all rights reserved.
 dnl
 dnl   These coded instructions, statements, and computer programs are the
@@ -28,12 +28,6 @@ if test "$mandir" = "\${prefix}/man" -a "$prefix" = "/"; then
        		AMANDIR="/usr/share/man"
        		PMANDIR="/usr/share/man"
        		;;
-        	IRIX)
-        		# SGI IRIX
-        		mandir="/usr/share/catman/u_man"
-        		AMANDIR="/usr/share/catman/a_man"
-        		PMANDIR="/usr/share/catman/p_man"
-        		;;
        	*)
        		# All others
        		mandir="/usr/man"
@@ -51,14 +45,6 @@ AC_SUBST(PMANDIR)

 dnl Setup manpage extensions...
 case "$uname" in
-	IRIX*)
-		# SGI IRIX
-		MAN1EXT=1
-		MAN5EXT=5
-		MAN7EXT=7
-		MAN8EXT=1m
-		MAN8DIR=1
-		;;
 	SunOS* | HP-UX*)
 		# Solaris and HP-UX
 		MAN1EXT=1
@@ -68,7 +54,7 @@ case "$uname" in
 		MAN8DIR=1m
 		;;
 	Linux* | GNU* | Darwin*)
-		# Linux, GNU Hurd, and Mac OS X
+		# Linux, GNU Hurd, and OS X
 		MAN1EXT=1.gz
 		MAN5EXT=5.gz
 		MAN7EXT=7.gz
@@ -92,5 +78,5 @@ AC_SUBST(MAN8EXT)
 AC_SUBST(MAN8DIR)

 dnl
-dnl End of "$Id: cups-manpages.m4 9771 2011-05-12 05:21:56Z mike $".
+dnl End of "$Id: cups-manpages.m4 10632 2012-10-01 04:07:51Z mike $".
 dnl
@@ -1,9 +1,9 @@
 dnl
-dnl "$Id: cups-opsys.m4 9771 2011-05-12 05:21:56Z mike $"
+dnl "$Id: cups-opsys.m4 10735 2012-12-07 21:40:34Z mike $"
 dnl
 dnl   Operating system stuff for CUPS.
 dnl
-dnl   Copyright 2007-2011 by Apple Inc.
+dnl   Copyright 2007-2012 by Apple Inc.
 dnl   Copyright 1997-2006 by Easy Software Products, all rights reserved.
 dnl
 dnl   These coded instructions, statements, and computer programs are the
@@ -19,17 +19,21 @@ uversion=`uname -r | sed -e '1,$s/^[[^0-9]]*\([[0-9]]*\)\.\([[0-9]]*\).*/\1\2/'`
 uarch=`uname -m`

 case "$uname" in
+	Darwin*)
+		uname="Darwin"
+		if test $uversion -lt 120; then
+			AC_MSG_ERROR([Sorry, this version of CUPS requires OS X 10.8 or higher.])
+		fi
+		;;
+
 	GNU* | GNU/*)
 		uname="GNU"
 		;;
-	IRIX*)
-		uname="IRIX"
-		;;
 	Linux*)
 		uname="Linux"
 		;;
 esac

 dnl
-dnl "$Id: cups-opsys.m4 9771 2011-05-12 05:21:56Z mike $"
+dnl "$Id: cups-opsys.m4 10735 2012-12-07 21:40:34Z mike $"
 dnl
@@ -1,9 +1,9 @@
 dnl
-dnl "$Id: cups-pam.m4 9771 2011-05-12 05:21:56Z mike $"
+dnl "$Id: cups-pam.m4 10424 2012-04-23 17:26:57Z mike $"
 dnl
 dnl   PAM stuff for CUPS.
 dnl
-dnl   Copyright 2007-2011 by Apple Inc.
+dnl   Copyright 2007-2012 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
@@ -61,7 +61,7 @@ if test x$enable_pam != xno; then

 	case "$uname" in
 		Darwin*)
-			# Darwin/Mac OS X
+			# Darwin/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
@@ -98,5 +98,5 @@ AC_SUBST(PAMMOD)
 AC_SUBST(PAMMODAUTH)

 dnl
-dnl End of "$Id: cups-pam.m4 9771 2011-05-12 05:21:56Z mike $".
+dnl End of "$Id: cups-pam.m4 10424 2012-04-23 17:26:57Z mike $".
 dnl
@@ -1,5 +1,5 @@
 dnl
-dnl "$Id: cups-sharedlibs.m4 10190 2012-01-20 16:22:58Z mike $"
+dnl "$Id: cups-sharedlibs.m4 10632 2012-10-01 04:07:51Z mike $"
 dnl
 dnl   Shared library support for CUPS.
 dnl
@@ -215,8 +215,8 @@ if test "$DSO" != ":"; then
 				EXPORT_LDFLAGS="-Wl,-R$libdir"
 			fi
 			;;
-                IRIX | Linux | GNU)
-                        # IRIX, Linux, and HURD...
+                Linux | GNU)
+                        # Linux, and HURD...
 			if test $exec_prefix != /usr; then
 				DSOFLAGS="-Wl,-rpath,$libdir $DSOFLAGS"
 				LDFLAGS="$LDFLAGS -Wl,-rpath,$libdir"
@@ -234,5 +234,5 @@ AC_SUBST(IMGLIBS)
 AC_SUBST(EXPORT_LDFLAGS)

 dnl
-dnl End of "$Id: cups-sharedlibs.m4 10190 2012-01-20 16:22:58Z mike $".
+dnl End of "$Id: cups-sharedlibs.m4 10632 2012-10-01 04:07:51Z mike $".
 dnl
@@ -1,9 +1,9 @@
 dnl
-dnl "$Id: cups-ssl.m4 9837 2011-06-16 20:12:16Z mike $"
+dnl "$Id: cups-ssl.m4 10734 2012-12-07 21:33:22Z mike $"
 dnl
 dnl   OpenSSL/GNUTLS stuff for CUPS.
 dnl
-dnl   Copyright 2007-2011 by Apple Inc.
+dnl   Copyright 2007-2012 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
@@ -27,6 +27,8 @@ AC_ARG_WITH(openssl-includes, [  --with-openssl-includes set directory for OpenS
 SSLFLAGS=""
 SSLLIBS=""
 have_ssl=0
+CUPS_SERVERCERT=""
+CUPS_SERVERKEY=""

 if test x$enable_ssl != xno; then
    dnl Look for CDSA...
@@ -36,6 +38,7 @@ if test x$enable_ssl != xno; then
 	    	have_ssl=1
 		AC_DEFINE(HAVE_SSL)
 		AC_DEFINE(HAVE_CDSASSL)
+		CUPS_SERVERCERT="/Library/Keychains/System.keychain"

 		dnl Check for the various security headers...
 		AC_CHECK_HEADER(Security/SecureTransportPriv.h,
@@ -56,40 +59,7 @@ if test x$enable_ssl != xno; then
 		AC_CHECK_HEADER(Security/SecIdentitySearchPriv.h,
 		    AC_DEFINE(HAVE_SECIDENTITYSEARCHPRIV_H))

-		dnl Check for SSLSetProtocolVersionMax...
-		SAVELIBS="$LIBS"
-		LIBS="$LIBS -framework Security"
-		AC_CHECK_FUNC(SSLSetProtocolVersionMax)
-		LIBS="$SAVELIBS"
-
-		dnl Check for SecCertificateCopyData..
-		AC_MSG_CHECKING(for SecCertificateCopyData)
-		if test $uversion -ge 100; then
-		    AC_DEFINE(HAVE_SECCERTIFICATECOPYDATA)
-		    AC_MSG_RESULT(yes)
-		else
-		    AC_MSG_RESULT(no)
-		fi
-
-		dnl Check for SecIdentitySearchCreateWithPolicy...
-		AC_MSG_CHECKING(for SecIdentitySearchCreateWithPolicy)
-		if test $uversion -ge 80; then
-		    AC_DEFINE(HAVE_SECIDENTITYSEARCHCREATEWITHPOLICY)
-		    AC_MSG_RESULT(yes)
-		else
-		    AC_MSG_RESULT(no)
-		fi
-
-		dnl Check for SecPolicyCreateSSL...
-		AC_MSG_CHECKING(for SecPolicyCreateSSL)
-		if test $uversion -ge 110; then
-		    AC_DEFINE(HAVE_SECPOLICYCREATESSL)
-		    AC_MSG_RESULT(yes)
-		else
-		    AC_MSG_RESULT(no)
-		fi])
-
-		AC_DEFINE(HAVE_CSSMERRORSTRING)
+		AC_DEFINE(HAVE_CSSMERRORSTRING)])
 	fi
    fi

@@ -112,6 +82,9 @@ if test x$enable_ssl != xno; then
 	fi

 	if test $have_ssl = 1; then
+	    CUPS_SERVERCERT="ssl/server.crt"
+	    CUPS_SERVERKEY="ssl/server.key"
+
            if $PKGCONFIG --exists gcrypt; then
 	        SSLLIBS="$SSLLIBS `$PKGCONFIG --libs gcrypt`"
 	        SSLFLAGS="$SSLFLAGS `$PKGCONFIG --cflags gcrypt`"
@@ -124,7 +97,7 @@ if test x$enable_ssl != xno; then

    dnl Check for the OpenSSL library last...
    if test $have_ssl = 0 -a "x$enable_openssl" != "xno"; then
-	AC_CHECK_HEADER(openssl/ssl.h,
+	AC_CHECK_HEADER(openssl/ssl.h,[
 	    dnl Save the current libraries so the crypto stuff isn't always
 	    dnl included...
 	    SAVELIBS="$LIBS"
@@ -136,9 +109,9 @@ if test x$enable_ssl != xno; then
 	    dnl case the RSAREF libraries are needed.

 	    for libcrypto in \
-	        "-lcrypto" \
-	        "-lcrypto -lrsaref" \
-	        "-lcrypto -lRSAglue -lrsaref"
+		"-lcrypto" \
+		"-lcrypto -lrsaref" \
+		"-lcrypto -lRSAglue -lrsaref"
 	    do
 		AC_CHECK_LIB(ssl,SSL_new,
 		    [have_ssl=1
@@ -153,7 +126,15 @@ if test x$enable_ssl != xno; then
 		fi
 	    done

-	    LIBS="$SAVELIBS")
+	    if test "x${SSLLIBS}" != "x"; then
+		CUPS_SERVERCERT="ssl/server.crt"
+		CUPS_SERVERKEY="ssl/server.key"
+
+		LIBS="$SAVELIBS $SSLLIBS"
+		AC_CHECK_FUNCS(SSL_set_tlsext_host_name)
+	    fi
+
+	    LIBS="$SAVELIBS"])
    fi
 fi

@@ -166,6 +147,8 @@ elif test x$enable_cdsa = xyes -o x$enable_gnutls = xyes -o x$enable_openssl = x
    AC_MSG_ERROR([Unable to enable SSL support.])
 fi

+AC_SUBST(CUPS_SERVERCERT)
+AC_SUBST(CUPS_SERVERKEY)
 AC_SUBST(IPPALIASES)
 AC_SUBST(SSLFLAGS)
 AC_SUBST(SSLLIBS)
@@ -173,7 +156,6 @@ AC_SUBST(SSLLIBS)
 EXPORT_SSLLIBS="$SSLLIBS"
 AC_SUBST(EXPORT_SSLLIBS)

-
 dnl
-dnl End of "$Id: cups-ssl.m4 9837 2011-06-16 20:12:16Z mike $".
+dnl End of "$Id: cups-ssl.m4 10734 2012-12-07 21:33:22Z mike $".
 dnl
@@ -3,7 +3,7 @@
 *
 *   Configuration file for CUPS.
 *
- *   Copyright 2007-2012 by Apple Inc.
+ *   Copyright 2007-2013 by Apple Inc.
 *   Copyright 1997-2007 by Easy Software Products.
 *
 *   These coded instructions, statements, and computer programs are the
@@ -32,6 +32,7 @@
 #define CUPS_DEFAULT_GROUP	"sys"
 #define CUPS_DEFAULT_SYSTEM_GROUPS	"sys root system"
 #define CUPS_DEFAULT_PRINTOPERATOR_AUTH	"@SYSTEM"
+#define CUPS_DEFAULT_SYSTEM_AUTHKEY	"system.print.admin"


 /*
@@ -131,13 +132,11 @@


 /*
- * Do we have various image libraries?
+ * Do we have ZLIB?
 */

-#undef HAVE_LIBPNG
 #undef HAVE_LIBZ
-#undef HAVE_LIBJPEG
-#undef HAVE_LIBTIFF
+#undef HAVE_INFLATECOPY


 /*
@@ -168,10 +167,10 @@


 /*
- * Do we have <scsi/sg.h>?
+ * Use <stdint.h>?
 */

-#undef HAVE_SCSI_SG_H
+#undef HAVE_STDINT_H


 /*
@@ -295,6 +294,13 @@
 #undef HAVE_SSL


+/*
+ * Do we have the SSL_set_tlsext_host_name function?
+ */
+
+#undef HAVE_SSL_SET_TLSEXT_HOST_NAME
+
+
 /*
 * What Security framework headers do we have?
 */
@@ -310,41 +316,6 @@
 #undef HAVE_SECURETRANSPORTPRIV_H


-/*
- * Do we have the SecCertificateCopyData function?
- */
-
-#undef HAVE_SECCERTIFICATECOPYDATA
-
-
-/*
- * Do we have the SecIdentitySearchCreateWithPolicy function?
- */
-
-#undef HAVE_SECIDENTITYSEARCHCREATEWITHPOLICY
-
-
-/*
- * Do we have the SecPolicyCreateSSL function?
- */
-
-#undef HAVE_SECPOLICYCREATESSL
-
-
-/*
- * Do we have the SecPolicyCreateSSL function?
- */
-
-#undef HAVE_SECPOLICYCREATESSL
-
-
-/*
- * Do we have the SSLSetProtocolVersionMax function?
- */
-
-#undef HAVE_SSLSETPROTOCOLVERSIONMAX
-
-
 /*
 * Do we have the cssmErrorString function?
 */
@@ -352,25 +323,6 @@
 #undef HAVE_CSSMERRORSTRING


-/*
- * Do we have the SLP library?
- */
-
-#undef HAVE_LIBSLP
-
-
-/*
- * Do we have an LDAP library?
- */
-
-#undef HAVE_LDAP
-#undef HAVE_OPENLDAP
-#undef HAVE_MOZILLA_LDAP
-#undef HAVE_LDAP_SSL_H
-#undef HAVE_LDAP_SSL
-#undef HAVE_LDAP_REBIND_PROC
-
-
 /*
 * Do we have libpaper?
 */
@@ -379,12 +331,19 @@


 /*
- * Do we have DNS Service Discovery (aka Bonjour)?
+ * Do we have mDNSResponder for DNS Service Discovery (aka Bonjour)?
 */

 #undef HAVE_DNSSD


+/*
+ * Do we have Avahi for DNS Service Discovery (aka Bonjour)?
+ */
+
+#undef HAVE_AVAHI
+
+
 /*
 * Do we have <sys/ioctl.h>?
 */
@@ -523,14 +482,6 @@
 #define CUPS_GHOSTSCRIPT "/usr/bin/gs"


-/*
- * Do we have Darwin's CoreFoundation and SystemConfiguration frameworks?
- */
-
-#undef HAVE_COREFOUNDATION
-#undef HAVE_SYSTEMCONFIGURATION
-
-
 /*
 * Do we have CoreFoundation public and private headers?
 */
@@ -555,7 +506,7 @@


 /*
- * Do we have Mac OS X 10.4's mbr_XXX functions?
+ * Do we have OS X 10.4's mbr_XXX functions?
 */

 #undef HAVE_MEMBERSHIP_H
@@ -595,11 +546,8 @@
 #undef HAVE_GSS_GSSAPI_H
 #undef HAVE_GSS_GSSAPI_SPI_H
 #undef HAVE_GSSAPI
-#undef HAVE_GSSAPI_GENERIC_H
 #undef HAVE_GSSAPI_GSSAPI_H
 #undef HAVE_GSSAPI_H
-#undef HAVE_GSSAPI_KRB5_H
-#undef HAVE_KRB5_H


 /*
@@ -687,7 +635,7 @@
 * Do we have libusb?
 */

-#undef HAVE_USB_H
+#undef HAVE_LIBUSB


 /*
@@ -717,24 +665,18 @@


 /*
- * Location of Mac OS X localization bundle, if any.
+ * Location of OS X localization bundle, if any.
 */

 #undef CUPS_BUNDLEDIR


-/*
- * Do we have the ColorSyncRegisterDevice function?
- */
-
-#undef HAVE_COLORSYNCREGISTERDEVICE
-
-
 /*
 * Do we have XPC?
 */

 #undef HAVE_XPC
+#undef HAVE_XPC_PRIVATE_H


 /*
@@ -744,6 +686,23 @@
 #undef HAVE_MXML_H


+/*
+ * Do we have the C99 abs() function?
+ */
+
+#undef HAVE_ABS
+#if !defined(HAVE_ABS) && !defined(abs)
+#  if defined(__GNUC__) || __STDC_VERSION__ >= 199901L
+#    define abs(x) _cups_abs(x)
+static inline int _cups_abs(int i) { return (i < 0 ? -i : i); }
+#  elif defined(_MSC_VER)
+#    define abs(x) _cups_abs(x)
+static __inline int _cups_abs(int i) { return (i < 0 ? -i : i); }
+#  else
+#    define abs(x) ((x) < 0 ? -(x) : (x))
+#  endif /* __GNUC__ || __STDC_VERSION__ */
+#endif /* !HAVE_ABS && !abs */
+
 #endif /* !_CUPS_CONFIG_H_ */

 /*
@@ -60,6 +60,7 @@ AC_SUBST(INSTALL_LANGUAGES)
 AC_SUBST(UNINSTALL_LANGUAGES)

 AC_OUTPUT(Makedefs
+	  conf/cups-files.conf
 	  conf/cupsd.conf
 	  conf/mime.convs
 	  conf/pam.std
@@ -67,13 +68,16 @@ AC_OUTPUT(Makedefs
 	  cups-config
 	  data/testprint
 	  desktop/cups.desktop
+	  doc/help/ref-cups-files-conf.html
 	  doc/help/ref-cupsd-conf.html
 	  doc/help/standard.html
 	  doc/index.html
 	  man/client.conf.man
 	  man/cups-deviced.man
 	  man/cups-driverd.man
+	  man/cups-files.conf.man
 	  man/cups-lpd.man
+	  man/cups-snmp.man
 	  man/cupsaddsmb.man
 	  man/cupsd.conf.man
 	  man/cupsd.man
@@ -1,211 +1,221 @@
-adminutil.o: adminutil.c cups-private.h ../cups/cups.h file.h \
-  versioning.h ipp.h http.h array.h language.h string-private.h \
-  ../config.h debug-private.h ppd-private.h ../cups/ppd.h pwg-private.h \
-  http-private.h md5-private.h ipp-private.h language-private.h \
-  ../cups/transcode.h thread-private.h adminutil.h
+adminutil.o: adminutil.c cups-private.h string-private.h ../config.h \
+  debug-private.h ../cups/versioning.h ipp-private.h ../cups/ipp.h \
+  http.h array.h http-private.h md5-private.h language-private.h \
+  ../cups/transcode.h language.h pwg-private.h ../cups/cups.h file.h \
+  ppd-private.h ../cups/ppd.h thread-private.h adminutil.h
 array.o: array.c string-private.h ../config.h debug-private.h \
  ../cups/versioning.h array-private.h ../cups/array.h
-attr.o: attr.c cups-private.h ../cups/cups.h file.h versioning.h ipp.h \
-  http.h array.h language.h string-private.h ../config.h debug-private.h \
-  ppd-private.h ../cups/ppd.h pwg-private.h http-private.h md5-private.h \
-  ipp-private.h language-private.h ../cups/transcode.h thread-private.h
-auth.o: auth.c cups-private.h ../cups/cups.h file.h versioning.h ipp.h \
-  http.h array.h language.h string-private.h ../config.h debug-private.h \
-  ppd-private.h ../cups/ppd.h pwg-private.h http-private.h md5-private.h \
-  ipp-private.h language-private.h ../cups/transcode.h thread-private.h
+attr.o: attr.c cups-private.h string-private.h ../config.h \
+  debug-private.h ../cups/versioning.h ipp-private.h ../cups/ipp.h \
+  http.h array.h http-private.h md5-private.h language-private.h \
+  ../cups/transcode.h language.h pwg-private.h ../cups/cups.h file.h \
+  ppd-private.h ../cups/ppd.h thread-private.h
+auth.o: auth.c cups-private.h string-private.h ../config.h \
+  debug-private.h ../cups/versioning.h ipp-private.h ../cups/ipp.h \
+  http.h array.h http-private.h md5-private.h language-private.h \
+  ../cups/transcode.h language.h pwg-private.h ../cups/cups.h file.h \
+  ppd-private.h ../cups/ppd.h thread-private.h
 backchannel.o: backchannel.c cups.h file.h versioning.h ipp.h http.h \
  array.h language.h
-backend.o: backend.c cups-private.h ../cups/cups.h file.h versioning.h \
-  ipp.h http.h array.h language.h string-private.h ../config.h \
-  debug-private.h ppd-private.h ../cups/ppd.h pwg-private.h \
-  http-private.h md5-private.h ipp-private.h language-private.h \
-  ../cups/transcode.h thread-private.h backend.h
-conflicts.o: conflicts.c cups-private.h ../cups/cups.h file.h \
-  versioning.h ipp.h http.h array.h language.h string-private.h \
-  ../config.h debug-private.h ppd-private.h ../cups/ppd.h pwg-private.h \
-  http-private.h md5-private.h ipp-private.h language-private.h \
-  ../cups/transcode.h thread-private.h
-custom.o: custom.c cups-private.h ../cups/cups.h file.h versioning.h \
-  ipp.h http.h array.h language.h string-private.h ../config.h \
-  debug-private.h ppd-private.h ../cups/ppd.h pwg-private.h \
-  http-private.h md5-private.h ipp-private.h language-private.h \
-  ../cups/transcode.h thread-private.h
-debug.o: debug.c cups-private.h ../cups/cups.h file.h versioning.h ipp.h \
-  http.h array.h language.h string-private.h ../config.h debug-private.h \
-  ppd-private.h ../cups/ppd.h pwg-private.h http-private.h md5-private.h \
-  ipp-private.h language-private.h ../cups/transcode.h thread-private.h
-dest.o: dest.c cups-private.h ../cups/cups.h file.h versioning.h ipp.h \
-  http.h array.h language.h string-private.h ../config.h debug-private.h \
-  ppd-private.h ../cups/ppd.h pwg-private.h http-private.h md5-private.h \
-  ipp-private.h language-private.h ../cups/transcode.h thread-private.h
-dest-job.o: dest-job.c cups-private.h ../cups/cups.h file.h versioning.h \
-  ipp.h http.h array.h language.h string-private.h ../config.h \
-  debug-private.h ppd-private.h ../cups/ppd.h pwg-private.h \
-  http-private.h md5-private.h ipp-private.h language-private.h \
-  ../cups/transcode.h thread-private.h
-dest-localization.o: dest-localization.c cups-private.h ../cups/cups.h \
-  file.h versioning.h ipp.h http.h array.h language.h string-private.h \
-  ../config.h debug-private.h ppd-private.h ../cups/ppd.h pwg-private.h \
-  http-private.h md5-private.h ipp-private.h language-private.h \
-  ../cups/transcode.h thread-private.h
-dest-options.o: dest-options.c cups-private.h ../cups/cups.h file.h \
-  versioning.h ipp.h http.h array.h language.h string-private.h \
-  ../config.h debug-private.h ppd-private.h ../cups/ppd.h pwg-private.h \
-  http-private.h md5-private.h ipp-private.h language-private.h \
-  ../cups/transcode.h thread-private.h
+backend.o: backend.c cups-private.h string-private.h ../config.h \
+  debug-private.h ../cups/versioning.h ipp-private.h ../cups/ipp.h \
+  http.h array.h http-private.h md5-private.h language-private.h \
+  ../cups/transcode.h language.h pwg-private.h ../cups/cups.h file.h \
+  ppd-private.h ../cups/ppd.h thread-private.h backend.h
+conflicts.o: conflicts.c cups-private.h string-private.h ../config.h \
+  debug-private.h ../cups/versioning.h ipp-private.h ../cups/ipp.h \
+  http.h array.h http-private.h md5-private.h language-private.h \
+  ../cups/transcode.h language.h pwg-private.h ../cups/cups.h file.h \
+  ppd-private.h ../cups/ppd.h thread-private.h
+custom.o: custom.c cups-private.h string-private.h ../config.h \
+  debug-private.h ../cups/versioning.h ipp-private.h ../cups/ipp.h \
+  http.h array.h http-private.h md5-private.h language-private.h \
+  ../cups/transcode.h language.h pwg-private.h ../cups/cups.h file.h \
+  ppd-private.h ../cups/ppd.h thread-private.h
+debug.o: debug.c cups-private.h string-private.h ../config.h \
+  debug-private.h ../cups/versioning.h ipp-private.h ../cups/ipp.h \
+  http.h array.h http-private.h md5-private.h language-private.h \
+  ../cups/transcode.h language.h pwg-private.h ../cups/cups.h file.h \
+  ppd-private.h ../cups/ppd.h thread-private.h
+dest.o: dest.c cups-private.h string-private.h ../config.h \
+  debug-private.h ../cups/versioning.h ipp-private.h ../cups/ipp.h \
+  http.h array.h http-private.h md5-private.h language-private.h \
+  ../cups/transcode.h language.h pwg-private.h ../cups/cups.h file.h \
+  ppd-private.h ../cups/ppd.h thread-private.h
+dest-job.o: dest-job.c cups-private.h string-private.h ../config.h \
+  debug-private.h ../cups/versioning.h ipp-private.h ../cups/ipp.h \
+  http.h array.h http-private.h md5-private.h language-private.h \
+  ../cups/transcode.h language.h pwg-private.h ../cups/cups.h file.h \
+  ppd-private.h ../cups/ppd.h thread-private.h
+dest-localization.o: dest-localization.c cups-private.h string-private.h \
+  ../config.h debug-private.h ../cups/versioning.h ipp-private.h \
+  ../cups/ipp.h http.h array.h http-private.h md5-private.h \
+  language-private.h ../cups/transcode.h language.h pwg-private.h \
+  ../cups/cups.h file.h ppd-private.h ../cups/ppd.h thread-private.h
+dest-options.o: dest-options.c cups-private.h string-private.h \
+  ../config.h debug-private.h ../cups/versioning.h ipp-private.h \
+  ../cups/ipp.h http.h array.h http-private.h md5-private.h \
+  language-private.h ../cups/transcode.h language.h pwg-private.h \
+  ../cups/cups.h file.h ppd-private.h ../cups/ppd.h thread-private.h
 dir.o: dir.c string-private.h ../config.h debug-private.h \
  ../cups/versioning.h dir.h
-emit.o: emit.c cups-private.h ../cups/cups.h file.h versioning.h ipp.h \
-  http.h array.h language.h string-private.h ../config.h debug-private.h \
-  ppd-private.h ../cups/ppd.h pwg-private.h http-private.h md5-private.h \
-  ipp-private.h language-private.h ../cups/transcode.h thread-private.h
-encode.o: encode.c cups-private.h ../cups/cups.h file.h versioning.h \
-  ipp.h http.h array.h language.h string-private.h ../config.h \
-  debug-private.h ppd-private.h ../cups/ppd.h pwg-private.h \
-  http-private.h md5-private.h ipp-private.h language-private.h \
-  ../cups/transcode.h thread-private.h
-file.o: file.c file-private.h cups-private.h ../cups/cups.h file.h \
-  versioning.h ipp.h http.h array.h language.h string-private.h \
-  ../config.h debug-private.h ppd-private.h ../cups/ppd.h pwg-private.h \
-  http-private.h md5-private.h ipp-private.h language-private.h \
-  ../cups/transcode.h thread-private.h
-getdevices.o: getdevices.c cups-private.h ../cups/cups.h file.h \
-  versioning.h ipp.h http.h array.h language.h string-private.h \
-  ../config.h debug-private.h ppd-private.h ../cups/ppd.h pwg-private.h \
-  http-private.h md5-private.h ipp-private.h language-private.h \
-  ../cups/transcode.h thread-private.h
+emit.o: emit.c cups-private.h string-private.h ../config.h \
+  debug-private.h ../cups/versioning.h ipp-private.h ../cups/ipp.h \
+  http.h array.h http-private.h md5-private.h language-private.h \
+  ../cups/transcode.h language.h pwg-private.h ../cups/cups.h file.h \
+  ppd-private.h ../cups/ppd.h thread-private.h
+encode.o: encode.c cups-private.h string-private.h ../config.h \
+  debug-private.h ../cups/versioning.h ipp-private.h ../cups/ipp.h \
+  http.h array.h http-private.h md5-private.h language-private.h \
+  ../cups/transcode.h language.h pwg-private.h ../cups/cups.h file.h \
+  ppd-private.h ../cups/ppd.h thread-private.h
+file.o: file.c file-private.h cups-private.h string-private.h ../config.h \
+  debug-private.h ../cups/versioning.h ipp-private.h ../cups/ipp.h \
+  http.h array.h http-private.h md5-private.h language-private.h \
+  ../cups/transcode.h language.h pwg-private.h ../cups/cups.h file.h \
+  ppd-private.h ../cups/ppd.h thread-private.h
+getdevices.o: getdevices.c cups-private.h string-private.h ../config.h \
+  debug-private.h ../cups/versioning.h ipp-private.h ../cups/ipp.h \
+  http.h array.h http-private.h md5-private.h language-private.h \
+  ../cups/transcode.h language.h pwg-private.h ../cups/cups.h file.h \
+  ppd-private.h ../cups/ppd.h thread-private.h
 getifaddrs.o: getifaddrs.c http-private.h ../config.h ../cups/http.h \
  versioning.h array.h md5-private.h ipp-private.h ../cups/ipp.h
-getputfile.o: getputfile.c cups-private.h ../cups/cups.h file.h \
-  versioning.h ipp.h http.h array.h language.h string-private.h \
-  ../config.h debug-private.h ppd-private.h ../cups/ppd.h pwg-private.h \
-  http-private.h md5-private.h ipp-private.h language-private.h \
-  ../cups/transcode.h thread-private.h
-globals.o: globals.c cups-private.h ../cups/cups.h file.h versioning.h \
-  ipp.h http.h array.h language.h string-private.h ../config.h \
-  debug-private.h ppd-private.h ../cups/ppd.h pwg-private.h \
-  http-private.h md5-private.h ipp-private.h language-private.h \
-  ../cups/transcode.h thread-private.h
-http.o: http.c cups-private.h ../cups/cups.h file.h versioning.h ipp.h \
-  http.h array.h language.h string-private.h ../config.h debug-private.h \
-  ppd-private.h ../cups/ppd.h pwg-private.h http-private.h md5-private.h \
-  ipp-private.h language-private.h ../cups/transcode.h thread-private.h
-http-addr.o: http-addr.c cups-private.h ../cups/cups.h file.h \
-  versioning.h ipp.h http.h array.h language.h string-private.h \
-  ../config.h debug-private.h ppd-private.h ../cups/ppd.h pwg-private.h \
-  http-private.h md5-private.h ipp-private.h language-private.h \
-  ../cups/transcode.h thread-private.h
-http-addrlist.o: http-addrlist.c cups-private.h ../cups/cups.h file.h \
-  versioning.h ipp.h http.h array.h language.h string-private.h \
-  ../config.h debug-private.h ppd-private.h ../cups/ppd.h pwg-private.h \
-  http-private.h md5-private.h ipp-private.h language-private.h \
-  ../cups/transcode.h thread-private.h
-http-support.o: http-support.c cups-private.h ../cups/cups.h file.h \
-  versioning.h ipp.h http.h array.h language.h string-private.h \
-  ../config.h debug-private.h ppd-private.h ../cups/ppd.h pwg-private.h \
-  http-private.h md5-private.h ipp-private.h language-private.h \
-  ../cups/transcode.h thread-private.h
-ipp.o: ipp.c cups-private.h ../cups/cups.h file.h versioning.h ipp.h \
-  http.h array.h language.h string-private.h ../config.h debug-private.h \
-  ppd-private.h ../cups/ppd.h pwg-private.h http-private.h md5-private.h \
-  ipp-private.h language-private.h ../cups/transcode.h thread-private.h
-ipp-support.o: ipp-support.c cups-private.h ../cups/cups.h file.h \
-  versioning.h ipp.h http.h array.h language.h string-private.h \
-  ../config.h debug-private.h ppd-private.h ../cups/ppd.h pwg-private.h \
-  http-private.h md5-private.h ipp-private.h language-private.h \
-  ../cups/transcode.h thread-private.h
-langprintf.o: langprintf.c cups-private.h ../cups/cups.h file.h \
-  versioning.h ipp.h http.h array.h language.h string-private.h \
-  ../config.h debug-private.h ppd-private.h ../cups/ppd.h pwg-private.h \
-  http-private.h md5-private.h ipp-private.h language-private.h \
-  ../cups/transcode.h thread-private.h
-language.o: language.c cups-private.h ../cups/cups.h file.h versioning.h \
-  ipp.h http.h array.h language.h string-private.h ../config.h \
-  debug-private.h ppd-private.h ../cups/ppd.h pwg-private.h \
-  http-private.h md5-private.h ipp-private.h language-private.h \
-  ../cups/transcode.h thread-private.h
-localize.o: localize.c cups-private.h ../cups/cups.h file.h versioning.h \
-  ipp.h http.h array.h language.h string-private.h ../config.h \
-  debug-private.h ppd-private.h ../cups/ppd.h pwg-private.h \
-  http-private.h md5-private.h ipp-private.h language-private.h \
-  ../cups/transcode.h thread-private.h
-mark.o: mark.c cups-private.h ../cups/cups.h file.h versioning.h ipp.h \
-  http.h array.h language.h string-private.h ../config.h debug-private.h \
-  ppd-private.h ../cups/ppd.h pwg-private.h http-private.h md5-private.h \
-  ipp-private.h language-private.h ../cups/transcode.h thread-private.h
+getputfile.o: getputfile.c cups-private.h string-private.h ../config.h \
+  debug-private.h ../cups/versioning.h ipp-private.h ../cups/ipp.h \
+  http.h array.h http-private.h md5-private.h language-private.h \
+  ../cups/transcode.h language.h pwg-private.h ../cups/cups.h file.h \
+  ppd-private.h ../cups/ppd.h thread-private.h
+globals.o: globals.c cups-private.h string-private.h ../config.h \
+  debug-private.h ../cups/versioning.h ipp-private.h ../cups/ipp.h \
+  http.h array.h http-private.h md5-private.h language-private.h \
+  ../cups/transcode.h language.h pwg-private.h ../cups/cups.h file.h \
+  ppd-private.h ../cups/ppd.h thread-private.h
+http.o: http.c cups-private.h string-private.h ../config.h \
+  debug-private.h ../cups/versioning.h ipp-private.h ../cups/ipp.h \
+  http.h array.h http-private.h md5-private.h language-private.h \
+  ../cups/transcode.h language.h pwg-private.h ../cups/cups.h file.h \
+  ppd-private.h ../cups/ppd.h thread-private.h
+http-addr.o: http-addr.c cups-private.h string-private.h ../config.h \
+  debug-private.h ../cups/versioning.h ipp-private.h ../cups/ipp.h \
+  http.h array.h http-private.h md5-private.h language-private.h \
+  ../cups/transcode.h language.h pwg-private.h ../cups/cups.h file.h \
+  ppd-private.h ../cups/ppd.h thread-private.h
+http-addrlist.o: http-addrlist.c cups-private.h string-private.h \
+  ../config.h debug-private.h ../cups/versioning.h ipp-private.h \
+  ../cups/ipp.h http.h array.h http-private.h md5-private.h \
+  language-private.h ../cups/transcode.h language.h pwg-private.h \
+  ../cups/cups.h file.h ppd-private.h ../cups/ppd.h thread-private.h
+http-support.o: http-support.c cups-private.h string-private.h \
+  ../config.h debug-private.h ../cups/versioning.h ipp-private.h \
+  ../cups/ipp.h http.h array.h http-private.h md5-private.h \
+  language-private.h ../cups/transcode.h language.h pwg-private.h \
+  ../cups/cups.h file.h ppd-private.h ../cups/ppd.h thread-private.h
+ipp.o: ipp.c cups-private.h string-private.h ../config.h debug-private.h \
+  ../cups/versioning.h ipp-private.h ../cups/ipp.h http.h array.h \
+  http-private.h md5-private.h language-private.h ../cups/transcode.h \
+  language.h pwg-private.h ../cups/cups.h file.h ppd-private.h \
+  ../cups/ppd.h thread-private.h
+ipp-support.o: ipp-support.c cups-private.h string-private.h ../config.h \
+  debug-private.h ../cups/versioning.h ipp-private.h ../cups/ipp.h \
+  http.h array.h http-private.h md5-private.h language-private.h \
+  ../cups/transcode.h language.h pwg-private.h ../cups/cups.h file.h \
+  ppd-private.h ../cups/ppd.h thread-private.h
+langprintf.o: langprintf.c cups-private.h string-private.h ../config.h \
+  debug-private.h ../cups/versioning.h ipp-private.h ../cups/ipp.h \
+  http.h array.h http-private.h md5-private.h language-private.h \
+  ../cups/transcode.h language.h pwg-private.h ../cups/cups.h file.h \
+  ppd-private.h ../cups/ppd.h thread-private.h
+language.o: language.c cups-private.h string-private.h ../config.h \
+  debug-private.h ../cups/versioning.h ipp-private.h ../cups/ipp.h \
+  http.h array.h http-private.h md5-private.h language-private.h \
+  ../cups/transcode.h language.h pwg-private.h ../cups/cups.h file.h \
+  ppd-private.h ../cups/ppd.h thread-private.h
+localize.o: localize.c cups-private.h string-private.h ../config.h \
+  debug-private.h ../cups/versioning.h ipp-private.h ../cups/ipp.h \
+  http.h array.h http-private.h md5-private.h language-private.h \
+  ../cups/transcode.h language.h pwg-private.h ../cups/cups.h file.h \
+  ppd-private.h ../cups/ppd.h thread-private.h
+mark.o: mark.c cups-private.h string-private.h ../config.h \
+  debug-private.h ../cups/versioning.h ipp-private.h ../cups/ipp.h \
+  http.h array.h http-private.h md5-private.h language-private.h \
+  ../cups/transcode.h language.h pwg-private.h ../cups/cups.h file.h \
+  ppd-private.h ../cups/ppd.h thread-private.h
 md5.o: md5.c md5-private.h string-private.h ../config.h
 md5passwd.o: md5passwd.c http-private.h ../config.h ../cups/http.h \
  versioning.h array.h md5-private.h ipp-private.h ../cups/ipp.h \
  string-private.h
-notify.o: notify.c cups-private.h ../cups/cups.h file.h versioning.h \
-  ipp.h http.h array.h language.h string-private.h ../config.h \
-  debug-private.h ppd-private.h ../cups/ppd.h pwg-private.h \
-  http-private.h md5-private.h ipp-private.h language-private.h \
-  ../cups/transcode.h thread-private.h
-options.o: options.c cups-private.h ../cups/cups.h file.h versioning.h \
-  ipp.h http.h array.h language.h string-private.h ../config.h \
-  debug-private.h ppd-private.h ../cups/ppd.h pwg-private.h \
-  http-private.h md5-private.h ipp-private.h language-private.h \
-  ../cups/transcode.h thread-private.h
+notify.o: notify.c cups-private.h string-private.h ../config.h \
+  debug-private.h ../cups/versioning.h ipp-private.h ../cups/ipp.h \
+  http.h array.h http-private.h md5-private.h language-private.h \
+  ../cups/transcode.h language.h pwg-private.h ../cups/cups.h file.h \
+  ppd-private.h ../cups/ppd.h thread-private.h
+options.o: options.c cups-private.h string-private.h ../config.h \
+  debug-private.h ../cups/versioning.h ipp-private.h ../cups/ipp.h \
+  http.h array.h http-private.h md5-private.h language-private.h \
+  ../cups/transcode.h language.h pwg-private.h ../cups/cups.h file.h \
+  ppd-private.h ../cups/ppd.h thread-private.h
 page.o: page.c string-private.h ../config.h debug-private.h \
  ../cups/versioning.h ppd.h cups.h file.h ipp.h http.h array.h \
  language.h
-ppd.o: ppd.c cups-private.h ../cups/cups.h file.h versioning.h ipp.h \
-  http.h array.h language.h string-private.h ../config.h debug-private.h \
-  ppd-private.h ../cups/ppd.h pwg-private.h http-private.h md5-private.h \
-  ipp-private.h language-private.h ../cups/transcode.h thread-private.h
-ppd-cache.o: ppd-cache.c cups-private.h ../cups/cups.h file.h \
-  versioning.h ipp.h http.h array.h language.h string-private.h \
-  ../config.h debug-private.h ppd-private.h ../cups/ppd.h pwg-private.h \
-  http-private.h md5-private.h ipp-private.h language-private.h \
-  ../cups/transcode.h thread-private.h
-pwg-media.o: pwg-media.c cups-private.h ../cups/cups.h file.h \
-  versioning.h ipp.h http.h array.h language.h string-private.h \
-  ../config.h debug-private.h ppd-private.h ../cups/ppd.h pwg-private.h \
-  http-private.h md5-private.h ipp-private.h language-private.h \
-  ../cups/transcode.h thread-private.h
-request.o: request.c cups-private.h ../cups/cups.h file.h versioning.h \
-  ipp.h http.h array.h language.h string-private.h ../config.h \
-  debug-private.h ppd-private.h ../cups/ppd.h pwg-private.h \
-  http-private.h md5-private.h ipp-private.h language-private.h \
-  ../cups/transcode.h thread-private.h
+ppd.o: ppd.c cups-private.h string-private.h ../config.h debug-private.h \
+  ../cups/versioning.h ipp-private.h ../cups/ipp.h http.h array.h \
+  http-private.h md5-private.h language-private.h ../cups/transcode.h \
+  language.h pwg-private.h ../cups/cups.h file.h ppd-private.h \
+  ../cups/ppd.h thread-private.h
+ppd-cache.o: ppd-cache.c cups-private.h string-private.h ../config.h \
+  debug-private.h ../cups/versioning.h ipp-private.h ../cups/ipp.h \
+  http.h array.h http-private.h md5-private.h language-private.h \
+  ../cups/transcode.h language.h pwg-private.h ../cups/cups.h file.h \
+  ppd-private.h ../cups/ppd.h thread-private.h
+pwg-media.o: pwg-media.c cups-private.h string-private.h ../config.h \
+  debug-private.h ../cups/versioning.h ipp-private.h ../cups/ipp.h \
+  http.h array.h http-private.h md5-private.h language-private.h \
+  ../cups/transcode.h language.h pwg-private.h ../cups/cups.h file.h \
+  ppd-private.h ../cups/ppd.h thread-private.h
+request.o: request.c cups-private.h string-private.h ../config.h \
+  debug-private.h ../cups/versioning.h ipp-private.h ../cups/ipp.h \
+  http.h array.h http-private.h md5-private.h language-private.h \
+  ../cups/transcode.h language.h pwg-private.h ../cups/cups.h file.h \
+  ppd-private.h ../cups/ppd.h thread-private.h
 sidechannel.o: sidechannel.c sidechannel.h versioning.h cups-private.h \
-  ../cups/cups.h file.h ipp.h http.h array.h language.h string-private.h \
-  ../config.h debug-private.h ppd-private.h ../cups/ppd.h pwg-private.h \
-  http-private.h md5-private.h ipp-private.h language-private.h \
-  ../cups/transcode.h thread-private.h
-snmp.o: snmp.c cups-private.h ../cups/cups.h file.h versioning.h ipp.h \
-  http.h array.h language.h string-private.h ../config.h debug-private.h \
-  ppd-private.h ../cups/ppd.h pwg-private.h http-private.h md5-private.h \
-  ipp-private.h language-private.h ../cups/transcode.h thread-private.h \
-  snmp-private.h
+  string-private.h ../config.h debug-private.h ipp-private.h \
+  ../cups/ipp.h http.h array.h http-private.h md5-private.h \
+  language-private.h ../cups/transcode.h language.h pwg-private.h \
+  ../cups/cups.h file.h ppd-private.h ../cups/ppd.h thread-private.h
+snmp.o: snmp.c cups-private.h string-private.h ../config.h \
+  debug-private.h ../cups/versioning.h ipp-private.h ../cups/ipp.h \
+  http.h array.h http-private.h md5-private.h language-private.h \
+  ../cups/transcode.h language.h pwg-private.h ../cups/cups.h file.h \
+  ppd-private.h ../cups/ppd.h thread-private.h snmp-private.h
 snprintf.o: snprintf.c string-private.h ../config.h
 string.o: string.c string-private.h ../config.h debug-private.h \
  ../cups/versioning.h thread-private.h array.h
-tempfile.o: tempfile.c cups-private.h ../cups/cups.h file.h versioning.h \
-  ipp.h http.h array.h language.h string-private.h ../config.h \
-  debug-private.h ppd-private.h ../cups/ppd.h pwg-private.h \
-  http-private.h md5-private.h ipp-private.h language-private.h \
-  ../cups/transcode.h thread-private.h
-thread.o: thread.c cups-private.h ../cups/cups.h file.h versioning.h \
-  ipp.h http.h array.h language.h string-private.h ../config.h \
-  debug-private.h ppd-private.h ../cups/ppd.h pwg-private.h \
-  http-private.h md5-private.h ipp-private.h language-private.h \
-  ../cups/transcode.h thread-private.h
-transcode.o: transcode.c cups-private.h ../cups/cups.h file.h \
-  versioning.h ipp.h http.h array.h language.h string-private.h \
-  ../config.h debug-private.h ppd-private.h ../cups/ppd.h pwg-private.h \
-  http-private.h md5-private.h ipp-private.h language-private.h \
-  ../cups/transcode.h thread-private.h
-usersys.o: usersys.c cups-private.h ../cups/cups.h file.h versioning.h \
-  ipp.h http.h array.h language.h string-private.h ../config.h \
-  debug-private.h ppd-private.h ../cups/ppd.h pwg-private.h \
-  http-private.h md5-private.h ipp-private.h language-private.h \
-  ../cups/transcode.h thread-private.h
-util.o: util.c cups-private.h ../cups/cups.h file.h versioning.h ipp.h \
-  http.h array.h language.h string-private.h ../config.h debug-private.h \
-  ppd-private.h ../cups/ppd.h pwg-private.h http-private.h md5-private.h \
-  ipp-private.h language-private.h ../cups/transcode.h thread-private.h
+tempfile.o: tempfile.c cups-private.h string-private.h ../config.h \
+  debug-private.h ../cups/versioning.h ipp-private.h ../cups/ipp.h \
+  http.h array.h http-private.h md5-private.h language-private.h \
+  ../cups/transcode.h language.h pwg-private.h ../cups/cups.h file.h \
+  ppd-private.h ../cups/ppd.h thread-private.h
+thread.o: thread.c cups-private.h string-private.h ../config.h \
+  debug-private.h ../cups/versioning.h ipp-private.h ../cups/ipp.h \
+  http.h array.h http-private.h md5-private.h language-private.h \
+  ../cups/transcode.h language.h pwg-private.h ../cups/cups.h file.h \
+  ppd-private.h ../cups/ppd.h thread-private.h
+transcode.o: transcode.c cups-private.h string-private.h ../config.h \
+  debug-private.h ../cups/versioning.h ipp-private.h ../cups/ipp.h \
+  http.h array.h http-private.h md5-private.h language-private.h \
+  ../cups/transcode.h language.h pwg-private.h ../cups/cups.h file.h \
+  ppd-private.h ../cups/ppd.h thread-private.h
+usersys.o: usersys.c cups-private.h string-private.h ../config.h \
+  debug-private.h ../cups/versioning.h ipp-private.h ../cups/ipp.h \
+  http.h array.h http-private.h md5-private.h language-private.h \
+  ../cups/transcode.h language.h pwg-private.h ../cups/cups.h file.h \
+  ppd-private.h ../cups/ppd.h thread-private.h
+util.o: util.c cups-private.h string-private.h ../config.h \
+  debug-private.h ../cups/versioning.h ipp-private.h ../cups/ipp.h \
+  http.h array.h http-private.h md5-private.h language-private.h \
+  ../cups/transcode.h language.h pwg-private.h ../cups/cups.h file.h \
+  ppd-private.h ../cups/ppd.h thread-private.h
 testadmin.o: testadmin.c adminutil.h cups.h file.h versioning.h ipp.h \
  http.h array.h language.h string-private.h ../config.h
 testarray.o: testarray.c string-private.h ../config.h debug-private.h \
@@ -223,28 +233,28 @@ testi18n.o: testi18n.c string-private.h ../config.h language-private.h \
  ../cups/transcode.h language.h array.h versioning.h
 testipp.o: testipp.c file.h versioning.h string-private.h ../config.h \
  ipp-private.h ../cups/ipp.h http.h array.h
-testoptions.o: testoptions.c cups-private.h ../cups/cups.h file.h \
-  versioning.h ipp.h http.h array.h language.h string-private.h \
-  ../config.h debug-private.h ppd-private.h ../cups/ppd.h pwg-private.h \
-  http-private.h md5-private.h ipp-private.h language-private.h \
-  ../cups/transcode.h thread-private.h
-testlang.o: testlang.c cups-private.h ../cups/cups.h file.h versioning.h \
-  ipp.h http.h array.h language.h string-private.h ../config.h \
-  debug-private.h ppd-private.h ../cups/ppd.h pwg-private.h \
-  http-private.h md5-private.h ipp-private.h language-private.h \
-  ../cups/transcode.h thread-private.h
-testppd.o: testppd.c cups-private.h ../cups/cups.h file.h versioning.h \
-  ipp.h http.h array.h language.h string-private.h ../config.h \
-  debug-private.h ppd-private.h ../cups/ppd.h pwg-private.h \
-  http-private.h md5-private.h ipp-private.h language-private.h \
-  ../cups/transcode.h thread-private.h
+testoptions.o: testoptions.c cups-private.h string-private.h ../config.h \
+  debug-private.h ../cups/versioning.h ipp-private.h ../cups/ipp.h \
+  http.h array.h http-private.h md5-private.h language-private.h \
+  ../cups/transcode.h language.h pwg-private.h ../cups/cups.h file.h \
+  ppd-private.h ../cups/ppd.h thread-private.h
+testlang.o: testlang.c cups-private.h string-private.h ../config.h \
+  debug-private.h ../cups/versioning.h ipp-private.h ../cups/ipp.h \
+  http.h array.h http-private.h md5-private.h language-private.h \
+  ../cups/transcode.h language.h pwg-private.h ../cups/cups.h file.h \
+  ppd-private.h ../cups/ppd.h thread-private.h
+testppd.o: testppd.c cups-private.h string-private.h ../config.h \
+  debug-private.h ../cups/versioning.h ipp-private.h ../cups/ipp.h \
+  http.h array.h http-private.h md5-private.h language-private.h \
+  ../cups/transcode.h language.h pwg-private.h ../cups/cups.h file.h \
+  ppd-private.h ../cups/ppd.h thread-private.h
 testpwg.o: testpwg.c ppd-private.h ../cups/cups.h file.h versioning.h \
  ipp.h http.h array.h language.h ../cups/ppd.h pwg-private.h \
  file-private.h cups-private.h string-private.h ../config.h \
-  debug-private.h http-private.h md5-private.h ipp-private.h \
+  debug-private.h ipp-private.h http-private.h md5-private.h \
  language-private.h ../cups/transcode.h thread-private.h
-testsnmp.o: testsnmp.c cups-private.h ../cups/cups.h file.h versioning.h \
-  ipp.h http.h array.h language.h string-private.h ../config.h \
-  debug-private.h ppd-private.h ../cups/ppd.h pwg-private.h \
-  http-private.h md5-private.h ipp-private.h language-private.h \
-  ../cups/transcode.h thread-private.h snmp-private.h
+testsnmp.o: testsnmp.c cups-private.h string-private.h ../config.h \
+  debug-private.h ../cups/versioning.h ipp-private.h ../cups/ipp.h \
+  http.h array.h http-private.h md5-private.h language-private.h \
+  ../cups/transcode.h language.h pwg-private.h ../cups/cups.h file.h \
+  ppd-private.h ../cups/ppd.h thread-private.h snmp-private.h
@@ -3,7 +3,7 @@
 #
 #   API library Makefile for CUPS.
 #
-#   Copyright 2007-2012 by Apple Inc.
+#   Copyright 2007-2013 by Apple Inc.
 #   Copyright 1997-2006 by Easy Software Products, all rights reserved.
 #
 #   These coded instructions, statements, and computer programs are the
@@ -17,6 +17,14 @@

 include ../Makedefs

+
+#
+# Options to build libcups without the use of deprecated APIs...
+#
+
+OPTIONS	=	-D_CUPS_NO_DEPRECATED=1 -D_PPD_DEPRECATED=""
+
+
 #
 # Object files...
 #
@@ -105,6 +113,7 @@ HEADERS	=	\
 		ipp.h \
 		language.h \
 		ppd.h \
+		pwg.h \
 		raster.h \
 		sidechannel.h \
 		transcode.h \
@@ -192,6 +201,14 @@ depend:
 	$(CC) -MM $(ALL_CFLAGS) $(OBJS:.o=.c) >Dependencies


+#
+# Run oclint to check code coverage...
+#
+
+oclint:
+	oclint -o=oclint.html -html $(LIBOBJS:.o=.c) -- $(ALL_CFLAGS)
+
+
 #
 # Install all targets...
 #
@@ -251,6 +268,7 @@ install-libs: $(INSTALLSTATIC)
 	if test "x$(SYMROOT)" != "x"; then \
 		$(INSTALL_DIR) $(SYMROOT); \
 		cp $(LIBCUPS) $(SYMROOT); \
+		dsymutil $(SYMROOT)/$(LIBCUPS); \
 	fi

 installstatic:
@@ -304,7 +322,7 @@ libcups.2.dylib:	$(LIBOBJS) $(LIBCUPSORDER)
 	echo Linking $@...
 	$(DSO) $(ARCHFLAGS) $(DSOFLAGS) -o $@ \
 		-install_name $(libdir)/$@ \
-		-current_version 2.9.0 \
+		-current_version 2.10.0 \
 		-compatibility_version 2.0.0 \
 		-exported_symbols_list t.exp \
 		$(LIBOBJS) $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) \
@@ -333,7 +351,7 @@ libcups_s.a:	$(LIBOBJS) libcups_s.exp
 libcups.la:    $(LIBOBJS)
 	echo Linking $@...
 	$(CC) $(ARCHFLAGS) $(DSOFLAGS) -o $@ $(LIBOBJS:.o=.lo) \
-		-rpath $(LIBDIR) -version-info 2:9 $(LIBGSSAPI) $(SSLLIBS) \
+		-rpath $(LIBDIR) -version-info 2:10 $(LIBGSSAPI) $(SSLLIBS) \
 		$(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)


@@ -518,8 +536,8 @@ apihelp:
 		--css ../doc/cups-printable.css \
 		--header api-cups.header --intro api-cups.shtml \
 		api-cups.xml \
-		cups.h adminutil.c dest.c language.c notify.c \
-		options.c tempfile.c usersys.c \
+		cups.h pwg.h adminutil.c dest*.c language.c notify.c \
+		options.c pwg-media.c tempfile.c usersys.c \
 		util.c >../doc/help/api-cups.html
 	mxmldoc --tokens help/api-cups.html api-cups.xml >../doc/help/api-cups.tokens
 	$(RM) api-cups.xml
@@ -573,7 +591,7 @@ framedhelp:
 		--section "Programming" --title "CUPS API" \
 		--css ../doc/cups-printable.css \
 		--header api-cups.header --intro api-cups.shtml \
-		cups.h adminutil.c dest.c language.c notify.c \
+		cups.h adminutil.c dest*.c language.c notify.c \
 		options.c tempfile.c usersys.c \
 		util.c
 	mxmldoc --framed api-filedir \
@@ -3,7 +3,7 @@
 *
 *   Administration utility API definitions for CUPS.
 *
- *   Copyright 2007-2011 by Apple Inc.
+ *   Copyright 2007-2013 by Apple Inc.
 *   Copyright 2001-2007 by Easy Software Products.
 *
 *   These coded instructions, statements, and computer programs are the
@@ -65,7 +65,7 @@ static void		write_option(cups_file_t *dstfp, int order,
 /*
 * 'cupsAdminCreateWindowsPPD()' - Create the Windows PPD file for a printer.
 *
- * @since CUPS 1.2/Mac OS X 10.5@
+ * @deprecated@
 */

 char *					/* O - PPD file or NULL */
@@ -129,7 +129,7 @@ cupsAdminCreateWindowsPPD(
  * Get the supported banner pages, etc. for the printer...
  */

-  request = ippNewRequest(IPP_GET_PRINTER_ATTRIBUTES);
+  request = ippNewRequest(IPP_OP_GET_PRINTER_ATTRIBUTES);

  httpAssembleURIf(HTTP_URI_CODING_ALL, uri, sizeof(uri), "ipp", NULL,
                   "localhost", 0, "/printers/%s", dest);
@@ -145,7 +145,7 @@ cupsAdminCreateWindowsPPD(
  */

  response = cupsDoRequest(http, request, "/");
-  if (!response || cupsLastError() > IPP_OK_CONFLICT)
+  if (!response || cupsLastError() > IPP_STATUS_OK_CONFLICTING)
  {
    unlink(src);
    return (NULL);
@@ -253,7 +253,7 @@ cupsAdminCreateWindowsPPD(
        snprintf(line, sizeof(line),
 	         _cupsLangString(language, _("Missing value on line %d.")),
 		 linenum);
-        _cupsSetError(IPP_DOCUMENT_FORMAT_ERROR, line, 0);
+        _cupsSetError(IPP_STATUS_ERROR_DOCUMENT_FORMAT_ERROR, line, 0);

        cupsFileClose(srcfp);
        cupsFileClose(dstfp);
@@ -272,7 +272,7 @@ cupsAdminCreateWindowsPPD(
 	         _cupsLangString(language,
 		                 _("Missing double quote on line %d.")),
 	         linenum);
-        _cupsSetError(IPP_DOCUMENT_FORMAT_ERROR, line, 0);
+        _cupsSetError(IPP_STATUS_ERROR_DOCUMENT_FORMAT_ERROR, line, 0);

        cupsFileClose(srcfp);
        cupsFileClose(dstfp);
@@ -291,7 +291,7 @@ cupsAdminCreateWindowsPPD(
 	         _cupsLangString(language,
 		                 _("Bad option + choice on line %d.")),
 	         linenum);
-        _cupsSetError(IPP_DOCUMENT_FORMAT_ERROR, line, 0);
+        _cupsSetError(IPP_STATUS_ERROR_DOCUMENT_FORMAT_ERROR, line, 0);

        cupsFileClose(srcfp);
        cupsFileClose(dstfp);
@@ -334,7 +334,7 @@ cupsAdminCreateWindowsPPD(

  if (linenum == 0)
  {
-    _cupsSetError(IPP_DOCUMENT_FORMAT_ERROR, _("Empty PPD file."), 1);
+    _cupsSetError(IPP_STATUS_ERROR_DOCUMENT_FORMAT_ERROR, _("Empty PPD file."), 1);

    cupsFileClose(dstfp);
    unlink(buffer);
@@ -393,7 +393,7 @@ cupsAdminCreateWindowsPPD(
 /*
 * 'cupsAdminExportSamba()' - Export a printer to Samba.
 *
- * @since CUPS 1.2/Mac OS X 10.5@
+ * @deprecated@
 */

 int					/* O - 1 on success, 0 on failure */
@@ -424,7 +424,7 @@ cupsAdminExportSamba(

  if (!dest || !ppd || !samba_server || !samba_user || !samba_password)
  {
-    _cupsSetError(IPP_INTERNAL_ERROR, strerror(EINVAL), 0);
+    _cupsSetError(IPP_STATUS_ERROR_INTERNAL, strerror(EINVAL), 0);
    return (0);
  }

@@ -434,7 +434,7 @@ cupsAdminExportSamba(

  if ((fp = cupsTempFile2(authfile, sizeof(authfile))) == NULL)
  {
-    _cupsSetError(IPP_INTERNAL_ERROR, NULL, 0);
+    _cupsSetError(IPP_STATUS_ERROR_INTERNAL, NULL, 0);
    return (0);
  }

@@ -487,7 +487,7 @@ cupsAdminExportSamba(
 	                       _("Unable to copy Windows 2000 printer "
 	                         "driver files (%d).")), status);

-      _cupsSetError(IPP_INTERNAL_ERROR, message, 0);
+      _cupsSetError(IPP_STATUS_ERROR_INTERNAL, message, 0);

      if (logfile)
 	_cupsLangPuts(logfile, message);
@@ -522,7 +522,7 @@ cupsAdminExportSamba(
 	                         _("Unable to copy CUPS printer driver "
 				   "files (%d).")), status);

-	_cupsSetError(IPP_INTERNAL_ERROR, message, 0);
+	_cupsSetError(IPP_STATUS_ERROR_INTERNAL, message, 0);

 	if (logfile)
 	  _cupsLangPuts(logfile, message);
@@ -565,7 +565,7 @@ cupsAdminExportSamba(
                	       _("Unable to install Windows 2000 printer "
 		        	 "driver files (%d).")), status);

-      _cupsSetError(IPP_INTERNAL_ERROR, message, 0);
+      _cupsSetError(IPP_STATUS_ERROR_INTERNAL, message, 0);

      if (logfile)
 	_cupsLangPuts(logfile, message);
@@ -610,7 +610,7 @@ cupsAdminExportSamba(
                	       _("Unable to copy Windows 9x printer "
 		        	 "driver files (%d).")), status);

-      _cupsSetError(IPP_INTERNAL_ERROR, message, 0);
+      _cupsSetError(IPP_STATUS_ERROR_INTERNAL, message, 0);

      if (logfile)
 	_cupsLangPuts(logfile, message);
@@ -639,7 +639,7 @@ cupsAdminExportSamba(
                	       _("Unable to install Windows 9x printer "
 		        	 "driver files (%d).")), status);

-      _cupsSetError(IPP_INTERNAL_ERROR, message, 0);
+      _cupsSetError(IPP_STATUS_ERROR_INTERNAL, message, 0);

      if (logfile)
 	_cupsLangPuts(logfile, message);
@@ -691,7 +691,7 @@ cupsAdminExportSamba(
 	                       _("Unable to copy 64-bit Windows printer "
 	                         "driver files (%d).")), status);

-      _cupsSetError(IPP_INTERNAL_ERROR, message, 0);
+      _cupsSetError(IPP_STATUS_ERROR_INTERNAL, message, 0);

      if (logfile)
 	_cupsLangPuts(logfile, message);
@@ -726,7 +726,7 @@ cupsAdminExportSamba(
 	                         _("Unable to copy 64-bit CUPS printer driver "
 				   "files (%d).")), status);

-	_cupsSetError(IPP_INTERNAL_ERROR, message, 0);
+	_cupsSetError(IPP_STATUS_ERROR_INTERNAL, message, 0);

 	if (logfile)
 	  _cupsLangPuts(logfile, message);
@@ -769,7 +769,7 @@ cupsAdminExportSamba(
                	       _("Unable to install Windows 2000 printer "
 		        	 "driver files (%d).")), status);

-      _cupsSetError(IPP_INTERNAL_ERROR, message, 0);
+      _cupsSetError(IPP_STATUS_ERROR_INTERNAL, message, 0);

      if (logfile)
 	_cupsLangPuts(logfile, message);
@@ -794,13 +794,13 @@ cupsAdminExportSamba(
 				"are installed.")),
              sizeof(message));

-    _cupsSetError(IPP_NOT_FOUND, message, 0);
+    _cupsSetError(IPP_STATUS_ERROR_NOT_FOUND, message, 0);
    _cupsLangPuts(logfile, message);
  }

  if (have_drivers == 0)
  {
-    _cupsSetError(IPP_NOT_FOUND, message, 0);
+    _cupsSetError(IPP_STATUS_ERROR_NOT_FOUND, message, 0);

    unlink(authfile);

@@ -821,7 +821,7 @@ cupsAdminExportSamba(
        		     _("Unable to set Windows printer driver (%d).")),
        		     status);

-    _cupsSetError(IPP_INTERNAL_ERROR, message, 0);
+    _cupsSetError(IPP_STATUS_ERROR_INTERNAL, message, 0);

    if (logfile)
      _cupsLangPuts(logfile, message);
@@ -843,7 +843,7 @@ cupsAdminExportSamba(
 * The returned settings should be freed with cupsFreeOptions() when
 * you are done with them.
 *
- * @since CUPS 1.3/Mac OS X 10.5@
+ * @since CUPS 1.3/OS X 10.5@
 */

 int					/* O - 1 on success, 0 on failure */
@@ -882,9 +882,9 @@ cupsAdminGetServerSettings(
      */

      if (strcmp(cg->http->hostname, cg->server) ||
-          cg->ipp_port != _httpAddrPort(cg->http->hostaddr) ||
+          cg->ipp_port != httpAddrPort(cg->http->hostaddr) ||
 	  (cg->http->encryption != cg->encryption &&
-	   cg->http->encryption == HTTP_ENCRYPT_NEVER))
+	   cg->http->encryption == HTTP_ENCRYPTION_NEVER))
      {
       /*
 	* Need to close the current connection because something has changed...
@@ -901,13 +901,13 @@ cupsAdminGetServerSettings(

    if (!cg->http)
    {
-      if ((cg->http = _httpCreate(cupsServer(), ippPort(), NULL,
-                                  cupsEncryption(), AF_UNSPEC)) == NULL)
+      if ((cg->http = httpConnect2(cupsServer(), ippPort(), NULL, AF_UNSPEC,
+                                   cupsEncryption(), 1, 0, NULL)) == NULL)
      {
 	if (errno)
-	  _cupsSetError(IPP_SERVICE_UNAVAILABLE, NULL, 0);
+	  _cupsSetError(IPP_STATUS_ERROR_SERVICE_UNAVAILABLE, NULL, 0);
 	else
-	  _cupsSetError(IPP_SERVICE_UNAVAILABLE,
+	  _cupsSetError(IPP_STATUS_ERROR_SERVICE_UNAVAILABLE,
 			_("Unable to connect to host."), 1);

 	if (num_settings)
@@ -925,7 +925,7 @@ cupsAdminGetServerSettings(

  if (!http || !num_settings || !settings)
  {
-    _cupsSetError(IPP_INTERNAL_ERROR, strerror(EINVAL), 0);
+    _cupsSetError(IPP_STATUS_ERROR_INTERNAL, strerror(EINVAL), 0);

    if (num_settings)
      *num_settings = 0;
@@ -944,7 +944,7 @@ cupsAdminGetServerSettings(
  */

  if ((status = get_cupsd_conf(http, cg, cg->cupsd_update, cupsdconf,
-                               sizeof(cupsdconf), &remote)) == HTTP_OK)
+                               sizeof(cupsdconf), &remote)) == HTTP_STATUS_OK)
  {
    if ((cupsd = cupsFileOpen(cupsdconf, "r")) == NULL)
    {
@@ -954,7 +954,7 @@ cupsAdminGetServerSettings(
      snprintf(message, sizeof(message),
               _cupsLangString(cupsLangDefault(), _("Open of %s failed: %s")),
               cupsdconf, strerror(errno));
-      _cupsSetError(IPP_INTERNAL_ERROR, message, 0);
+      _cupsSetError(IPP_STATUS_ERROR_INTERNAL, message, 0);
    }
  }
  else
@@ -1136,7 +1136,7 @@ cupsAdminGetServerSettings(
 					   cg->cupsd_num_settings,
 					   &(cg->cupsd_settings));
  }
-  else if (status != HTTP_NOT_MODIFIED)
+  else if (status != HTTP_STATUS_NOT_MODIFIED)
    invalidate_cupsd_cache(cg);

 /*
@@ -1159,7 +1159,7 @@ cupsAdminGetServerSettings(
 /*
 * 'cupsAdminSetServerSettings()' - Set settings on the server.
 *
- * @since CUPS 1.3/Mac OS X 10.5@
+ * @since CUPS 1.3/OS X 10.5@
 */

 int					/* O - 1 on success, 0 on failure */
@@ -1220,7 +1220,7 @@ cupsAdminSetServerSettings(

  if (!http || !num_settings || !settings)
  {
-    _cupsSetError(IPP_INTERNAL_ERROR, strerror(EINVAL), 0);
+    _cupsSetError(IPP_STATUS_ERROR_INTERNAL, strerror(EINVAL), 0);

    return (0);
  }
@@ -1230,11 +1230,11 @@ cupsAdminSetServerSettings(
  */

  if (get_cupsd_conf(http, cg, 0, cupsdconf, sizeof(cupsdconf),
-                     &remote) == HTTP_OK)
+                     &remote) == HTTP_STATUS_OK)
  {
    if ((cupsd = cupsFileOpen(cupsdconf, "r")) == NULL)
    {
-      _cupsSetError(IPP_INTERNAL_ERROR, NULL, 0);
+      _cupsSetError(IPP_STATUS_ERROR_INTERNAL, NULL, 0);
      return (0);
    }
  }
@@ -1398,7 +1398,7 @@ cupsAdminSetServerSettings(
    if (remote)
      unlink(cupsdconf);

-    _cupsSetError(IPP_INTERNAL_ERROR, NULL, 0);
+    _cupsSetError(IPP_STATUS_ERROR_INTERNAL, NULL, 0);
    return (0);
  }

@@ -1954,7 +1954,7 @@ cupsAdminSetServerSettings(

  status = cupsPutFile(http, "/admin/conf/cupsd.conf", tempfile);

-  if (status == HTTP_CREATED)
+  if (status == HTTP_STATUS_CREATED)
  {
   /*
    * Updated OK, add the basic settings...
@@ -2024,7 +2024,7 @@ cupsAdminSetServerSettings(

  unlink(tempfile);

-  return (status == HTTP_CREATED);
+  return (status == HTTP_STATUS_CREATED);
 }


@@ -2158,16 +2158,16 @@ get_cupsd_conf(
      snprintf(message, sizeof(message),
               _cupsLangString(cupsLangDefault(), _("stat of %s failed: %s")),
               name, strerror(errno));
-      _cupsSetError(IPP_INTERNAL_ERROR, message, 0);
+      _cupsSetError(IPP_STATUS_ERROR_INTERNAL, message, 0);

      *name = '\0';

-      return (HTTP_SERVER_ERROR);
+      return (HTTP_STATUS_SERVER_ERROR);
    }
    else if (last_update && info.st_mtime <= last_update)
-      status = HTTP_NOT_MODIFIED;
+      status = HTTP_STATUS_NOT_MODIFIED;
    else
-      status = HTTP_OK;
+      status = HTTP_STATUS_OK;
  }
  else
 #endif /* !WIN32 */
@@ -2180,11 +2180,11 @@ get_cupsd_conf(
    {
      *name = '\0';

-      _cupsSetError(IPP_INTERNAL_ERROR, NULL, 0);
+      _cupsSetError(IPP_STATUS_ERROR_INTERNAL, NULL, 0);

      invalidate_cupsd_cache(cg);

-      return (HTTP_SERVER_ERROR);
+      return (HTTP_STATUS_SERVER_ERROR);
    }

    *remote = 1;
@@ -2199,7 +2199,7 @@ get_cupsd_conf(

    close(fd);

-    if (status != HTTP_OK)
+    if (status != HTTP_STATUS_OK)
    {
      unlink(name);
      *name = '\0';
@@ -3,7 +3,7 @@
 *
 *   Administration utility API definitions for CUPS.
 *
- *   Copyright 2007-2011 by Apple Inc.
+ *   Copyright 2007-2012 by Apple Inc.
 *   Copyright 2001-2007 by Easy Software Products.
 *
 *   These coded instructions, statements, and computer programs are the
@@ -55,16 +55,19 @@ extern int	cupsAdminExportSamba(const char *dest, const char *ppd,
 		                     const char *samba_server,
 			             const char *samba_user,
 				     const char *samba_password,
-				     FILE *logfile) _CUPS_API_1_2;
+				     FILE *logfile) _CUPS_DEPRECATED;
 extern char	*cupsAdminCreateWindowsPPD(http_t *http, const char *dest,
-		                           char *buffer, int bufsize) _CUPS_API_1_2;
+		                           char *buffer, int bufsize)
+		                           _CUPS_DEPRECATED;

 extern int	cupsAdminGetServerSettings(http_t *http,
 			                   int *num_settings,
-		                           cups_option_t **settings) _CUPS_API_1_3;
+		                           cups_option_t **settings)
+		                           _CUPS_API_1_3;
 extern int	cupsAdminSetServerSettings(http_t *http,
 		                           int num_settings,
-		                           cups_option_t *settings) _CUPS_API_1_3;
+		                           cups_option_t *settings)
+		                           _CUPS_API_1_3;


 #  ifdef __cplusplus
@@ -1,9 +1,9 @@
 <!--
-  "$Id: api-filter.shtml 9799 2011-05-20 18:09:22Z mike $"
+  "$Id: api-filter.shtml 10424 2012-04-23 17:26:57Z mike $"

  Filter and backend programming introduction for CUPS.

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

  These coded instructions, statements, and computer programs are the
@@ -81,7 +81,7 @@ directory to write to.</p>

 <p>In addition, some operating systems provide additional security mechanisms
 that further limit file system access, even for backends running as root. On
-Mac OS X, for example, no backend may write to a user's home directory.</p>
+OS X, for example, no backend may write to a user's home directory.</p>
 </blockquote>

 <h3><a name="SIGNALS">Canceled Jobs and Signal Handling</a></h3>
@@ -153,7 +153,7 @@ when running print filters and backends:</p>

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

 	<dt>CHARSET</dt>
 	<dd>The job character set, typically "utf-8".</dd>
@@ -474,7 +474,7 @@ sub-state and not an issue that applies when a job is not printing.</p>
 <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
+on 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>
@@ -1,9 +1,9 @@
 <!--
-  "$Id: api-httpipp.shtml 9727 2011-04-28 21:20:12Z mike $"
+  "$Id: api-httpipp.shtml 10388 2012-03-26 21:15:41Z mike $"

  HTTP and IPP API introduction for CUPS.

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

  These coded instructions, statements, and computer programs are the
@@ -29,35 +29,20 @@ The constant <code>CUPS_HTTP_DEFAULT</code> can be used with all of the
 <code>cups</code> functions to refer to the default CUPS server - the functions
 create a per-thread <a href='#http_t'><code>http_t</code></a> as needed.</p>

-<p>The IPP APIs use two structures for requests (messages sent to the CUPS
-scheduler) and responses (messages sent back to your application from the
-scheduler). The <a href='#ipp_t'><code>ipp_t</code></a> structure holds a
-complete request or response and is allocated using the
-<a href='#ippNew'><code>ippNew</code></a> or
-<a href='#ippNewRequest'><code>ippNewRequest</code></a> functions and
-freed using the <a href='#ippDelete'><code>ippDelete</code></a> function.</p>
+<p>The IPP APIs use two opaque structures for requests (messages sent to the CUPS scheduler) and responses (messages sent back to your application from the scheduler). The <a href='#ipp_t'><code>ipp_t</code></a> type holds a complete request or response and is allocated using the <a href='#ippNew'><code>ippNew</code></a> or <a href='#ippNewRequest'><code>ippNewRequest</code></a> functions and freed using the <a href='#ippDelete'><code>ippDelete</code></a> function.</p>

-<p>The second structure is called
-<a href='#ipp_attribute_t'><code>ipp_attribute_t</code></a> and holds a
-single IPP attribute which consists of a group tag (<code>group_tag</code>), a
-value type tag (<code>value_tag</code>), the attribute name (<code>name</code>),
-and 1 or more values (<code>values[]</code>). Attributes are added to an
-<a href='#ipp_t'><code>ipp_t</code></a> structure using one of the
-<code>ippAdd</code> functions. For example, use
-<a href='#ippAddString'><code>ippAddString</code></a> to add a
-"requesting-user-name" string attribute to a request:</p>
+<p>The second opaque structure is called <a href='#ipp_attribute_t'><code>ipp_attribute_t</code></a> and holds a single IPP attribute which consists of a group tag (<a href='#ippGetGroupTag'><code>ippGetGroupTag</code></a>), a value type tag (<a href='#ippGetValueTag'><code>ippGetValueTag</code></a>), the attribute name (<a href='#ippGetName'><code>ippGetName</code></a>), and 1 or more values (<a href='#ippGetCount'><code>ippGetCount</code></a>, <a href='#ippGetBoolean'><code>ippGetBoolean</code></a>, <a href='#ippGetCollection'><code>ippGetCollection</code></a>, <a href='#ippGetDate'><code>ippGetDate</code></a>, <a href='#ippGetInteger'><code>ippGetInteger</code></a>, <a href='#ippGetRange'><code>ippGetRange</code></a>, <a href='#ippGetResolution'><code>ippGetResolution</code></a>, and <a href='#ippGetString'><code>ippGetString</code></a>). Attributes are added to an <a href='#ipp_t'><code>ipp_t</code></a> pointer using one of the <code>ippAdd</code> functions. For example, use <a href='#ippAddString'><code>ippAddString</code></a> to add the "printer-uri" and "requesting-user-name" string attributes to a request:</p>

 <pre class='example'>
 <a href='#ipp_t'>ipp_t</a> *request = <a href='#ippNewRequest'>ippNewRequest</a>(IPP_GET_JOBS);

+<a href='#ippAddString'>ippAddString</a>(request, IPP_TAG_OPERATION, IPP_TAG_URI, "printer-uri",
+             NULL, "ipp://localhost/printers/");
 <a href='#ippAddString'>ippAddString</a>(request, IPP_TAG_OPERATION, IPP_TAG_NAME, "requesting-user-name",
             NULL, cupsUser());
 </pre>

-<p>Once you have created an IPP request, use the <code>cups</code>
-functions to send the request to and read the response from the server.
-For example, the <a href='#cupsDoRequest'><code>cupsDoRequest</code></a>
-function can be used for simple query operations that do not involve files:</p>
+<p>Once you have created an IPP request, use the <code>cups</code> functions to send the request to and read the response from the server. For example, the <a href='#cupsDoRequest'><code>cupsDoRequest</code></a> function can be used for simple query operations that do not involve files:</p>

 <pre class='example'>
 #include &lt;cups/cups.h&gt;
@@ -67,6 +52,8 @@ function can be used for simple query operations that do not involve files:</p>
 {
  <a href='#ipp_t'>ipp_t</a> *request = <a href='#ippNewRequest'>ippNewRequest</a>(IPP_GET_JOBS);

+  <a href='#ippAddString'>ippAddString</a>(request, IPP_TAG_OPERATION, IPP_TAG_URI, "printer-uri",
+               NULL, "ipp://localhost/printers/");
  <a href='#ippAddString'>ippAddString</a>(request, IPP_TAG_OPERATION, IPP_TAG_NAME, "requesting-user-name",
               NULL, cupsUser());

@@ -74,13 +61,7 @@ function can be used for simple query operations that do not involve files:</p>
 }
 </pre>

-<p>The <a href='#cupsDoRequest'><code>cupsDoRequest</code></a> function frees
-the request structure and returns an IPP response structure or NULL pointer if
-the request could not be sent to the server. Once you have a response from
-the server, you can either use the
-<a href='#ippFindAttribute'><code>ippFindAttribute</code></a> and
-<a href='#ippFindNextAttribute'><code>ippFindNextAttribute</code></a> functions
-to find specific attributes, for example:</p>
+<p>The <a href='#cupsDoRequest'><code>cupsDoRequest</code></a> function frees the request and returns an IPP response or <code>NULL</code> pointer if the request could not be sent to the server. Once you have a response from the server, you can either use the <a href='#ippFindAttribute'><code>ippFindAttribute</code></a> and <a href='#ippFindNextAttribute'><code>ippFindNextAttribute</code></a> functions to find specific attributes, for example:</p>

 <pre class='example'>
 <a href='#ipp_t'>ipp_t</a> *response;
@@ -89,25 +70,20 @@ to find specific attributes, for example:</p>
 attr = <a href='#ippFindAttribute'>ippFindAttribute</a>(response, "printer-state", IPP_TAG_ENUM);
 </pre>

-<p>You can also walk the list of attributes with a simple <code>for</code> loop
-like this:</p>
+<p>You can also walk the list of attributes with a simple <code>for</code> loop like this:</p>

 <pre class='example'>
 <a href='#ipp_t'>ipp_t</a> *response;
 <a href='#ipp_attribute_t'>ipp_attribute_t</a> *attr;

-for (attr = response->attrs; attr != NULL; attr = attr->next)
-  if (attr->name == NULL)
+for (attr = <a href='#ippFirstAttribute'>ippFirstAttribute</a>(response); attr != NULL; attr = <a href='#ippNextAttribute'>ippNextAttribute</a>(response))
+  if (ippGetName(attr) == NULL)
    puts("--SEPARATOR--");
  else
-    puts(attr->name);
+    puts(ippGetName(attr));
 </pre>

-<p>The <code>for</code> loop approach is normally used when collecting
-attributes for multiple objects (jobs, printers, etc.) in a response. Attributes
-with <code>NULL</code> names indicate a separator between the attributes of
-each object. For example, the following code will list the jobs returned from
-our previous <a href='#get_jobs'><code>get_jobs</code></a> example code:</p>
+<p>The <code>for</code> loop approach is normally used when collecting attributes for multiple objects (jobs, printers, etc.) in a response. Attributes with <code>NULL</code> names indicate a separator between the attributes of each object. For example, the following code will list the jobs returned from our previous <a href='#get_jobs'><code>get_jobs</code></a> example code:</p>

 <pre class='example'>
 <a href='#ipp_t'>ipp_t</a> *response = <a href='#get_jobs'>get_jobs</a>();
@@ -115,37 +91,55 @@ our previous <a href='#get_jobs'><code>get_jobs</code></a> example code:</p>
 if (response != NULL)
 {
  <a href='#ipp_attribute_t'>ipp_attribute_t</a> *attr;
+  const char *attrname;
  int job_id = 0;
-  char *job_name = NULL;
-  char *job_originating_user_name = NULL;
+  const char *job_name = NULL;
+  const char *job_originating_user_name = NULL;

  puts("Job ID  Owner             Title");
  puts("------  ----------------  ---------------------------------");

-  for (attr = response->attrs; attr != NULL; attr = attr->next)
+  for (attr = <a href='#ippFirstAttribute'>ippFirstAttribute</a>(response); attr != NULL; attr = <a href='#ippNextAttribute'>ippNextAttribute</a>(response))
  {
   /* Attributes without names are separators between jobs */
-    if (attr->name == NULL)
+    attrname = ippGetName(attr);
+    if (attrname == NULL)
    {
-      if (job_id > 0 &amp;&amp; job_name != NULL &amp;&amp; job_originating_user_name != NULL)
+      if (job_id > 0)
+      {
+        if (job_name == NULL)
+          job_name = "(withheld)";
+
+        if (job_originating_user_name == NULL)
+          job_originating_user_name = "(withheld)";
+
        printf("%5d  %-16s  %s\n", job_id, job_originating_user_name, job_name);
+      }

      job_id = 0;
      job_name = NULL;
      job_originating_user_name = NULL;
      continue;
    }
-    else if (!strcmp(attr->name, "job-id") &amp;&amp; attr->value_tag == IPP_TAG_INTEGER)
-      job_id = attr->values[0].integer;
-    else if (!strcmp(attr->name, "job-name") &amp;&amp; attr->value_tag == IPP_TAG_NAME)
-      job_name = attr->values[0].string.text;
-    else if (!strcmp(attr->name, "job-originating-user-name") &amp;&amp;
-             attr->value_tag == IPP_TAG_NAME)
-      job_originating_user_name = attr->values[0].string.text;
+    else if (!strcmp(attrname, "job-id") &amp;&amp; ippGetValueTag(attr) == IPP_TAG_INTEGER)
+      job_id = ippGetInteger(attr, 0);
+    else if (!strcmp(attrname, "job-name") &amp;&amp; ippGetValueTag(attr) == IPP_TAG_NAME)
+      job_name = ippGetString(attr, 0, NULL);
+    else if (!strcmp(attrname, "job-originating-user-name") &amp;&amp;
+             ippGetValueTag(attr) == IPP_TAG_NAME)
+      job_originating_user_name = ippGetString(attr, 0, NULL);
  }

-  if (job_id > 0 &amp;&amp; job_name != NULL &amp;&amp; job_originating_user_name != NULL)
+  if (job_id > 0)
+  {
+    if (job_name == NULL)
+      job_name = "(withheld)";
+
+    if (job_originating_user_name == NULL)
+      job_originating_user_name = "(withheld)";
+
    printf("%5d  %-16s  %s\n", job_id, job_originating_user_name, job_name);
+  }
 }
 </pre>

@@ -1,9 +1,9 @@
 <!--
-  "$Id: api-ppd.header 10103 2011-11-03 20:44:57Z mike $"
+  "$Id: api-ppd.header 10424 2012-04-23 17:26:57Z mike $"

  PPD API header for CUPS.

-  Copyright 2008-2011 by Apple Inc.
+  Copyright 2008-2012 by Apple Inc.

  These coded instructions, statements, and computer programs are the
  property of Apple Inc. and are protected by Federal copyright
@@ -14,7 +14,7 @@

 <h1 class='title'>PPD API (DEPRECATED)</h1>

-<blockquote>The PPD API is deprecated starting in CUPS 1.6. Please use the new Job Ticket APIs in the <a href="api-cups.html">CUPS API</a> documentation. These functions will be removed in a future release of CUPS.</blockquote>
+<blockquote>The PPD API is deprecated starting in CUPS 1.6/OS X 10.8. Please use the new Job Ticket APIs in the <a href="api-cups.html">CUPS API</a> documentation. These functions will be removed in a future release of CUPS.</blockquote>

 <div class='summary'><table summary='General Information'>
 <thead>
@@ -1,9 +1,9 @@
 <!--
-  "$Id: api-ppd.shtml 10103 2011-11-03 20:44:57Z mike $"
+  "$Id: api-ppd.shtml 10424 2012-04-23 17:26:57Z mike $"

  PPD API introduction for CUPS.

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

  These coded instructions, statements, and computer programs are the
@@ -15,7 +15,7 @@

 <h2 class='title'><a name='OVERVIEW'>Overview</a></h2>

-<blockquote>The PPD API is deprecated starting in CUPS 1.6. Please use the new Job Ticket APIs in the <a href="api-cups.html">CUPS API</a> documentation. These functions will be removed in a future release of CUPS.</blockquote>
+<blockquote>The PPD API is deprecated starting in CUPS 1.6/OS X 10.8. Please use the new Job Ticket APIs in the <a href="api-cups.html">CUPS API</a> documentation. These functions will be removed in a future release of CUPS.</blockquote>

 <p>The CUPS PPD API provides read-only access the data in PostScript Printer
 Description ("PPD") files which are used for all printers with a driver. With
@@ -3,7 +3,7 @@
 *
 *   Private array definitions for CUPS.
 *
- *   Copyright 2011 by Apple Inc.
+ *   Copyright 2011-2012 by Apple Inc.
 *
 *   These coded instructions, statements, and computer programs are the
 *   property of Apple Inc. and are protected by Federal copyright
@@ -37,9 +37,10 @@ extern "C" {
 * Functions...
 */

-extern int		_cupsArrayAddStrings(cups_array_t *a, const char *s)
-			                     _CUPS_API_1_5;
-extern cups_array_t	*_cupsArrayNewStrings(const char *s) _CUPS_API_1_5;
+extern int		_cupsArrayAddStrings(cups_array_t *a, const char *s,
+			                     char delim) _CUPS_API_1_5;
+extern cups_array_t	*_cupsArrayNewStrings(const char *s, char delim)
+			                      _CUPS_API_1_5;

 #  ifdef __cplusplus
 }
@@ -3,7 +3,7 @@
 *
 *   Sorted array routines for CUPS.
 *
- *   Copyright 2007-2011 by Apple Inc.
+ *   Copyright 2007-2012 by Apple Inc.
 *   Copyright 1997-2007 by Easy Software Products.
 *
 *   These coded instructions, statements, and computer programs are the
@@ -110,7 +110,7 @@ static int	cups_array_find(cups_array_t *a, void *e, int prev, int *rdiff);
 * appended at the end of the run of identical elements.  For unsorted arrays,
 * the element is appended to the end of the array.
 *
- * @since CUPS 1.2/Mac OS X 10.5@
+ * @since CUPS 1.2/OS X 10.5@
 */

 int					/* O - 1 on success, 0 on failure */
@@ -138,8 +138,7 @@ cupsArrayAdd(cups_array_t *a,		/* I - Array */


 /*
- * '_cupsArrayAddStrings()' - Add zero or more comma-delimited strings to an
- *                            array.
+ * '_cupsArrayAddStrings()' - Add zero or more delimited strings to an array.
 *
 * Note: The array MUST be created using the @link _cupsArrayNewStrings@
 * function. Duplicate strings are NOT added. If the string pointer "s" is NULL
@@ -148,7 +147,8 @@ cupsArrayAdd(cups_array_t *a,		/* I - Array */

 int					/* O - 1 on success, 0 on failure */
 _cupsArrayAddStrings(cups_array_t *a,	/* I - Array */
-                     const char   *s)	/* I - Comma-delimited strings or NULL */
+                     const char   *s,	/* I - Delimited strings or NULL */
+                     char         delim)/* I - Delimiter character */
 {
  char		*buffer,		/* Copy of string */
 		*start,			/* Start of string */
@@ -156,20 +156,47 @@ _cupsArrayAddStrings(cups_array_t *a,	/* I - Array */
  int		status = 1;		/* Status of add */


-  if (!a || !s || !*s)
-    return (0);
+  DEBUG_printf(("_cupsArrayAddStrings(a=%p, s=\"%s\", delim='%c')", a, s,
+                delim));

-  if (!strchr(s, ','))
+  if (!a || !s || !*s)
+  {
+    DEBUG_puts("1_cupsArrayAddStrings: Returning 0");
+    return (0);
+  }
+
+  if (delim == ' ')
  {
   /*
-    * String doesn't contain a comma, so add it as a single value...
+    * Skip leading whitespace...
    */

+    DEBUG_puts("1_cupsArrayAddStrings: Skipping leading whitespace.");
+
+    while (*s && isspace(*s & 255))
+      s ++;
+
+    DEBUG_printf(("1_cupsArrayAddStrings: Remaining string \"%s\".", s));
+  }
+
+  if (!strchr(s, delim) &&
+      (delim != ' ' || (!strchr(s, '\t') && !strchr(s, '\n'))))
+  {
+   /*
+    * String doesn't contain a delimiter, so add it as a single value...
+    */
+
+    DEBUG_puts("1_cupsArrayAddStrings: No delimiter seen, adding a single "
+               "value.");
+
    if (!cupsArrayFind(a, (void *)s))
      status = cupsArrayAdd(a, (void *)s);
  }
  else if ((buffer = strdup(s)) == NULL)
+  {
+    DEBUG_puts("1_cupsArrayAddStrings: Unable to duplicate string.");
    status = 0;
+  }
  else
  {
    for (start = end = buffer; *end; start = end)
@@ -179,11 +206,21 @@ _cupsArrayAddStrings(cups_array_t *a,	/* I - Array */
      * it...
      */

-      if ((end = strchr(start, ',')) != NULL)
+      if (delim == ' ')
+      {
+        while (*end && !isspace(*end & 255))
+          end ++;
+        while (*end && isspace(*end & 255))
+          *end++ = '\0';
+      }
+      else if ((end = strchr(start, delim)) != NULL)
        *end++ = '\0';
      else
        end = start + strlen(start);

+      DEBUG_printf(("1_cupsArrayAddStrings: Adding \"%s\", end=\"%s\"", start,
+                    end));
+
      if (!cupsArrayFind(a, start))
        status &= cupsArrayAdd(a, start);
    }
@@ -191,6 +228,8 @@ _cupsArrayAddStrings(cups_array_t *a,	/* I - Array */
    free(buffer);
  }

+  DEBUG_printf(("1_cupsArrayAddStrings: Returning %d.", status));
+
  return (status);
 }

@@ -202,7 +241,7 @@ _cupsArrayAddStrings(cups_array_t *a,	/* I - Array */
 * The caller is responsible for freeing the memory used by the
 * elements themselves.
 *
- * @since CUPS 1.2/Mac OS X 10.5@
+ * @since CUPS 1.2/OS X 10.5@
 */

 void
@@ -244,7 +283,7 @@ cupsArrayClear(cups_array_t *a)		/* I - Array */
 /*
 * 'cupsArrayCount()' - Get the number of elements in the array.
 *
- * @since CUPS 1.2/Mac OS X 10.5@
+ * @since CUPS 1.2/OS X 10.5@
 */

 int					/* O - Number of elements */
@@ -271,7 +310,7 @@ cupsArrayCount(cups_array_t *a)		/* I - Array */
 * The current element is undefined until you call @link cupsArrayFind@,
 * @link cupsArrayFirst@, or @link cupsArrayIndex@, or @link cupsArrayLast@.
 *
- * @since CUPS 1.2/Mac OS X 10.5@
+ * @since CUPS 1.2/OS X 10.5@
 */

 void *					/* O - Element */
@@ -301,7 +340,7 @@ cupsArrayCurrent(cups_array_t *a)	/* I - Array */
 * The caller is responsible for freeing the memory used by the
 * elements themselves.
 *
- * @since CUPS 1.2/Mac OS X 10.5@
+ * @since CUPS 1.2/OS X 10.5@
 */

 void
@@ -345,7 +384,7 @@ cupsArrayDelete(cups_array_t *a)	/* I - Array */
 /*
 * 'cupsArrayDup()' - Duplicate the array.
 *
- * @since CUPS 1.2/Mac OS X 10.5@
+ * @since CUPS 1.2/OS X 10.5@
 */

 cups_array_t *				/* O - Duplicate array */
@@ -430,7 +469,7 @@ cupsArrayDup(cups_array_t *a)		/* I - Array */
 /*
 * 'cupsArrayFind()' - Find an element in the array.
 *
- * @since CUPS 1.2/Mac OS X 10.5@
+ * @since CUPS 1.2/OS X 10.5@
 */

 void *					/* O - Element found or @code NULL@ */
@@ -525,7 +564,7 @@ cupsArrayFind(cups_array_t *a,		/* I - Array */
 /*
 * 'cupsArrayFirst()' - Get the first element in the array.
 *
- * @since CUPS 1.2/Mac OS X 10.5@
+ * @since CUPS 1.2/OS X 10.5@
 */

 void *					/* O - First element or @code NULL@ if the array is empty */
@@ -554,7 +593,7 @@ cupsArrayFirst(cups_array_t *a)		/* I - Array */
 * The current element is undefined until you call @link cupsArrayFind@,
 * @link cupsArrayFirst@, or @link cupsArrayIndex@, or @link cupsArrayLast@.
 *
- * @since CUPS 1.3/Mac OS X 10.5@
+ * @since CUPS 1.3/OS X 10.5@
 */

 int					/* O - Index of the current element, starting at 0 */
@@ -570,7 +609,7 @@ cupsArrayGetIndex(cups_array_t *a)	/* I - Array */
 /*
 * 'cupsArrayGetInsert()' - Get the index of the last inserted element.
 *
- * @since CUPS 1.3/Mac OS X 10.5@
+ * @since CUPS 1.3/OS X 10.5@
 */

 int					/* O - Index of the last inserted element, starting at 0 */
@@ -586,7 +625,7 @@ cupsArrayGetInsert(cups_array_t *a)	/* I - Array */
 /*
 * 'cupsArrayIndex()' - Get the N-th element in the array.
 *
- * @since CUPS 1.2/Mac OS X 10.5@
+ * @since CUPS 1.2/OS X 10.5@
 */

 void *					/* O - N-th element or @code NULL@ */
@@ -609,7 +648,7 @@ cupsArrayIndex(cups_array_t *a,		/* I - Array */
 * inserted at the beginning of the run of identical elements.  For unsorted
 * arrays, the element is inserted at the beginning of the array.
 *
- * @since CUPS 1.2/Mac OS X 10.5@
+ * @since CUPS 1.2/OS X 10.5@
 */

 int					/* O - 0 on failure, 1 on success */
@@ -639,7 +678,7 @@ cupsArrayInsert(cups_array_t *a,	/* I - Array */
 /*
 * 'cupsArrayLast()' - Get the last element in the array.
 *
- * @since CUPS 1.2/Mac OS X 10.5@
+ * @since CUPS 1.2/OS X 10.5@
 */

 void *					/* O - Last element or @code NULL@ if the array is empty */
@@ -670,7 +709,7 @@ cupsArrayLast(cups_array_t *a)		/* I - Array */
 * data pointer argument can safely be omitted when not required so functions
 * like @code strcmp@ can be used for sorted string arrays.
 *
- * @since CUPS 1.2/Mac OS X 10.5@
+ * @since CUPS 1.2/OS X 10.5@
 */

 cups_array_t *				/* O - Array */
@@ -692,7 +731,7 @@ cupsArrayNew(cups_array_func_t f,	/* I - Comparison function or @code NULL@ for
 * The hash function ("h") is used to implement cached lookups with the
 * specified hash size ("hsize").
 *
- * @since CUPS 1.3/Mac OS X 10.5@
+ * @since CUPS 1.3/OS X 10.5@
 */

 cups_array_t *				/* O - Array */
@@ -722,7 +761,7 @@ cupsArrayNew2(cups_array_func_t  f,	/* I - Comparison function or @code NULL@ fo
 * The free function ("cf") is used to automatically free/release elements when
 * removed or the array is deleted.
 *
- * @since CUPS 1.5/Mac OS X 10.7@
+ * @since CUPS 1.5/OS X 10.7@
 */

 cups_array_t *				/* O - Array */
@@ -782,7 +821,8 @@ cupsArrayNew3(cups_array_func_t  f,	/* I - Comparison function or @code NULL@ fo
 */

 cups_array_t *				/* O - Array */
-_cupsArrayNewStrings(const char *s)	/* I - Comma-delimited strings or NULL */
+_cupsArrayNewStrings(const char *s,	/* I - Delimited strings or NULL */
+                     char       delim)	/* I - Delimiter character */
 {
  cups_array_t	*a;			/* Array */

@@ -790,7 +830,7 @@ _cupsArrayNewStrings(const char *s)	/* I - Comma-delimited strings or NULL */
  if ((a = cupsArrayNew3((cups_array_func_t)strcmp, NULL, NULL, 0,
                         (cups_acopy_func_t)_cupsStrAlloc,
 			 (cups_afree_func_t)_cupsStrFree)) != NULL)
-    _cupsArrayAddStrings(a, s);
+    _cupsArrayAddStrings(a, s, delim);

  return (a);
 }
@@ -805,7 +845,7 @@ _cupsArrayNewStrings(const char *s)	/* I - Comma-delimited strings or NULL */
 * @link cupsArrayFirst@, or @link cupsArrayIndex@, or @link cupsArrayLast@
 * to set the current element.
 *
- * @since CUPS 1.2/Mac OS X 10.5@
+ * @since CUPS 1.2/OS X 10.5@
 */

 void *					/* O - Next element or @code NULL@ */
@@ -838,7 +878,7 @@ cupsArrayNext(cups_array_t *a)		/* I - Array */
 * @link cupsArrayFirst@, or @link cupsArrayIndex@, or @link cupsArrayLast@
 * to set the current element.
 *
- * @since CUPS 1.2/Mac OS X 10.5@
+ * @since CUPS 1.2/OS X 10.5@
 */

 void *					/* O - Previous element or @code NULL@ */
@@ -871,7 +911,7 @@ cupsArrayPrev(cups_array_t *a)		/* I - Array */
 * The caller is responsible for freeing the memory used by the
 * removed element.
 *
- * @since CUPS 1.2/Mac OS X 10.5@
+ * @since CUPS 1.2/OS X 10.5@
 */

 int					/* O - 1 on success, 0 on failure */
@@ -936,7 +976,7 @@ cupsArrayRemove(cups_array_t *a,	/* I - Array */
 /*
 * 'cupsArrayRestore()' - Reset the current element to the last @link cupsArraySave@.
 *
- * @since CUPS 1.2/Mac OS X 10.5@
+ * @since CUPS 1.2/OS X 10.5@
 */

 void *					/* O - New current element */
@@ -967,7 +1007,7 @@ cupsArrayRestore(cups_array_t *a)	/* I - Array */
 *
 * The save/restore stack is guaranteed to be at least 32 elements deep.
 *
- * @since CUPS 1.2/Mac OS X 10.5@
+ * @since CUPS 1.2/OS X 10.5@
 */

 int					/* O - 1 on success, 0 on failure */
@@ -989,7 +1029,7 @@ cupsArraySave(cups_array_t *a)		/* I - Array */
 /*
 * 'cupsArrayUserData()' - Return the user data for an array.
 *
- * @since CUPS 1.2/Mac OS X 10.5@
+ * @since CUPS 1.2/OS X 10.5@
 */

 void *					/* O - User data */
@@ -1005,7 +1045,7 @@ cupsArrayUserData(cups_array_t *a)	/* I - Array */
 /*
 * 'cups_array_add()' - Insert or append an element to the array.
 *
- * @since CUPS 1.2/Mac OS X 10.5@
+ * @since CUPS 1.2/OS X 10.5@
 */

 static int				/* O - 1 on success, 0 on failure */
@@ -3,7 +3,7 @@
 *
 *   PPD model-specific attribute routines for CUPS.
 *
- *   Copyright 2007-2011 by Apple Inc.
+ *   Copyright 2007-2012 by Apple Inc.
 *   Copyright 1997-2006 by Easy Software Products.
 *
 *   These coded instructions, statements, and computer programs are the
@@ -30,7 +30,7 @@
 /*
 * 'ppdFindAttr()' - Find the first matching attribute.
 *
- * @since CUPS 1.1.19/Mac OS X 10.3@
+ * @since CUPS 1.1.19/OS X 10.3@
 */

 ppd_attr_t *				/* O - Attribute or @code NULL@ if not found */
@@ -87,7 +87,7 @@ ppdFindAttr(ppd_file_t *ppd,		/* I - PPD file data */
 /*
 * 'ppdFindNextAttr()' - Find the next matching attribute.
 *
- * @since CUPS 1.1.19/Mac OS X 10.3@
+ * @since CUPS 1.1.19/OS X 10.3@
 */

 ppd_attr_t *				/* O - Attribute or @code NULL@ if not found */
@@ -3,7 +3,7 @@
 *
 *   Authentication functions for CUPS.
 *
- *   Copyright 2007-2011 by Apple Inc.
+ *   Copyright 2007-2013 by Apple Inc.
 *   Copyright 1997-2007 by Easy Software Products.
 *
 *   This file contains Kerberos support code, copyright 2006 by
@@ -112,10 +112,10 @@ static int	cups_local_auth(http_t *http);
 /*
 * 'cupsDoAuthentication()' - Authenticate a request.
 *
- * This function should be called in response to a @code HTTP_UNAUTHORIZED@
+ * This function should be called in response to a @code HTTP_STATUS_UNAUTHORIZED@
 * status, prior to resubmitting your request.
 *
- * @since CUPS 1.1.20/Mac OS X 10.4@
+ * @since CUPS 1.1.20/OS X 10.4@
 */

 int					/* O - 0 on success, -1 on error */
@@ -124,7 +124,8 @@ cupsDoAuthentication(
    const char *method,			/* I - Request method ("GET", "POST", "PUT") */
    const char *resource)		/* I - Resource path */
 {
-  const char	*password;		/* Password string */
+  const char	*password,		/* Password string */
+		*www_auth;		/* WWW-Authenticate header */
  char		prompt[1024],		/* Prompt for user */
 		realm[HTTP_MAX_VALUE],	/* realm="xyz" string */
 		nonce[HTTP_MAX_VALUE];	/* nonce="xyz" string */
@@ -163,14 +164,14 @@ cupsDoAuthentication(
      DEBUG_printf(("2cupsDoAuthentication: authstring=\"%s\"",
                    http->authstring));

-      if (http->status == HTTP_UNAUTHORIZED)
+      if (http->status == HTTP_STATUS_UNAUTHORIZED)
 	http->digest_tries ++;

      return (0);
    }
    else if (localauth == -1)
    {
-      http->status = HTTP_AUTHORIZATION_CANCELED;
+      http->status = HTTP_STATUS_CUPS_AUTHORIZATION_CANCELED;
      return (-1);			/* Error or canceled */
    }
  }
@@ -179,46 +180,54 @@ cupsDoAuthentication(
  * Nope, see if we should retry the current username:password...
  */

+  www_auth = http->fields[HTTP_FIELD_WWW_AUTHENTICATE];
+
  if ((http->digest_tries > 1 || !http->userpass[0]) &&
-      (!strncmp(http->fields[HTTP_FIELD_WWW_AUTHENTICATE], "Basic", 5) ||
-       !strncmp(http->fields[HTTP_FIELD_WWW_AUTHENTICATE], "Digest", 6)))
+      (!_cups_strncasecmp(www_auth, "Basic", 5) ||
+       !_cups_strncasecmp(www_auth, "Digest", 6)))
  {
   /*
    * Nope - get a new password from the user...
    */

+    char default_username[HTTP_MAX_VALUE];
+					/* Default username */
+
    cg = _cupsGlobals();

    if (!cg->lang_default)
      cg->lang_default = cupsLangDefault();

+    if (httpGetSubField(http, HTTP_FIELD_WWW_AUTHENTICATE, "username",
+                        default_username))
+      cupsSetUser(default_username);
+
    snprintf(prompt, sizeof(prompt),
             _cupsLangString(cg->lang_default, _("Password for %s on %s? ")),
 	     cupsUser(),
 	     http->hostname[0] == '/' ? "localhost" : http->hostname);

-    http->digest_tries  = _cups_strncasecmp(http->fields[HTTP_FIELD_WWW_AUTHENTICATE],
-                                      "Digest", 5) != 0;
+    http->digest_tries  = _cups_strncasecmp(www_auth, "Digest", 6) != 0;
    http->userpass[0]   = '\0';

    if ((password = cupsGetPassword2(prompt, http, method, resource)) == NULL)
    {
-      http->status = HTTP_AUTHORIZATION_CANCELED;
+      http->status = HTTP_STATUS_CUPS_AUTHORIZATION_CANCELED;
      return (-1);
    }

    snprintf(http->userpass, sizeof(http->userpass), "%s:%s", cupsUser(),
             password);
  }
-  else if (http->status == HTTP_UNAUTHORIZED)
+  else if (http->status == HTTP_STATUS_UNAUTHORIZED)
    http->digest_tries ++;

-  if (http->status == HTTP_UNAUTHORIZED && http->digest_tries >= 3)
+  if (http->status == HTTP_STATUS_UNAUTHORIZED && http->digest_tries >= 3)
  {
    DEBUG_printf(("1cupsDoAuthentication: Too many authentication tries (%d)",
 		  http->digest_tries));

-    http->status = HTTP_AUTHORIZATION_CANCELED;
+    http->status = HTTP_STATUS_CUPS_AUTHORIZATION_CANCELED;
    return (-1);
  }

@@ -227,7 +236,7 @@ cupsDoAuthentication(
  */

 #ifdef HAVE_GSSAPI
-  if (!strncmp(http->fields[HTTP_FIELD_WWW_AUTHENTICATE], "Negotiate", 9))
+  if (!_cups_strncasecmp(www_auth, "Negotiate", 9))
  {
   /*
    * Kerberos authentication...
@@ -235,13 +244,13 @@ cupsDoAuthentication(

    if (_cupsSetNegotiateAuthString(http, method, resource))
    {
-      http->status = HTTP_AUTHORIZATION_CANCELED;
+      http->status = HTTP_STATUS_CUPS_AUTHORIZATION_CANCELED;
      return (-1);
    }
  }
  else
 #endif /* HAVE_GSSAPI */
-  if (!strncmp(http->fields[HTTP_FIELD_WWW_AUTHENTICATE], "Basic", 5))
+  if (!_cups_strncasecmp(www_auth, "Basic", 5))
  {
   /*
    * Basic authentication...
@@ -254,7 +263,7 @@ cupsDoAuthentication(
                   (int)strlen(http->userpass));
    httpSetAuthString(http, "Basic", encode);
  }
-  else if (!strncmp(http->fields[HTTP_FIELD_WWW_AUTHENTICATE], "Digest", 6))
+  else if (!_cups_strncasecmp(www_auth, "Digest", 6))
  {
   /*
    * Digest authentication...
@@ -277,8 +286,8 @@ cupsDoAuthentication(
  else
  {
    DEBUG_printf(("1cupsDoAuthentication: Unknown auth type: \"%s\"",
-                  http->fields[HTTP_FIELD_WWW_AUTHENTICATE]));
-    http->status = HTTP_AUTHORIZATION_CANCELED;
+                  www_auth));
+    http->status = HTTP_STATUS_CUPS_AUTHORIZATION_CANCELED;
    return (-1);
  }

@@ -456,7 +465,7 @@ _cupsSetNegotiateAuthString(
      authsize         = sizeof(http->_authstring);
    }

-    strcpy(http->authstring, "Negotiate ");
+    strlcpy(http->authstring, "Negotiate ", authsize);
    httpEncode64_2(http->authstring + 10, authsize - 10, output_token.value,
 		   output_token.length);

@@ -658,8 +667,7 @@ cups_local_auth(http_t *http)		/* I - HTTP connection to server */
  int			pid;		/* Current process ID */
  FILE			*fp;		/* Certificate file */
  char			trc[16],	/* Try Root Certificate parameter */
-			filename[1024],	/* Certificate filename */
-			certificate[33];/* Certificate string */
+			filename[1024];	/* Certificate filename */
  _cups_globals_t *cg = _cupsGlobals();	/* Global data */
 #  if defined(HAVE_AUTHORIZATION_H)
  OSStatus		status;		/* Status */
@@ -853,19 +861,25 @@ cups_local_auth(http_t *http)		/* I - HTTP connection to server */
    * Read the certificate from the file...
    */

-    fgets(certificate, sizeof(certificate), fp);
+    char	certificate[33],	/* Certificate string */
+		*certptr;		/* Pointer to certificate string */
+
+    certptr = fgets(certificate, sizeof(certificate), fp);
    fclose(fp);

-   /*
-    * Set the authorization string and return...
-    */
+    if (certptr)
+    {
+     /*
+      * Set the authorization string and return...
+      */

-    httpSetAuthString(http, "Local", certificate);
+      httpSetAuthString(http, "Local", certificate);

-    DEBUG_printf(("8cups_local_auth: Returning authstring=\"%s\"",
-		  http->authstring));
+      DEBUG_printf(("8cups_local_auth: Returning authstring=\"%s\"",
+		    http->authstring));

-    return (0);
+      return (0);
+    }
  }

  return (1);
@@ -3,7 +3,7 @@
 *
 *   Backchannel functions for CUPS.
 *
- *   Copyright 2007-2010 by Apple Inc.
+ *   Copyright 2007-2012 by Apple Inc.
 *   Copyright 1997-2007 by Easy Software Products.
 *
 *   These coded instructions, statements, and computer programs are the
@@ -18,7 +18,7 @@
 *
 *   cupsBackChannelRead()  - Read data from the backchannel.
 *   cupsBackChannelWrite() - Write data to the backchannel.
- *   cups_setup()           - Setup select() 
+ *   cups_setup()           - Setup select()
 */

 /*
@@ -50,7 +50,7 @@ static void	cups_setup(fd_set *set, struct timeval *tval,
 * parameter controls how many seconds to wait for the data - use 0.0 to
 * return immediately if there is no data, -1.0 to wait for data indefinitely.
 *
- * @since CUPS 1.2/Mac OS X 10.5@
+ * @since CUPS 1.2/OS X 10.5@
 */

 ssize_t					/* O - Bytes read or -1 on error */
@@ -101,7 +101,7 @@ cupsBackChannelRead(char   *buffer,	/* I - Buffer to read into */
 * 0.0 to return immediately if the data cannot be written, -1.0 to wait
 * indefinitely.
 *
- * @since CUPS 1.2/Mac OS X 10.5@
+ * @since CUPS 1.2/OS X 10.5@
 */

 ssize_t					/* O - Bytes written or -1 on error */
@@ -178,7 +178,7 @@ cupsBackChannelWrite(


 /*
- * 'cups_setup()' - Setup select() 
+ * 'cups_setup()' - Setup select()
 */

 static void
@@ -44,7 +44,7 @@ static void	quote_string(const char *s);
 * variable or the device URI passed in argv[0], whichever is found
 * first.
 *
- * @since CUPS 1.2/Mac OS X 10.5@
+ * @since CUPS 1.2/OS X 10.5@
 */

 const char *				/* O - Device URI or @code NULL@ */
@@ -54,6 +54,8 @@ cupsBackendDeviceURI(char **argv)	/* I - Command-line arguments */
 		*auth_info_required;	/* AUTH_INFO_REQUIRED env var */
  _cups_globals_t *cg = _cupsGlobals();	/* Global info */
  int		options;		/* Resolve options */
+  ppd_file_t	*ppd;			/* PPD file */
+  ppd_attr_t	*ppdattr;		/* PPD attribute */


  if ((device_uri = getenv("DEVICE_URI")) == NULL)
@@ -69,6 +71,15 @@ cupsBackendDeviceURI(char **argv)	/* I - Command-line arguments */
      !strcmp(auth_info_required, "negotiate"))
    options |= _HTTP_RESOLVE_FQDN;

+  if ((ppd = ppdOpenFile(getenv("PPD"))) != NULL)
+  {
+    if ((ppdattr = ppdFindAttr(ppd, "cupsIPPFaxOut", NULL)) != NULL &&
+        !_cups_strcasecmp(ppdattr->value, "true"))
+      options |= _HTTP_RESOLVE_FAXOUT;
+
+    ppdClose(ppd);
+  }
+
  return (_httpResolveURI(device_uri, cg->resolved_uri,
                          sizeof(cg->resolved_uri), options, NULL, NULL));
 }
@@ -81,7 +92,7 @@ cupsBackendDeviceURI(char **argv)	/* I - Command-line arguments */
 * It handles quoting of special characters in the device-make-and-model,
 * device-info, device-id, and device-location strings.
 *
- * @since CUPS 1.4/Mac OS X 10.6@
+ * @since CUPS 1.4/OS X 10.6@
 */

 void
@@ -125,7 +136,7 @@ quote_string(const char *s)		/* I - String to write */
      if (*s == '\\' || *s == '\"')
 	putchar('\\');

-      if (*s == '\n')
+      if (((*s & 255) < ' ' && *s != '\t') || *s == 0x7f)
        putchar(' ');
      else
        putchar(*s);
@@ -3,7 +3,7 @@
 *
 *   Option marking routines for CUPS.
 *
- *   Copyright 2007-2011 by Apple Inc.
+ *   Copyright 2007-2012 by Apple Inc.
 *   Copyright 1997-2007 by Easy Software Products, all rights reserved.
 *
 *   These coded instructions, statements, and computer programs are the
@@ -79,7 +79,7 @@ static cups_array_t	*ppd_test_constraints(ppd_file_t *ppd,
 * the conflicting options.  The returned option array must be freed using
 * @link cupsFreeOptions@.
 *
- * @since CUPS 1.4/Mac OS X 10.6@
+ * @since CUPS 1.4/OS X 10.6@
 */

 int					/* O - Number of conflicting options */
@@ -178,7 +178,7 @@ cupsGetConflicts(
 * choice for the conflicting option, then iterating over all possible choices
 * until a non-conflicting option choice is found.
 *
- * @since CUPS 1.4/Mac OS X 10.6@
+ * @since CUPS 1.4/OS X 10.6@
 */

 int					/* O  - 1 on success, 0 on failure */
@@ -650,7 +650,7 @@ ppdConflicts(ppd_file_t *ppd)		/* I - PPD to check */
 * This function tests whether a particular option choice is available based
 * on constraints against options in the "InstallableOptions" group.
 *
- * @since CUPS 1.4/Mac OS X 10.6@
+ * @since CUPS 1.4/OS X 10.6@
 */

 int					/* O - 1 if conflicting, 0 if not conflicting */
@@ -930,7 +930,7 @@ ppd_load_constraints(ppd_file_t *ppd)	/* I - PPD file */
      if (!_cups_strncasecmp(option, "Custom", 6) && !_cups_strcasecmp(choice, "True"))
      {
 	_cups_strcpy(option, option + 6);
-	strcpy(choice, "Custom");
+	strlcpy(choice, "Custom", sizeof(choice));
      }

      constptr->option      = ppdFindOption(ppd, option);
@@ -3,7 +3,7 @@
 *
 *   Private definitions for CUPS.
 *
- *   Copyright 2007-2012 by Apple Inc.
+ *   Copyright 2007-2013 by Apple Inc.
 *   Copyright 1997-2007 by Easy Software Products, all rights reserved.
 *
 *   These coded instructions, statements, and computer programs are the
@@ -22,15 +22,16 @@
 * Include necessary headers...
 */

-#  include <cups/cups.h>
 #  include "string-private.h"
 #  include "debug-private.h"
-#  include "ppd-private.h"
-#  include "http-private.h"
+#  include "array-private.h"
 #  include "ipp-private.h"
+#  include "http-private.h"
 #  include "language-private.h"
 #  include "pwg-private.h"
+#  include "ppd-private.h"
 #  include "thread-private.h"
+#  include <cups/cups.h>
 #  ifdef __APPLE__
 #    include <sys/cdefs.h>
 #    include <CoreFoundation/CoreFoundation.h>
@@ -86,6 +87,11 @@ typedef struct _cups_globals_s		/**** CUPS global state data ****/
  char			resolved_uri[1024];
 					/* Buffer for cupsBackendDeviceURI */

+  /* debug.c */
+#  ifdef DEBUG
+  int			thread_id;	/* Friendly thread ID */
+#  endif /* DEBUG */
+
  /* file.c */
  cups_file_t		*stdio_files[3];/* stdin, stdout, stderr */

@@ -125,7 +131,7 @@ typedef struct _cups_globals_s		/**** CUPS global state data ****/
  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 */
+  pwg_media_t		pwg_media;	/* PWG media data for custom size */
  char			pwg_name[65];	/* PWG media name for custom size */

  /* request.c */
@@ -145,6 +151,7 @@ typedef struct _cups_globals_s		/**** CUPS global state data ****/
  /* usersys.c */
  http_encryption_t	encryption;	/* Encryption setting */
  char			user[65],	/* User name */
+			user_agent[256],/* User-Agent string */
 			server[256],	/* Server address */
 			servername[256],/* Server hostname */
 			password[128];	/* Password for default callback */
@@ -158,7 +165,8 @@ typedef struct _cups_globals_s		/**** CUPS global state data ****/
  cups_server_cert_cb_t	server_cert_cb;	/* Server certificate callback */
  void			*server_cert_data;
 					/* Server certificate user data */
-  int			any_root,	/* Allow any root */
+  int			server_version,	/* Server IPP version */
+			any_root,	/* Allow any root */
 			expired_certs,	/* Allow expired certs */
 			expired_root;	/* Allow expired root */

@@ -190,17 +198,32 @@ typedef struct _cups_media_db_s		/* Media database */
 					 * millimeters */
 } _cups_media_db_t;

+typedef struct _cups_dconstres_s	/* Constraint/resolver */
+{
+  char	*name;				/* Name of resolver */
+  ipp_t	*collection;			/* Collection containing attrs */
+} _cups_dconstres_t;
+
 struct _cups_dinfo_s			/* Destination capability and status
 					 * information */
 {
+  int			version;	/* IPP version */
  const char		*uri;		/* Printer URI */
  char			*resource;	/* Resource path */
  ipp_t			*attrs;		/* Printer attributes */
+  int			num_defaults;	/* Number of default options */
+  cups_option_t		*defaults;	/* Default options */
  cups_array_t		*constraints;	/* Job constraints */
+  cups_array_t		*resolvers;	/* Job resolvers */
  cups_array_t		*localizations;	/* Localization information */
  cups_array_t		*media_db;	/* Media database */
  _cups_media_db_t	min_size,	/* Minimum size */
 			max_size;	/* Maximum size */
+  unsigned		cached_flags;	/* Flags used for cached media */
+  cups_array_t		*cached_db;	/* Cache of media from last index/default */
+  time_t		ready_time;	/* When xxx-ready attributes were last queried */
+  ipp_t			*ready_attrs;	/* xxx-ready attributes */
+  cups_array_t		*ready_db;	/* media[-col]-ready media database */
 };


@@ -3,7 +3,7 @@
 *
 *   API definitions for CUPS.
 *
- *   Copyright 2007-2012 by Apple Inc.
+ *   Copyright 2007-2013 by Apple Inc.
 *   Copyright 1997-2007 by Easy Software Products.
 *
 *   These coded instructions, statements, and computer programs are the
@@ -37,6 +37,7 @@ typedef off_t ssize_t;			/* @private@ */
 #  include "file.h"
 #  include "ipp.h"
 #  include "language.h"
+#  include "pwg.h"


 /*
@@ -52,10 +53,10 @@ extern "C" {
 * Constants...
 */

-#  define CUPS_VERSION			1.0599
+#  define CUPS_VERSION			1.0700
 #  define CUPS_VERSION_MAJOR		1
-#  define CUPS_VERSION_MINOR		6
-#  define CUPS_VERSION_PATCH		-1
+#  define CUPS_VERSION_MINOR		7
+#  define CUPS_VERSION_PATCH		0

 #  define CUPS_BC_FD			3
 					/* Back-channel file descriptor for
@@ -230,20 +231,20 @@ enum cups_ptype_e			/* Printer type/capability bit
  CUPS_PRINTER_FAX = 0x40000,		/* Fax queue */
  CUPS_PRINTER_REJECTING = 0x80000,	/* Printer is rejecting jobs */
  CUPS_PRINTER_DELETE = 0x100000,	/* Delete printer
-					 * @since CUPS 1.2/Mac OS X 10.5@ */
+					 * @since CUPS 1.2/OS X 10.5@ */
  CUPS_PRINTER_NOT_SHARED = 0x200000,	/* Printer is not shared
-					 * @since CUPS 1.2/Mac OS X 10.5@ */
+					 * @since CUPS 1.2/OS X 10.5@ */
  CUPS_PRINTER_AUTHENTICATED = 0x400000,/* Printer requires authentication
-					 * @since CUPS 1.2/Mac OS X 10.5@ */
+					 * @since CUPS 1.2/OS X 10.5@ */
  CUPS_PRINTER_COMMANDS = 0x800000,	/* Printer supports maintenance commands
-					 * @since CUPS 1.2/Mac OS X 10.5@ */
+					 * @since CUPS 1.2/OS X 10.5@ */
  CUPS_PRINTER_DISCOVERED = 0x1000000,	/* Printer was automatically discovered
 					 * and added @private@
 					 * @since Deprecated@ */
  CUPS_PRINTER_SCANNER = 0x2000000,	/* Scanner-only device
-					 * @since CUPS 1.4/Mac OS X 10.6@ */
+					 * @since CUPS 1.4/OS X 10.6@ */
  CUPS_PRINTER_MFP = 0x4000000,		/* Printer with scanning capabilities
-					 * @since CUPS 1.4/Mac OS X 10.6@ */
+					 * @since CUPS 1.4/OS X 10.6@ */
  CUPS_PRINTER_OPTIONS = 0x6fffc	/* ~(CLASS | REMOTE | IMPLICIT |
 					 * DEFAULT | FAX | REJECTING | DELETE |
 					 * NOT_SHARED | AUTHENTICATED |
@@ -267,7 +268,7 @@ typedef struct cups_dest_s		/**** Destination ****/

 typedef struct _cups_dinfo_s cups_dinfo_t;
 					/* Destination capability and status
-					 * information @since CUPS 1.6@ */
+					 * information @since CUPS 1.6/OS X 10.8@ */

 typedef struct cups_job_s		/**** Job ****/
 {
@@ -284,7 +285,7 @@ typedef struct cups_job_s		/**** Job ****/
  time_t	processing_time;	/* Time the job was processed */
 } cups_job_t;

-typedef struct cups_size_s		/**** Media Size @since CUPS 1.6@ ****/
+typedef struct cups_size_s		/**** Media Size @since CUPS 1.6/OS X 10.8@ ****/
 {
  char		media[128];		/* Media name to use */
  int		width,			/* Width in hundredths of millimeters */
@@ -304,17 +305,17 @@ typedef int (*cups_client_cert_cb_t)(http_t *http, void *tls,
 				     cups_array_t *distinguished_names,
 				     void *user_data);
 					/* Client credentials callback
-					 * @since CUPS 1.5/Mac OS X 10.7@ */
+					 * @since CUPS 1.5/OS X 10.7@ */

 typedef int (*cups_dest_cb_t)(void *user_data, unsigned flags,
 			      cups_dest_t *dest);
 			      		/* Destination enumeration callback
-					 * @since CUPS 1.6@ */
+					 * @since CUPS 1.6/OS X 10.8@ */

 #  ifdef __BLOCKS__
 typedef int (^cups_dest_block_t)(unsigned flags, cups_dest_t *dest);
 			      		/* Destination enumeration block
-					 * @since CUPS 1.6@ */
+					 * @since CUPS 1.6/OS X 10.8@ */
 #  endif /* __BLOCKS__ */

 typedef void (*cups_device_cb_t)(const char *device_class,
@@ -323,7 +324,7 @@ typedef void (*cups_device_cb_t)(const char *device_class,
                                 const char *device_uri,
 				 const char *device_location, void *user_data);
 					/* Device callback
-					 * @since CUPS 1.4/Mac OS X 10.6@ */
+					 * @since CUPS 1.4/OS X 10.6@ */

 typedef const char *(*cups_password_cb_t)(const char *prompt);
 					/* Password callback */
@@ -333,12 +334,12 @@ typedef const char *(*cups_password_cb2_t)(const char *prompt, http_t *http,
 					   const char *resource,
 					   void *user_data);
 					/* New password callback
-					 * @since CUPS 1.4/Mac OS X 10.6@ */
+					 * @since CUPS 1.4/OS X 10.6@ */

 typedef int (*cups_server_cert_cb_t)(http_t *http, void *tls,
 				     cups_array_t *certs, void *user_data);
 					/* Server credentials callback
-					 * @since CUPS 1.5/Mac OS X 10.7@ */
+					 * @since CUPS 1.5/OS X 10.7@ */


 /*
@@ -353,12 +354,12 @@ extern ipp_t		*cupsDoRequest(http_t *http, ipp_t *request,
 			               const char *resource);
 extern http_encryption_t cupsEncryption(void);
 extern void		cupsFreeJobs(int num_jobs, cups_job_t *jobs);
-extern int		cupsGetClasses(char ***classes) _CUPS_DEPRECATED;
+extern int		cupsGetClasses(char ***classes) _CUPS_DEPRECATED_MSG("Use cupsGetDests instead.");
 extern const char	*cupsGetDefault(void);
 extern int		cupsGetJobs(cups_job_t **jobs, const char *name,
 			            int myjobs, int whichjobs);
 extern const char	*cupsGetPPD(const char *name);
-extern int		cupsGetPrinters(char ***printers) _CUPS_DEPRECATED;
+extern int		cupsGetPrinters(char ***printers) _CUPS_DEPRECATED_MSG("Use cupsGetDests instead.");
 extern ipp_status_t	cupsLastError(void);
 extern int		cupsPrintFile(const char *name, const char *filename,
 			              const char *title, int num_options,
@@ -366,7 +367,7 @@ extern int		cupsPrintFile(const char *name, const char *filename,
 extern int		cupsPrintFiles(const char *name, int num_files,
 			               const char **files, const char *title,
 				       int num_options, cups_option_t *options);
-extern char		*cupsTempFile(char *filename, int len) _CUPS_DEPRECATED;
+extern char		*cupsTempFile(char *filename, int len) _CUPS_DEPRECATED_MSG("Use cupsTempFd or cupsTempFile2 instead.");
 extern int		cupsTempFd(char *filename, int len);

 extern int		cupsAddDest(const char *name, const char *instance,
@@ -429,7 +430,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/Mac OS X 10.5 ****/
+/**** New in CUPS 1.2/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,
@@ -446,7 +447,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/Mac OS X 10.5 ****/
+/**** New in CUPS 1.3/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;
@@ -461,7 +462,7 @@ extern void		cupsSetDefaultDest(const char *name,
 					   int num_dests,
 					   cups_dest_t *dests) _CUPS_API_1_3;

-/**** New in CUPS 1.4/Mac OS X 10.6 ****/
+/**** New in CUPS 1.4/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,
@@ -498,14 +499,14 @@ extern http_status_t	cupsStartDocument(http_t *http, const char *name,
 extern http_status_t	cupsWriteRequestData(http_t *http, const char *buffer,
 			                     size_t length) _CUPS_API_1_4;

-/**** New in CUPS 1.5 ****/
+/**** New in CUPS 1.5/OS X 10.7 ****/
 extern void		cupsSetClientCertCB(cups_client_cert_cb_t cb,
 					    void *user_data) _CUPS_API_1_5;
 extern int		cupsSetCredentials(cups_array_t *certs) _CUPS_API_1_5;
 extern void		cupsSetServerCertCB(cups_server_cert_cb_t cb,
 					    void *user_data) _CUPS_API_1_5;

-/**** New in CUPS 1.6 ****/
+/**** New in CUPS 1.6/OS X 10.8 ****/
 extern ipp_status_t	cupsCancelDestJob(http_t *http, cups_dest_t *dest,
 			                  int job_id) _CUPS_API_1_6;
 extern int		cupsCheckDestSupported(http_t *http, cups_dest_t *dest,
@@ -513,7 +514,8 @@ extern int		cupsCheckDestSupported(http_t *http, cups_dest_t *dest,
 			                       const char *option,
 					       const char *value) _CUPS_API_1_6;
 extern ipp_status_t	cupsCloseDestJob(http_t *http, cups_dest_t *dest,
-			                 int job_id) _CUPS_API_1_6;
+			                 cups_dinfo_t *info, int job_id)
+			                 _CUPS_API_1_6;
 extern http_t		*cupsConnectDest(cups_dest_t *dest, unsigned flags,
 			                 int msec, int *cancel,
 					 char *resource, size_t resourcesize,
@@ -558,7 +560,9 @@ extern int		cupsEnumDestsBlock(unsigned flags, int msec,
 					   _CUPS_API_1_6;
 #  endif /* __BLOCKS__ */
 extern ipp_status_t	cupsFinishDestDocument(http_t *http,
-			                       cups_dest_t *dest) _CUPS_API_1_6;
+			                       cups_dest_t *dest,
+			                       cups_dinfo_t *info)
+			                       _CUPS_API_1_6;
 extern void		cupsFreeDestInfo(cups_dinfo_t *dinfo) _CUPS_API_1_6;
 extern int		cupsGetDestMediaByName(http_t *http, cups_dest_t *dest,
 			                       cups_dinfo_t *dinfo,
@@ -587,6 +591,34 @@ extern http_status_t	cupsStartDestDocument(http_t *http, cups_dest_t *dest,
 					      cups_option_t *options,
 					      int last_document) _CUPS_API_1_6;

+/* New in CUPS 1.7 */
+extern ipp_attribute_t	*cupsFindDestDefault(http_t *http, cups_dest_t *dest,
+			                     cups_dinfo_t *dinfo,
+			                     const char *option) _CUPS_API_1_7;
+extern ipp_attribute_t	*cupsFindDestReady(http_t *http, cups_dest_t *dest,
+					   cups_dinfo_t *dinfo,
+					   const char *option) _CUPS_API_1_7;
+extern ipp_attribute_t	*cupsFindDestSupported(http_t *http, cups_dest_t *dest,
+			                       cups_dinfo_t *dinfo,
+			                       const char *option)
+			                       _CUPS_API_1_7;
+extern int		cupsGetDestMediaByIndex(http_t *http, cups_dest_t *dest,
+			                        cups_dinfo_t *dinfo, int n,
+			                        unsigned flags,
+			                        cups_size_t *size)
+			                        _CUPS_API_1_7;
+extern  int		cupsGetDestMediaCount(http_t *http, cups_dest_t *dest,
+			                      cups_dinfo_t *dinfo,
+			                      unsigned flags) _CUPS_API_1_7;
+extern int		cupsGetDestMediaDefault(http_t *http, cups_dest_t *dest,
+			                        cups_dinfo_t *dinfo,
+			                        unsigned flags,
+			                        cups_size_t *size)
+			                        _CUPS_API_1_7;
+extern void		cupsSetUserAgent(const char *user_agent) _CUPS_API_1_7;
+extern const char	*cupsUserAgent(void) _CUPS_API_1_7;
+
+
 #  ifdef __cplusplus
 }
 #  endif /* __cplusplus */
@@ -3,7 +3,7 @@
 *
 *   PPD custom option routines for CUPS.
 *
- *   Copyright 2007-2011 by Apple Inc.
+ *   Copyright 2007-2012 by Apple Inc.
 *   Copyright 1997-2006 by Easy Software Products, all rights reserved.
 *
 *   These coded instructions, statements, and computer programs are the
@@ -41,7 +41,7 @@
 /*
 * 'ppdFindCustomOption()' - Find a custom option.
 *
- * @since CUPS 1.2/Mac OS X 10.5@
+ * @since CUPS 1.2/OS X 10.5@
 */

 ppd_coption_t *				/* O - Custom option or NULL */
@@ -62,7 +62,7 @@ ppdFindCustomOption(ppd_file_t *ppd,	/* I - PPD file */
 /*
 * 'ppdFindCustomParam()' - Find a parameter for a custom option.
 *
- * @since CUPS 1.2/Mac OS X 10.5@
+ * @since CUPS 1.2/OS X 10.5@
 */

 ppd_cparam_t *				/* O - Custom parameter or NULL */
@@ -88,7 +88,7 @@ ppdFindCustomParam(ppd_coption_t *opt,	/* I - Custom option */
 /*
 * 'ppdFirstCustomParam()' - Return the first parameter for a custom option.
 *
- * @since CUPS 1.2/Mac OS X 10.5@
+ * @since CUPS 1.2/OS X 10.5@
 */

 ppd_cparam_t *				/* O - Custom parameter or NULL */
@@ -104,7 +104,7 @@ ppdFirstCustomParam(ppd_coption_t *opt)	/* I - Custom option */
 /*
 * 'ppdNextCustomParam()' - Return the next parameter for a custom option.
 *
- * @since CUPS 1.2/Mac OS X 10.5@
+ * @since CUPS 1.2/OS X 10.5@
 */

 ppd_cparam_t *				/* O - Custom parameter or NULL */
@@ -45,8 +45,8 @@ _cups_gettimeofday(struct timeval *tv,	/* I  - Timeval struct */
 #else
 #  include <sys/time.h>
 #  include <unistd.h>
-#  include <regex.h>
 #endif /* WIN32 */
+#include <regex.h>
 #include <fcntl.h>


@@ -65,13 +65,27 @@ int			_cups_debug_level = 1;
 * Local globals...
 */

-#  ifndef WIN32
 static regex_t		*debug_filter = NULL;
 					/* Filter expression for messages */
-#  endif /* !WIN32 */
 static int		debug_init = 0;	/* Did we initialize debugging? */
-static _cups_mutex_t	debug_mutex = _CUPS_MUTEX_INITIALIZER;
+static _cups_mutex_t	debug_init_mutex = _CUPS_MUTEX_INITIALIZER,
 					/* Mutex to control initialization */
+			debug_log_mutex = _CUPS_MUTEX_INITIALIZER;
+					/* Mutex to serialize log entries */
+
+
+/*
+ * 'debug_thread_id()' - Return an integer representing the current thread.
+ */
+
+static int				/* O - Local thread ID */
+debug_thread_id(void)
+{
+  _cups_globals_t *cg = _cupsGlobals();	/* Global data */
+
+
+  return (cg->thread_id);
+}


 /*
@@ -231,16 +245,8 @@ debug_vsnprintf(char       *buffer,	/* O - Output buffer */

            if (bufptr)
 	    {
-	      if ((bufptr + strlen(temp)) > bufend)
-	      {
-		strncpy(bufptr, temp, (size_t)(bufend - bufptr));
-		bufptr = bufend;
-	      }
-	      else
-	      {
-		strcpy(bufptr, temp);
-		bufptr += strlen(temp);
-	      }
+	      strlcpy(bufptr, temp, (size_t)(bufend - bufptr));
+	      bufptr += strlen(bufptr);
 	    }
 	    break;

@@ -269,16 +275,8 @@ debug_vsnprintf(char       *buffer,	/* O - Output buffer */

 	    if (bufptr)
 	    {
-	      if ((bufptr + strlen(temp)) > bufend)
-	      {
-		strncpy(bufptr, temp, (size_t)(bufend - bufptr));
-		bufptr = bufend;
-	      }
-	      else
-	      {
-		strcpy(bufptr, temp);
-		bufptr += strlen(temp);
-	      }
+	      strlcpy(bufptr, temp, (size_t)(bufend - bufptr));
+	      bufptr += strlen(bufptr);
 	    }
 	    break;

@@ -292,16 +290,8 @@ debug_vsnprintf(char       *buffer,	/* O - Output buffer */

 	    if (bufptr)
 	    {
-	      if ((bufptr + strlen(temp)) > bufend)
-	      {
-		strncpy(bufptr, temp, (size_t)(bufend - bufptr));
-		bufptr = bufend;
-	      }
-	      else
-	      {
-		strcpy(bufptr, temp);
-		bufptr += strlen(temp);
-	      }
+	      strlcpy(bufptr, temp, (size_t)(bufend - bufptr));
+	      bufptr += strlen(bufptr);
 	    }
 	    break;

@@ -455,32 +445,30 @@ _cups_debug_printf(const char *format,	/* I - Printf-style format string */
  if (level > _cups_debug_level)
    return;

-#  ifndef WIN32
  if (debug_filter)
  {
    int	result;				/* Filter result */

-    _cupsMutexLock(&debug_mutex);
+    _cupsMutexLock(&debug_init_mutex);
    result = regexec(debug_filter, format, 0, NULL, 0);
-    _cupsMutexUnlock(&debug_mutex);
+    _cupsMutexUnlock(&debug_init_mutex);

    if (result)
      return;
  }
-#  endif /* !WIN32 */

 /*
  * Format the message...
  */

  gettimeofday(&curtime, NULL);
-  snprintf(buffer, sizeof(buffer), "%02d:%02d:%02d.%03d ",
-	   (int)((curtime.tv_sec / 3600) % 24),
+  snprintf(buffer, sizeof(buffer), "T%03d %02d:%02d:%02d.%03d  ",
+           debug_thread_id(), (int)((curtime.tv_sec / 3600) % 24),
 	   (int)((curtime.tv_sec / 60) % 60),
 	   (int)(curtime.tv_sec % 60), (int)(curtime.tv_usec / 1000));

  va_start(ap, format);
-  bytes = debug_vsnprintf(buffer + 13, sizeof(buffer) - 14, format, ap) + 13;
+  bytes = debug_vsnprintf(buffer + 19, sizeof(buffer) - 20, format, ap) + 19;
  va_end(ap);

  if (bytes >= (sizeof(buffer) - 1))
@@ -498,7 +486,9 @@ _cups_debug_printf(const char *format,	/* I - Printf-style format string */
  * Write it out...
  */

+  _cupsMutexLock(&debug_log_mutex);
  write(_cups_debug_fd, buffer, bytes);
+  _cupsMutexUnlock(&debug_log_mutex);
 }


@@ -538,27 +528,25 @@ _cups_debug_puts(const char *s)		/* I - String to output */
  if (level > _cups_debug_level)
    return;

-#  ifndef WIN32
  if (debug_filter)
  {
    int	result;				/* Filter result */

-    _cupsMutexLock(&debug_mutex);
+    _cupsMutexLock(&debug_init_mutex);
    result = regexec(debug_filter, s, 0, NULL, 0);
-    _cupsMutexUnlock(&debug_mutex);
+    _cupsMutexUnlock(&debug_init_mutex);

    if (result)
      return;
  }
-#  endif /* !WIN32 */

 /*
  * Format the message...
  */

  gettimeofday(&curtime, NULL);
-  bytes = snprintf(buffer, sizeof(buffer), "%02d:%02d:%02d.%03d %s",
-		   (int)((curtime.tv_sec / 3600) % 24),
+  bytes = snprintf(buffer, sizeof(buffer), "T%03d %02d:%02d:%02d.%03d  %s",
+                   debug_thread_id(), (int)((curtime.tv_sec / 3600) % 24),
 		   (int)((curtime.tv_sec / 60) % 60),
 		   (int)(curtime.tv_sec % 60), (int)(curtime.tv_usec / 1000),
 		   s);
@@ -578,7 +566,9 @@ _cups_debug_puts(const char *s)		/* I - String to output */
  * Write it out...
  */

+  _cupsMutexLock(&debug_log_mutex);
  write(_cups_debug_fd, buffer, bytes);
+  _cupsMutexUnlock(&debug_log_mutex);
 }


@@ -592,7 +582,7 @@ _cups_debug_set(const char *logfile,	/* I - Log file or NULL */
 		const char *filter,	/* I - Filter string or NULL */
 		int        force)	/* I - Force initialization */
 {
-  _cupsMutexLock(&debug_mutex);
+  _cupsMutexLock(&debug_init_mutex);

  if (!debug_init || force)
  {
@@ -606,13 +596,11 @@ _cups_debug_set(const char *logfile,	/* I - Log file or NULL */
      _cups_debug_fd = -1;
    }

-#  ifndef WIN32
    if (debug_filter)
    {
      regfree((regex_t *)debug_filter);
      debug_filter = NULL;
    }
-#  endif /* !WIN32 */

    _cups_debug_level = 1;

@@ -639,7 +627,6 @@ _cups_debug_set(const char *logfile,	/* I - Log file or NULL */
    if (level)
      _cups_debug_level = atoi(level);

-#  ifndef WIN32
    if (filter)
    {
      if ((debug_filter = (regex_t *)calloc(1, sizeof(regex_t))) == NULL)
@@ -653,12 +640,11 @@ _cups_debug_set(const char *logfile,	/* I - Log file or NULL */
 	debug_filter = NULL;
      }
    }
-#  endif /* !WIN32 */

    debug_init = 1;
  }

-  _cupsMutexUnlock(&debug_mutex);
+  _cupsMutexUnlock(&debug_init_mutex);
 }
 #endif /* DEBUG */

@@ -3,7 +3,7 @@
 *
 *   Destination job support for CUPS.
 *
- *   Copyright 2012 by Apple Inc.
+ *   Copyright 2012-2013 by Apple Inc.
 *
 *   These coded instructions, statements, and computer programs are the
 *   property of Apple Inc. and are protected by Federal copyright
@@ -15,7 +15,7 @@
 *
 * Contents:
 *
- *   cupsCancelDestJob()      - Cancel a job on a destination.
+ *   cupsCancelDestJob()      - Cancel a job on a destination.
 *   cupsCloseDestJob()       - Close a job and start printing.
 *   cupsCreateDestJob()      - Create a job on a destination.
 *   cupsFinishDestDocument() - Finish the current document.
@@ -34,10 +34,10 @@
 *
 * The "job_id" is the number returned by cupsCreateDestJob.
 *
- * Returns IPP_OK on success and IPP_NOT_AUTHORIZED or IPP_FORBIDDEN on
+ * Returns IPP_STATUS_OK on success and IPP_NOT_AUTHORIZED or IPP_FORBIDDEN on
 * failure.
 *
- * @since CUPS 1.6@
+ * @since CUPS 1.6/OS X 10.8@
 */

 ipp_status_t
@@ -45,7 +45,7 @@ cupsCancelDestJob(http_t      *http,	/* I - Connection to destination */
                  cups_dest_t *dest,	/* I - Destination */
                  int         job_id)	/* I - Job ID */
 {
-  return (IPP_NOT_FOUND);
+  return (IPP_STATUS_ERROR_NOT_FOUND);
 }


@@ -53,29 +53,96 @@ cupsCancelDestJob(http_t      *http,	/* I - Connection to destination */
 * 'cupsCloseDestJob()' - Close a job and start printing.
 *
 * Use when the last call to cupsStartDocument passed 0 for "last_document".
- * "job_id" is the job ID returned by cupsCreateDestJob. Returns IPP_OK on
- * success.
+ * "job_id" is the job ID returned by cupsCreateDestJob. Returns @code IPP_STATUS_OK@
+ * on success.
 *
- * @since CUPS 1.6@
+ * @since CUPS 1.6/OS X 10.8@
 */

-ipp_status_t
+ipp_status_t				/* O - IPP status code */
 cupsCloseDestJob(
-    http_t      *http,			/* I - Connection to destination */
-    cups_dest_t *dest,			/* I - Destination */
-    int         job_id)			/* I - Job ID */
+    http_t       *http,			/* I - Connection to destination */
+    cups_dest_t  *dest,			/* I - Destination */
+    cups_dinfo_t *info, 		/* I - Destination information */
+    int          job_id)		/* I - Job ID */
 {
-  return (IPP_NOT_FOUND);
+  int			i;		/* Looping var */
+  ipp_t			*request = NULL;/* Close-Job/Send-Document request */
+  ipp_attribute_t	*attr;		/* operations-supported attribute */
+
+
+  DEBUG_printf(("cupsCloseDestJob(http=%p, dest=%p(%s/%s), info=%p, job_id=%d)",
+                http, dest, dest ? dest->name : NULL,
+                dest ? dest->instance : NULL, info, job_id));
+
+ /*
+  * Range check input...
+  */
+
+  if (!http || !dest || !info || job_id <= 0)
+  {
+    _cupsSetError(IPP_STATUS_ERROR_INTERNAL, strerror(EINVAL), 0);
+    DEBUG_puts("1cupsCloseDestJob: Bad arguments.");
+    return (IPP_STATUS_ERROR_INTERNAL);
+  }
+
+ /*
+  * Build a Close-Job or empty Send-Document request...
+  */
+
+  if ((attr = ippFindAttribute(info->attrs, "operations-supported",
+                               IPP_TAG_ENUM)) != NULL)
+  {
+    for (i = 0; i < attr->num_values; i ++)
+      if (attr->values[i].integer == IPP_OP_CLOSE_JOB)
+      {
+        request = ippNewRequest(IPP_OP_CLOSE_JOB);
+        break;
+      }
+  }
+
+  if (!request)
+    request = ippNewRequest(IPP_OP_SEND_DOCUMENT);
+
+  if (!request)
+  {
+    _cupsSetError(IPP_STATUS_ERROR_INTERNAL, strerror(ENOMEM), 0);
+    DEBUG_puts("1cupsCloseDestJob: Unable to create Close-Job/Send-Document "
+               "request.");
+    return (IPP_STATUS_ERROR_INTERNAL);
+  }
+
+  ippSetVersion(request, info->version / 10, info->version % 10);
+
+  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, "printer-uri",
+               NULL, info->uri);
+  ippAddInteger(request, IPP_TAG_OPERATION, IPP_TAG_INTEGER, "job-id",
+                job_id);
+  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_NAME, "requesting-user-name",
+               NULL, cupsUser());
+  if (ippGetOperation(request) == IPP_OP_SEND_DOCUMENT)
+    ippAddBoolean(request, IPP_TAG_OPERATION, "last-document", 1);
+
+ /*
+  * Send the request and return the status...
+  */
+
+  ippDelete(cupsDoRequest(http, request, info->resource));
+
+  DEBUG_printf(("1cupsCloseDestJob: %s (%s)", ippErrorString(cupsLastError()),
+                cupsLastErrorString()));
+
+  return (cupsLastError());
 }


 /*
 * 'cupsCreateDestJob()' - Create a job on a destination.
 *
- * Returns IPP_OK or IPP_OK_SUBST on success, saving the job ID in the variable
- * pointed to by "job_id".
+ * Returns @code IPP_STATUS_OK@ or @code IPP_STATUS_OK_SUBST@ on success, saving the job ID
+ * in the variable pointed to by "job_id".
 *
- * @since CUPS 1.6@
+ * @since CUPS 1.6/OS X 10.8@
 */

 ipp_status_t				/* O - IPP status code */
@@ -88,26 +155,120 @@ cupsCreateDestJob(
    int           num_options,		/* I - Number of job options */
    cups_option_t *options)		/* I - Job options */
 {
-  *job_id = 0;
+  ipp_t			*request,	/* Create-Job request */
+			*response;	/* Create-Job response */
+  ipp_attribute_t	*attr;		/* job-id attribute */

-  return (IPP_NOT_POSSIBLE);
+
+  DEBUG_printf(("cupsCreateDestJob(http=%p, dest=%p(%s/%s), info=%p, "
+                "job_id=%p, title=\"%s\", num_options=%d, options=%p)",
+                http, dest, dest ? dest->name : NULL,
+                dest ? dest->instance : NULL, info, job_id, title, num_options,
+                options));
+
+ /*
+  * Range check input...
+  */
+
+  if (job_id)
+    *job_id = 0;
+
+  if (!http || !dest || !info || !job_id)
+  {
+    _cupsSetError(IPP_STATUS_ERROR_INTERNAL, strerror(EINVAL), 0);
+    DEBUG_puts("1cupsCreateDestJob: Bad arguments.");
+    return (IPP_STATUS_ERROR_INTERNAL);
+  }
+
+ /*
+  * Build a Create-Job request...
+  */
+
+  if ((request = ippNewRequest(IPP_OP_CREATE_JOB)) == NULL)
+  {
+    _cupsSetError(IPP_STATUS_ERROR_INTERNAL, strerror(ENOMEM), 0);
+    DEBUG_puts("1cupsCreateDestJob: Unable to create Create-Job request.");
+    return (IPP_STATUS_ERROR_INTERNAL);
+  }
+
+  ippSetVersion(request, info->version / 10, info->version % 10);
+
+  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, "printer-uri",
+               NULL, info->uri);
+  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_NAME, "requesting-user-name",
+               NULL, cupsUser());
+  if (title)
+    ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_NAME, "job-name", NULL,
+                 title);
+
+  cupsEncodeOptions2(request, num_options, options, IPP_TAG_OPERATION);
+  cupsEncodeOptions2(request, num_options, options, IPP_TAG_JOB);
+  cupsEncodeOptions2(request, num_options, options, IPP_TAG_SUBSCRIPTION);
+
+ /*
+  * Send the request and get the job-id...
+  */
+
+  response = cupsDoRequest(http, request, info->resource);
+
+  if ((attr = ippFindAttribute(response, "job-id", IPP_TAG_INTEGER)) != NULL)
+  {
+    *job_id = attr->values[0].integer;
+    DEBUG_printf(("1cupsCreateDestJob: job-id=%d", *job_id));
+  }
+
+  ippDelete(response);
+
+ /*
+  * Return the status code from the Create-Job request...
+  */
+
+  DEBUG_printf(("1cupsCreateDestJob: %s (%s)", ippErrorString(cupsLastError()),
+                cupsLastErrorString()));
+
+  return (cupsLastError());
 }


 /*
 * 'cupsFinishDestDocument()' - Finish the current document.
 *
- * Returns IPP_OK on success.
+ * Returns @code IPP_STATUS_OK@ or @code IPP_STATUS_OK_SUBST@ on success.
 *
- * @since CUPS 1.6@
+ * @since CUPS 1.6/OS X 10.8@
 */

-ipp_status_t
+ipp_status_t				/* O - Status of document submission */
 cupsFinishDestDocument(
-    http_t      *http,			/* I - Connection to destination */
-    cups_dest_t *dest)			/* I - Destination */
+    http_t       *http,			/* I - Connection to destination */
+    cups_dest_t  *dest,			/* I - Destination */
+    cups_dinfo_t *info) 		/* I - Destination information */
 {
-  return (IPP_NOT_FOUND);
+  DEBUG_printf(("cupsFinishDestDocument(http=%p, dest=%p(%s/%s), info=%p)",
+                http, dest, dest ? dest->name : NULL,
+                dest ? dest->instance : NULL, info));
+
+ /*
+  * Range check input...
+  */
+
+  if (!http || !dest || !info)
+  {
+    _cupsSetError(IPP_STATUS_ERROR_INTERNAL, strerror(EINVAL), 0);
+    DEBUG_puts("1cupsFinishDestDocument: Bad arguments.");
+    return (IPP_STATUS_ERROR_INTERNAL);
+  }
+
+ /*
+  * Get the response at the end of the document and return it...
+  */
+
+  ippDelete(cupsGetResponse(http, info->resource));
+
+  DEBUG_printf(("1cupsFinishDestDocument: %s (%s)",
+                ippErrorString(cupsLastError()), cupsLastErrorString()));
+
+  return (cupsLastError());
 }


@@ -119,12 +280,12 @@ cupsFinishDestDocument(
 * document (see CUPS_FORMAT_xxx constants), and "num_options" and "options"
 * are the options do be applied to the document. "last_document" should be 1
 * if this is the last document to be submitted in the job.  Returns
- * HTTP_CONTINUE on success.
+ * @code HTTP_CONTINUE@ on success.
 *
- * @since CUPS 1.6@
+ * @since CUPS 1.6/OS X 10.8@
 */

-http_status_t
+http_status_t				/* O - Status of document creation */
 cupsStartDestDocument(
    http_t        *http,		/* I - Connection to destination */
    cups_dest_t   *dest,		/* I - Destination */
@@ -136,7 +297,67 @@ cupsStartDestDocument(
    cups_option_t *options,		/* I - Document options */
    int           last_document)	/* I - 1 if this is the last document */
 {
-  return (HTTP_CONTINUE);
+  ipp_t		*request;		/* Send-Document request */
+  http_status_t	status;			/* HTTP status */
+
+
+  DEBUG_printf(("cupsStartDestDocument(http=%p, dest=%p(%s/%s), info=%p, "
+                "job_id=%d, docname=\"%s\", format=\"%s\", num_options=%d, "
+                "options=%p, last_document=%d)",
+                http, dest, dest ? dest->name : NULL,
+                dest ? dest->instance : NULL, info, job_id, docname, format,
+                num_options, options, last_document));
+
+ /*
+  * Range check input...
+  */
+
+  if (!http || !dest || !info || job_id <= 0)
+  {
+    _cupsSetError(IPP_STATUS_ERROR_INTERNAL, strerror(EINVAL), 0);
+    DEBUG_puts("1cupsStartDestDocument: Bad arguments.");
+    return (HTTP_STATUS_ERROR);
+  }
+
+ /*
+  * Create a Send-Document request...
+  */
+
+  if ((request = ippNewRequest(IPP_OP_SEND_DOCUMENT)) == NULL)
+  {
+    _cupsSetError(IPP_STATUS_ERROR_INTERNAL, strerror(ENOMEM), 0);
+    DEBUG_puts("1cupsStartDestDocument: Unable to create Send-Document "
+               "request.");
+    return (HTTP_STATUS_ERROR);
+  }
+
+  ippSetVersion(request, info->version / 10, info->version % 10);
+
+  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, "printer-uri",
+               NULL, info->uri);
+  ippAddInteger(request, IPP_TAG_OPERATION, IPP_TAG_INTEGER, "job-id", job_id);
+  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_NAME, "requesting-user-name",
+               NULL, cupsUser());
+  if (docname)
+    ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_NAME, "document-name",
+                 NULL, docname);
+  if (format)
+    ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_MIMETYPE,
+                 "document-format", NULL, format);
+  ippAddBoolean(request, IPP_TAG_OPERATION, "last-document", last_document);
+
+  cupsEncodeOptions2(request, num_options, options, IPP_TAG_OPERATION);
+  cupsEncodeOptions2(request, num_options, options, IPP_TAG_DOCUMENT);
+
+ /*
+  * Send and delete the request, then return the status...
+  */
+
+  status = cupsSendRequest(http, request, info->resource, CUPS_LENGTH_VARIABLE);
+
+  ippDelete(request);
+
+  return (status);
 }


@@ -3,7 +3,7 @@
 *
 *   Destination localization support for CUPS.
 *
- *   Copyright 2012 by Apple Inc.
+ *   Copyright 2012-2013 by Apple Inc.
 *
 *   These coded instructions, statements, and computer programs are the
 *   property of Apple Inc. and are protected by Federal copyright
@@ -15,10 +15,14 @@
 *
 * Contents:
 *
- *   cupsLocalizeDestOption() - Get the localized string for a destination
- *				option.
- *   cupsLocalizeDestValue()  - Get the localized string for a destination
- *				option+value pair.
+ *   cupsLocalizeDestOption()	 - Get the localized string for a destination
+ *				   option.
+ *   cupsLocalizeDestValue()	 - Get the localized string for a destination
+ *				   option+value pair.
+ *   cups_create_localizations() - Create the localizations array for a
+ *				   destination.
+ *   cups_read_strings()	 - Read a pair of strings from a .strings file.
+ *   cups_scan_strings()	 - Scan a quoted string.
 */

 /*
@@ -28,14 +32,24 @@
 #include "cups-private.h"


+/*
+ * Local functions...
+ */
+
+static void	cups_create_localizations(http_t *http, cups_dinfo_t *dinfo);
+static int	cups_read_strings(cups_file_t *fp, char *buffer, size_t bufsize,
+		                  char **id, char **str);
+static char	*cups_scan_strings(char *buffer);
+
+
 /*
 * 'cupsLocalizeDestOption()' - Get the localized string for a destination
 *                              option.
 *
- * The returned string is stored in the localization array and will become
- * invalid if the localization array is deleted.
+ * The returned string is stored in the destination information and will become
+ * invalid if the destination information is deleted.
 *
- * @since CUPS 1.6@
+ * @since CUPS 1.6/OS X 10.8@
 */

 const char *				/* O - Localized string */
@@ -45,7 +59,25 @@ cupsLocalizeDestOption(
    cups_dinfo_t *dinfo,		/* I - Destination information */
    const char   *option)		/* I - Option to localize */
 {
-  return (option);
+  _cups_message_t	key,		/* Search key */
+			*match;		/* Matching entry */
+
+
+  if (!http || !dest || !dinfo)
+    return (option);
+
+  if (!dinfo->localizations)
+    cups_create_localizations(http, dinfo);
+
+  if (cupsArrayCount(dinfo->localizations) == 0)
+    return (option);
+
+  key.id = (char *)option;
+  if ((match = (_cups_message_t *)cupsArrayFind(dinfo->localizations,
+                                                &key)) != NULL)
+    return (match->str);
+  else
+    return (option);
 }


@@ -53,10 +85,10 @@ cupsLocalizeDestOption(
 * 'cupsLocalizeDestValue()' - Get the localized string for a destination
 *                             option+value pair.
 *
- * The returned string is stored in the localization array and will become
- * invalid if the localization array is deleted.
+ * The returned string is stored in the destination information and will become
+ * invalid if the destination information is deleted.
 *
- * @since CUPS 1.6@
+ * @since CUPS 1.6/OS X 10.8@
 */

 const char *				/* O - Localized string */
@@ -67,10 +99,289 @@ cupsLocalizeDestValue(
    const char   *option,		/* I - Option to localize */
    const char   *value)		/* I - Value to localize */
 {
-  return (value);
+  _cups_message_t	key,		/* Search key */
+			*match;		/* Matching entry */
+  char			pair[256];	/* option.value pair */
+
+
+  if (!http || !dest || !dinfo)
+    return (value);
+
+  if (!dinfo->localizations)
+    cups_create_localizations(http, dinfo);
+
+  if (cupsArrayCount(dinfo->localizations) == 0)
+    return (value);
+
+  snprintf(pair, sizeof(pair), "%s.%s", option, value);
+  key.id = pair;
+  if ((match = (_cups_message_t *)cupsArrayFind(dinfo->localizations,
+                                                &key)) != NULL)
+    return (match->str);
+  else
+    return (value);
 }


+/*
+ * 'cups_create_localizations()' - Create the localizations array for a
+ *                                 destination.
+ */
+
+static void
+cups_create_localizations(
+    http_t       *http,			/* I - Connection to destination */
+    cups_dinfo_t *dinfo)		/* I - Destination informations */
+{
+  http_t		*http2;		/* Connection for strings file */
+  http_status_t		status;		/* Request status */
+  ipp_attribute_t	*attr;		/* "printer-strings-uri" attribute */
+  char			scheme[32],	/* URI scheme */
+  			userpass[256],	/* Username/password info */
+  			hostname[256],	/* Hostname */
+  			resource[1024],	/* Resource */
+  			http_hostname[256],
+  					/* Hostname of connection */
+			tempfile[1024];	/* Temporary filename */
+  int			port;		/* Port number */
+  http_encryption_t	encryption;	/* Encryption to use */
+  cups_file_t		*temp;		/* Temporary file */
+
+
+ /*
+  * Create an empty message catalog...
+  */
+
+  dinfo->localizations = _cupsMessageNew(NULL);
+
+ /*
+  * See if there are any localizations...
+  */
+
+  if ((attr = ippFindAttribute(dinfo->attrs, "printer-strings-uri",
+                               IPP_TAG_URI)) == NULL)
+  {
+   /*
+    * Nope...
+    */
+
+    DEBUG_puts("4cups_create_localizations: No printer-strings-uri (uri) "
+               "value.");
+    return;				/* Nope */
+  }
+
+ /*
+  * Pull apart the URI and determine whether we need to try a different
+  * server...
+  */
+
+  if (httpSeparateURI(HTTP_URI_CODING_ALL, attr->values[0].string.text,
+                      scheme, sizeof(scheme), userpass, sizeof(userpass),
+                      hostname, sizeof(hostname), &port, resource,
+                      sizeof(resource)) < HTTP_URI_STATUS_OK)
+  {
+    DEBUG_printf(("4cups_create_localizations: Bad printer-strings-uri value "
+                  "\"%s\".", attr->values[0].string.text));
+    return;
+  }
+
+  httpGetHostname(http, http_hostname, sizeof(http_hostname));
+
+  if (!_cups_strcasecmp(http_hostname, hostname) &&
+      port == httpAddrPort(http->hostaddr))
+  {
+   /*
+    * Use the same connection...
+    */
+
+    http2 = http;
+  }
+  else
+  {
+   /*
+    * Connect to the alternate host...
+    */
+
+    if (!strcmp(scheme, "https"))
+      encryption = HTTP_ENCRYPTION_ALWAYS;
+    else
+      encryption = HTTP_ENCRYPTION_IF_REQUESTED;
+
+    if ((http2 = httpConnect2(hostname, port, NULL, AF_UNSPEC, encryption, 1,
+                              30000, NULL)) == NULL)
+    {
+      DEBUG_printf(("4cups_create_localizations: Unable to connect to "
+                    "%s:%d: %s", hostname, port, cupsLastErrorString()));
+      return;
+    }
+  }
+
+ /*
+  * Get a temporary file...
+  */
+
+  if ((temp = cupsTempFile2(tempfile, sizeof(tempfile))) == NULL)
+  {
+    DEBUG_printf(("4cups_create_localizations: Unable to create temporary "
+                  "file: %s", cupsLastErrorString()));
+    if (http2 != http)
+      httpClose(http2);
+    return;
+  }
+
+  status = cupsGetFd(http2, resource, cupsFileNumber(temp));
+
+  DEBUG_printf(("4cups_create_localizations: GET %s = %s", resource,
+                httpStatus(status)));
+
+  if (status == HTTP_STATUS_OK)
+  {
+   /*
+    * Got the file, read it...
+    */
+
+    char		buffer[8192],	/* Message buffer */
+    			*id,		/* ID string */
+    			*str;		/* Translated message */
+    _cups_message_t	*m;		/* Current message */
+
+    lseek(cupsFileNumber(temp), 0, SEEK_SET);
+
+    while (cups_read_strings(temp, buffer, sizeof(buffer), &id, &str))
+    {
+      if ((m = malloc(sizeof(_cups_message_t))) == NULL)
+        break;
+
+      m->id  = strdup(id);
+      m->str = strdup(str);
+
+      if (m->id && m->str)
+        cupsArrayAdd(dinfo->localizations, m);
+      else
+      {
+        if (m->id)
+          free(m->id);
+
+        if (m->str)
+          free(m->str);
+
+        free(m);
+        break;
+      }
+    }
+  }
+
+  DEBUG_printf(("4cups_create_localizations: %d messages loaded.",
+                cupsArrayCount(dinfo->localizations)));
+
+ /*
+  * Cleanup...
+  */
+
+  unlink(tempfile);
+  cupsFileClose(temp);
+
+  if (http2 != http)
+    httpClose(http2);
+}
+
+
+/*
+ * 'cups_read_strings()' - Read a pair of strings from a .strings file.
+ */
+
+static int				/* O - 1 on success, 0 on failure */
+cups_read_strings(cups_file_t *strings,	/* I - .strings file */
+                  char        *buffer,	/* I - Line buffer */
+                  size_t      bufsize,	/* I - Size of line buffer */
+		  char        **id,	/* O - Pointer to ID string */
+		  char        **str)	/* O - Pointer to translation string */
+{
+  char	*bufptr;			/* Pointer into buffer */
+
+
+  while (cupsFileGets(strings, buffer, bufsize))
+  {
+    if (buffer[0] != '\"')
+      continue;
+
+    *id    = buffer + 1;
+    bufptr = cups_scan_strings(buffer);
+
+    if (*bufptr != '\"')
+      continue;
+
+    *bufptr++ = '\0';
+
+    while (*bufptr && *bufptr != '\"')
+      bufptr ++;
+
+    if (!*bufptr)
+      continue;
+
+    *str   = bufptr + 1;
+    bufptr = cups_scan_strings(bufptr);
+
+    if (*bufptr != '\"')
+      continue;
+
+    *bufptr = '\0';
+
+    return (1);
+  }
+
+  return (0);
+}
+
+
+/*
+ * 'cups_scan_strings()' - Scan a quoted string.
+ */
+
+static char *				/* O - End of string */
+cups_scan_strings(char *buffer)		/* I - Start of string */
+{
+  char	*bufptr;			/* Pointer into string */
+
+
+  for (bufptr = buffer + 1; *bufptr && *bufptr != '\"'; bufptr ++)
+  {
+    if (*bufptr == '\\')
+    {
+      if (bufptr[1] >= '0' && bufptr[1] <= '3' &&
+	  bufptr[2] >= '0' && bufptr[2] <= '7' &&
+	  bufptr[3] >= '0' && bufptr[3] <= '7')
+      {
+       /*
+	* Decode \nnn octal escape...
+	*/
+
+	*bufptr = ((((bufptr[1] - '0') << 3) | (bufptr[2] - '0')) << 3) |
+		  (bufptr[3] - '0');
+	_cups_strcpy(bufptr + 1, bufptr + 4);
+      }
+      else
+      {
+       /*
+	* Decode \C escape...
+	*/
+
+	_cups_strcpy(bufptr, bufptr + 1);
+	if (*bufptr == 'n')
+	  *bufptr = '\n';
+	else if (*bufptr == 'r')
+	  *bufptr = '\r';
+	else if (*bufptr == 't')
+	  *bufptr = '\t';
+      }
+    }
+  }
+
+  return (bufptr);
+}
+
+
+
 /*
 * End of "$Id$".
 */
@@ -5,7 +5,7 @@
 *
 *   This set of APIs abstracts enumeration of directory entries.
 *
- *   Copyright 2007-2010 by Apple Inc.
+ *   Copyright 2007-2012 by Apple Inc.
 *   Copyright 1997-2005 by Easy Software Products, all rights reserved.
 *
 *   These coded instructions, statements, and computer programs are the
@@ -79,7 +79,7 @@ _cups_dir_time(FILETIME ft)		/* I - File time */
 /*
 * 'cupsDirClose()' - Close a directory.
 *
- * @since CUPS 1.2/Mac OS X 10.5@
+ * @since CUPS 1.2/OS X 10.5@
 */

 void
@@ -110,7 +110,7 @@ cupsDirClose(cups_dir_t *dp)		/* I - Directory pointer */
 /*
 * 'cupsDirOpen()' - Open a directory.
 *
- * @since CUPS 1.2/Mac OS X 10.5@
+ * @since CUPS 1.2/OS X 10.5@
 */

 cups_dir_t *				/* O - Directory pointer or @code NULL@ if the directory could not be opened. */
@@ -153,7 +153,7 @@ cupsDirOpen(const char *directory)	/* I - Directory name */
 /*
 * 'cupsDirRead()' - Read the next directory entry.
 *
- * @since CUPS 1.2/Mac OS X 10.5@
+ * @since CUPS 1.2/OS X 10.5@
 */

 cups_dentry_t *				/* O - Directory entry or @code NULL@ if there are no more */
@@ -213,7 +213,7 @@ cupsDirRead(cups_dir_t *dp)		/* I - Directory pointer */
 /*
 * 'cupsDirRewind()' - Rewind to the start of the directory.
 *
- * @since CUPS 1.2/Mac OS X 10.5@
+ * @since CUPS 1.2/OS X 10.5@
 */

 void
@@ -263,7 +263,7 @@ struct _cups_dir_s			/**** Directory data structure ****/
 /*
 * 'cupsDirClose()' - Close a directory.
 *
- * @since CUPS 1.2/Mac OS X 10.5@
+ * @since CUPS 1.2/OS X 10.5@
 */

 void
@@ -290,7 +290,7 @@ cupsDirClose(cups_dir_t *dp)		/* I - Directory pointer */
 /*
 * 'cupsDirOpen()' - Open a directory.
 *
- * @since CUPS 1.2/Mac OS X 10.5@
+ * @since CUPS 1.2/OS X 10.5@
 */

 cups_dir_t *				/* O - Directory pointer or @code NULL@ if the directory could not be opened. */
@@ -344,7 +344,7 @@ cupsDirOpen(const char *directory)	/* I - Directory name */
 /*
 * 'cupsDirRead()' - Read the next directory entry.
 *
- * @since CUPS 1.2/Mac OS X 10.5@
+ * @since CUPS 1.2/OS X 10.5@
 */

 cups_dentry_t *				/* O - Directory entry or @code NULL@ when there are no more */
@@ -442,7 +442,7 @@ cupsDirRead(cups_dir_t *dp)		/* I - Directory pointer */
 /*
 * 'cupsDirRewind()' - Rewind to the start of the directory.
 *
- * @since CUPS 1.2/Mac OS X 10.5@
+ * @since CUPS 1.2/OS X 10.5@
 */

 void
@@ -3,7 +3,7 @@
 *
 *   PPD code emission routines for CUPS.
 *
- *   Copyright 2007-2011 by Apple Inc.
+ *   Copyright 2007-2012 by Apple Inc.
 *   Copyright 1997-2007 by Easy Software Products, all rights reserved.
 *
 *   These coded instructions, statements, and computer programs are the
@@ -87,7 +87,7 @@ ppdCollect(ppd_file_t    *ppd,		/* I - PPD file data */
 * The choices array should be freed using @code free@ when you are
 * finished with it.
 *
- * @since CUPS 1.2/Mac OS X 10.5@
+ * @since CUPS 1.2/OS X 10.5@
 */

 int					/* O - Number of options marked */
@@ -260,7 +260,7 @@ ppdEmit(ppd_file_t    *ppd,		/* I - PPD file record */
 *
 * When "limit" is zero, this function is identical to ppdEmit().
 *
- * @since CUPS 1.2/Mac OS X 10.5@
+ * @since CUPS 1.2/OS X 10.5@
 */

 int					/* O - 0 on success, -1 on failure */
@@ -519,15 +519,27 @@ ppdEmitJCL(ppd_file_t *ppd,		/* I - PPD file record */
    */

    if (display && strcmp(display->value, "job"))
-    {
      fprintf(fp, "@PJL JOB NAME = \"%s\"\n", temp);
-
-      if (display && !strcmp(display->value, "rdymsg"))
-        fprintf(fp, "@PJL RDYMSG DISPLAY = \"%s\"\n", displaymsg);
-    }
+    else if (display && !strcmp(display->value, "rdymsg"))
+      fprintf(fp, "@PJL RDYMSG DISPLAY = \"%s\"\n", displaymsg);
    else
      fprintf(fp, "@PJL JOB NAME = \"%s\" DISPLAY = \"%s\"\n", temp,
 	      displaymsg);
+
+   /*
+    * Replace double quotes with single quotes and UTF-8 characters with
+    * question marks so that the user does not cause a PJL syntax error.
+    */
+
+    strlcpy(temp, user, sizeof(temp));
+
+    for (ptr = temp; *ptr; ptr ++)
+      if (*ptr == '\"')
+        *ptr = '\'';
+      else if (!charset && (*ptr & 128))
+        *ptr = '?';
+
+    fprintf(fp, "@PJL SET USERNAME = \"%s\"\n", temp);
  }
  else
    fputs(ppd->jcl_begin, fp);
@@ -542,7 +554,7 @@ ppdEmitJCL(ppd_file_t *ppd,		/* I - PPD file record */
 /*
 * 'ppdEmitJCLEnd()' - Emit JCLEnd code to a file.
 *
- * @since CUPS 1.2/Mac OS X 10.5@
+ * @since CUPS 1.2/OS X 10.5@
 */

 int					/* O - 0 on success, -1 on failure */
@@ -601,7 +613,7 @@ ppdEmitJCLEnd(ppd_file_t *ppd,		/* I - PPD file record */
 * The return string is allocated on the heap and should be freed using
 * @code free@ when you are done with it.
 *
- * @since CUPS 1.2/Mac OS X 10.5@
+ * @since CUPS 1.2/OS X 10.5@
 */

 char *					/* O - String containing option code or @code NULL@ if there is no option code */
@@ -3,7 +3,7 @@
 *
 *   Option encoding routines for CUPS.
 *
- *   Copyright 2007-2011 by Apple Inc.
+ *   Copyright 2007-2013 by Apple Inc.
 *   Copyright 1997-2007 by Easy Software Products.
 *
 *   These coded instructions, statements, and computer programs are the
@@ -31,14 +31,104 @@


 /*
- * Local list of option names and the value tags they should use...
+ * Local list of option names, the value tags they should use, and the list of
+ * supported operations...
 *
- * **** THIS LIST MUST BE SORTED ****
+ * **** THIS LIST MUST BE SORTED BY ATTRIBUTE NAME ****
 */

+static const ipp_op_t ipp_job_creation[] =
+{
+  IPP_OP_PRINT_JOB,
+  IPP_OP_PRINT_URI,
+  IPP_OP_CREATE_JOB,
+  IPP_OP_CUPS_NONE
+};
+
+static const ipp_op_t ipp_doc_creation[] =
+{
+  IPP_OP_PRINT_JOB,
+  IPP_OP_PRINT_URI,
+  IPP_OP_SEND_DOCUMENT,
+  IPP_OP_SEND_URI,
+  IPP_OP_CUPS_NONE
+};
+
+static const ipp_op_t ipp_sub_creation[] =
+{
+  IPP_OP_PRINT_JOB,
+  IPP_OP_PRINT_URI,
+  IPP_OP_CREATE_JOB,
+  IPP_OP_CREATE_PRINTER_SUBSCRIPTION,
+  IPP_OP_CREATE_JOB_SUBSCRIPTION,
+  IPP_OP_CUPS_NONE
+};
+
+static const ipp_op_t ipp_all_print[] =
+{
+  IPP_OP_PRINT_JOB,
+  IPP_OP_PRINT_URI,
+  IPP_OP_CREATE_JOB,
+  IPP_OP_SEND_DOCUMENT,
+  IPP_OP_SEND_URI,
+  IPP_OP_CUPS_NONE
+};
+
+static const ipp_op_t ipp_all_limit[] =
+{
+  IPP_OP_GET_JOBS,
+  IPP_OP_GET_PRINTER_ATTRIBUTES,
+  IPP_OP_CUPS_GET_PRINTERS,
+  IPP_OP_CUPS_GET_CLASSES,
+  IPP_OP_CUPS_GET_DEVICES,
+  IPP_OP_CUPS_GET_PPDS,
+  IPP_OP_CUPS_NONE
+};
+
+static const ipp_op_t ipp_set_printer[] =
+{
+  IPP_OP_SET_PRINTER_ATTRIBUTES,
+  IPP_OP_CUPS_ADD_MODIFY_PRINTER,
+  IPP_OP_CUPS_ADD_MODIFY_CLASS,
+  IPP_OP_CUPS_NONE
+};
+
+static const ipp_op_t cups_am_class[] =
+{
+  IPP_OP_CUPS_ADD_MODIFY_CLASS,
+  IPP_OP_CUPS_NONE
+};
+
+static const ipp_op_t cups_am_printer[] =
+{
+  IPP_OP_CUPS_ADD_MODIFY_PRINTER,
+  IPP_OP_CUPS_NONE
+};
+
+static const ipp_op_t cups_schemes[] =
+{
+  IPP_OP_CUPS_GET_DEVICES,
+  IPP_OP_CUPS_GET_PPDS,
+  IPP_OP_CUPS_NONE
+};
+
+static const ipp_op_t cups_get_ppds[] =
+{
+  IPP_OP_CUPS_GET_PPDS,
+  IPP_OP_CUPS_NONE
+};
+
+static const ipp_op_t cups_ppd_name[] =
+{
+  IPP_OP_CUPS_ADD_MODIFY_PRINTER,
+  IPP_OP_CUPS_GET_PPD,
+  IPP_OP_CUPS_NONE
+};
+
 static const _ipp_option_t ipp_options[] =
 {
  { 1, "auth-info",		IPP_TAG_TEXT,		IPP_TAG_JOB },
+  { 1, "auth-info-default",	IPP_TAG_TEXT,		IPP_TAG_PRINTER },
  { 1, "auth-info-required",	IPP_TAG_KEYWORD,	IPP_TAG_PRINTER },
  { 0, "blackplot",		IPP_TAG_BOOLEAN,	IPP_TAG_JOB },
  { 0, "blackplot-default",	IPP_TAG_BOOLEAN,	IPP_TAG_PRINTER },
@@ -46,18 +136,26 @@ static const _ipp_option_t ipp_options[] =
  { 0, "brightness-default",	IPP_TAG_INTEGER,	IPP_TAG_PRINTER },
  { 0, "columns",		IPP_TAG_INTEGER,	IPP_TAG_JOB },
  { 0, "columns-default",	IPP_TAG_INTEGER,	IPP_TAG_PRINTER },
-  { 0, "compression",		IPP_TAG_KEYWORD,	IPP_TAG_OPERATION },
+  { 0, "compression",		IPP_TAG_KEYWORD,	IPP_TAG_OPERATION,
+							IPP_TAG_ZERO,
+							ipp_doc_creation },
  { 0, "copies",		IPP_TAG_INTEGER,	IPP_TAG_JOB,
 							IPP_TAG_DOCUMENT },
  { 0, "copies-default",	IPP_TAG_INTEGER,	IPP_TAG_PRINTER },
  { 0, "device-uri",		IPP_TAG_URI,		IPP_TAG_PRINTER },
  { 1, "document-copies",	IPP_TAG_RANGE,		IPP_TAG_JOB,
-							IPP_TAG_DOCUMENT },
-  { 0, "document-format",	IPP_TAG_MIMETYPE,	IPP_TAG_OPERATION },
+							IPP_TAG_DOCUMENT,
+							ipp_doc_creation },
+  { 0, "document-format",	IPP_TAG_MIMETYPE,	IPP_TAG_OPERATION,
+							IPP_TAG_ZERO,
+							ipp_doc_creation },
  { 0, "document-format-default", IPP_TAG_MIMETYPE,	IPP_TAG_PRINTER },
  { 1, "document-numbers",	IPP_TAG_RANGE,		IPP_TAG_JOB,
-							IPP_TAG_DOCUMENT },
-  { 1, "exclude-schemes",	IPP_TAG_NAME,		IPP_TAG_OPERATION },
+							IPP_TAG_DOCUMENT,
+							ipp_all_print },
+  { 1, "exclude-schemes",	IPP_TAG_NAME,		IPP_TAG_OPERATION,
+							IPP_TAG_ZERO,
+							cups_schemes },
  { 1, "finishings",		IPP_TAG_ENUM,		IPP_TAG_JOB,
 							IPP_TAG_DOCUMENT },
  { 1, "finishings-default",	IPP_TAG_ENUM,		IPP_TAG_PRINTER },
@@ -70,14 +168,37 @@ static const _ipp_option_t ipp_options[] =
  { 0, "gamma-default",		IPP_TAG_INTEGER,	IPP_TAG_PRINTER },
  { 0, "hue",			IPP_TAG_INTEGER,	IPP_TAG_JOB },
  { 0, "hue-default",		IPP_TAG_INTEGER,	IPP_TAG_PRINTER },
-  { 1, "include-schemes",	IPP_TAG_NAME,		IPP_TAG_OPERATION },
-  { 0, "job-impressions",	IPP_TAG_INTEGER,	IPP_TAG_JOB },
+  { 1, "include-schemes",	IPP_TAG_NAME,		IPP_TAG_OPERATION,
+							IPP_TAG_ZERO,
+							cups_schemes },
+  { 0, "job-account-id",        IPP_TAG_NAME,           IPP_TAG_JOB },
+  { 0, "job-account-id-default",IPP_TAG_NAME,           IPP_TAG_PRINTER },
+  { 0, "job-accounting-user-id", IPP_TAG_NAME,          IPP_TAG_JOB },
+  { 0, "job-accounting-user-id-default", IPP_TAG_NAME,  IPP_TAG_PRINTER },
+  { 0, "job-authorization-uri",	IPP_TAG_URI,		IPP_TAG_OPERATION },
+  { 0, "job-hold-until",	IPP_TAG_KEYWORD,	IPP_TAG_JOB },
+  { 0, "job-id",		IPP_TAG_INTEGER,	IPP_TAG_ZERO }, /* never send as option */
+  { 0, "job-impressions",	IPP_TAG_INTEGER,	IPP_TAG_ZERO }, /* never send as option */
+  { 0, "job-impressions-completed", IPP_TAG_INTEGER,	IPP_TAG_ZERO }, /* never send as option */
  { 0, "job-k-limit",		IPP_TAG_INTEGER,	IPP_TAG_PRINTER },
+  { 0, "job-k-octets",		IPP_TAG_INTEGER,	IPP_TAG_ZERO }, /* never send as option */
+  { 0, "job-k-octets-completed",IPP_TAG_INTEGER,	IPP_TAG_ZERO }, /* never send as option */
+  { 0, "job-media-sheets",	IPP_TAG_INTEGER,	IPP_TAG_ZERO }, /* never send as option */
+  { 0, "job-media-sheets-completed", IPP_TAG_INTEGER,	IPP_TAG_ZERO }, /* never send as option */
  { 0, "job-page-limit",	IPP_TAG_INTEGER,	IPP_TAG_PRINTER },
+  { 0, "job-password",          IPP_TAG_STRING,         IPP_TAG_OPERATION,
+							IPP_TAG_ZERO,
+							ipp_job_creation },
+  { 0, "job-password-encryption", IPP_TAG_KEYWORD,      IPP_TAG_OPERATION,
+							IPP_TAG_ZERO,
+							ipp_job_creation },
  { 0, "job-priority",		IPP_TAG_INTEGER,	IPP_TAG_JOB },
  { 0, "job-quota-period",	IPP_TAG_INTEGER,	IPP_TAG_PRINTER },
  { 1, "job-sheets",		IPP_TAG_NAME,		IPP_TAG_JOB },
  { 1, "job-sheets-default",	IPP_TAG_NAME,		IPP_TAG_PRINTER },
+  { 0, "job-state",		IPP_TAG_ENUM,		IPP_TAG_ZERO }, /* never send as option */
+  { 0, "job-state-message",	IPP_TAG_TEXT,		IPP_TAG_ZERO }, /* never send as option */
+  { 0, "job-state-reasons",	IPP_TAG_KEYWORD,	IPP_TAG_ZERO }, /* never send as option */
  { 0, "job-uuid",		IPP_TAG_URI,		IPP_TAG_JOB },
  { 0, "landscape",		IPP_TAG_BOOLEAN,	IPP_TAG_JOB },
  { 1, "marker-change-time",	IPP_TAG_INTEGER,	IPP_TAG_PRINTER },
@@ -140,7 +261,33 @@ static const _ipp_option_t ipp_options[] =
  { 0, "penwidth",		IPP_TAG_INTEGER,	IPP_TAG_JOB },
  { 0, "penwidth-default",	IPP_TAG_INTEGER,	IPP_TAG_PRINTER },
  { 0, "port-monitor",		IPP_TAG_NAME,		IPP_TAG_PRINTER },
-  { 0, "ppd-name",		IPP_TAG_NAME,		IPP_TAG_PRINTER },
+  { 0, "ppd-device-id",		IPP_TAG_TEXT,		IPP_TAG_OPERATION,
+							IPP_TAG_ZERO,
+							cups_get_ppds },
+  { 0, "ppd-make",		IPP_TAG_TEXT,		IPP_TAG_OPERATION,
+							IPP_TAG_ZERO,
+							cups_get_ppds },
+  { 0, "ppd-make-and-model",	IPP_TAG_TEXT,		IPP_TAG_OPERATION,
+							IPP_TAG_ZERO,
+							cups_get_ppds },
+  { 0, "ppd-model-number",	IPP_TAG_INTEGER,	IPP_TAG_OPERATION,
+							IPP_TAG_ZERO,
+							cups_get_ppds },
+  { 0, "ppd-name",		IPP_TAG_NAME,		IPP_TAG_OPERATION,
+							IPP_TAG_ZERO,
+							cups_ppd_name },
+  { 0, "ppd-natural-language",	IPP_TAG_LANGUAGE,	IPP_TAG_OPERATION,
+							IPP_TAG_ZERO,
+							cups_get_ppds },
+  { 0, "ppd-product",		IPP_TAG_TEXT,		IPP_TAG_OPERATION,
+							IPP_TAG_ZERO,
+							cups_get_ppds },
+  { 0, "ppd-psversion",		IPP_TAG_TEXT,		IPP_TAG_OPERATION,
+							IPP_TAG_ZERO,
+							cups_get_ppds },
+  { 0, "ppd-type",		IPP_TAG_KEYWORD,	IPP_TAG_OPERATION,
+							IPP_TAG_ZERO,
+							cups_get_ppds },
  { 0, "ppi",			IPP_TAG_INTEGER,	IPP_TAG_JOB },
  { 0, "ppi-default",		IPP_TAG_INTEGER,	IPP_TAG_PRINTER },
  { 0, "prettyprint",		IPP_TAG_BOOLEAN,	IPP_TAG_JOB },
@@ -179,6 +326,9 @@ static const _ipp_option_t ipp_options[] =
  { 0, "sides",			IPP_TAG_KEYWORD,	IPP_TAG_JOB,
 							IPP_TAG_DOCUMENT },
  { 0, "sides-default",		IPP_TAG_KEYWORD,	IPP_TAG_PRINTER },
+  { 0, "time-at-completed",	IPP_TAG_INTEGER,	IPP_TAG_ZERO }, /* never send as option */
+  { 0, "time-at-creation",	IPP_TAG_INTEGER,	IPP_TAG_ZERO }, /* never send as option */
+  { 0, "time-at-processing",	IPP_TAG_INTEGER,	IPP_TAG_ZERO }, /* never send as option */
  { 0, "wrap",			IPP_TAG_BOOLEAN,	IPP_TAG_JOB },
  { 0, "wrap-default",		IPP_TAG_BOOLEAN,	IPP_TAG_PRINTER },
  { 0, "x-dimension",		IPP_TAG_INTEGER,	IPP_TAG_JOB,
@@ -227,7 +377,7 @@ cupsEncodeOptions(ipp_t         *ipp,		/* I - Request to add to */
 * function multiple times for each group, or use cupsEncodeOptions()
 * to add the standard groups.
 *
- * @since CUPS 1.2/Mac OS X 10.5@
+ * @since CUPS 1.2/OS X 10.5@
 */

 void
@@ -237,23 +387,27 @@ cupsEncodeOptions2(
    cups_option_t *options,		/* I - Options */
    ipp_tag_t     group_tag)		/* I - Group to encode */
 {
-  int		i, j;			/* Looping vars */
-  int		count;			/* Number of values */
-  char		*s,			/* Pointer into option value */
-		*val,			/* Pointer to option value */
-		*copy,			/* Copy of option value */
-		*sep,			/* Option separator */
-		quote;			/* Quote character */
-  ipp_attribute_t *attr;		/* IPP attribute */
-  ipp_tag_t	value_tag;		/* IPP value tag */
-  cups_option_t	*option;		/* Current option */
-  ipp_t		*collection;		/* Collection value */
-  int		num_cols;		/* Number of collection values */
-  cups_option_t	*cols;			/* Collection values */
+  int			i, j;		/* Looping vars */
+  int			count;		/* Number of values */
+  char			*s,		/* Pointer into option value */
+			*val,		/* Pointer to option value */
+			*copy,		/* Copy of option value */
+			*sep,		/* Option separator */
+			quote;		/* Quote character */
+  ipp_attribute_t	*attr;		/* IPP attribute */
+  ipp_tag_t		value_tag;	/* IPP value tag */
+  cups_option_t		*option;	/* Current option */
+  ipp_t			*collection;	/* Collection value */
+  int			num_cols;	/* Number of collection values */
+  cups_option_t		*cols;		/* Collection values */
+  ipp_op_t		op;		/* Operation for this request */
+  const ipp_op_t	*ops;		/* List of allowed operations */


-  DEBUG_printf(("cupsEncodeOptions2(ipp=%p, num_options=%d, options=%p, "
-                "group_tag=%x)", ipp, num_options, options, group_tag));
+  DEBUG_printf(("cupsEncodeOptions2(ipp=%p(%s), num_options=%d, options=%p, "
+                "group_tag=%x)", ipp,
+                ipp ? ippOpString(ippGetOperation(ipp)) : "", num_options,
+                options, group_tag));

 /*
  * Range check input...
@@ -266,13 +420,18 @@ cupsEncodeOptions2(
  * Do special handling for the document-format/raw options...
  */

-  if (group_tag == IPP_TAG_OPERATION)
+  op = ippGetOperation(ipp);
+
+  if (group_tag == IPP_TAG_OPERATION &&
+      (op == IPP_OP_PRINT_JOB || op == IPP_OP_PRINT_URI ||
+       op == IPP_OP_SEND_DOCUMENT || op == IPP_OP_SEND_URI))
  {
   /*
    * Handle the document format stuff first...
    */

-    if ((val = (char *)cupsGetOption("document-format", num_options, options)) != NULL)
+    if ((val = (char *)cupsGetOption("document-format", num_options,
+                                     options)) != NULL)
      ippAddString(ipp, IPP_TAG_OPERATION, IPP_TAG_MIMETYPE, "document-format",
        	   NULL, val);
    else if (cupsGetOption("raw", num_options, options))
@@ -311,6 +470,22 @@ cupsEncodeOptions2(
        continue;

      value_tag = match->value_tag;
+
+      if (match->operations)
+        ops = match->operations;
+      else if (group_tag == IPP_TAG_JOB)
+        ops = ipp_job_creation;
+      else if (group_tag == IPP_TAG_DOCUMENT)
+        ops = ipp_doc_creation;
+      else if (group_tag == IPP_TAG_SUBSCRIPTION)
+        ops = ipp_sub_creation;
+      else if (group_tag == IPP_TAG_PRINTER)
+        ops = ipp_set_printer;
+      else
+      {
+	DEBUG_printf(("2cupsEncodeOptions2: Skipping \"%s\".", option->name));
+        continue;
+      }
    }
    else
    {
@@ -324,10 +499,23 @@ cupsEncodeOptions2(
           strcmp(option->name + namelen - 10, "-supported")))
      {
 	if (group_tag != IPP_TAG_JOB && group_tag != IPP_TAG_DOCUMENT)
+	{
+	  DEBUG_printf(("2cupsEncodeOptions2: Skipping \"%s\".", option->name));
          continue;
+        }
      }
      else if (group_tag != IPP_TAG_PRINTER)
+      {
+	DEBUG_printf(("2cupsEncodeOptions2: Skipping \"%s\".", option->name));
        continue;
+      }
+
+      if (group_tag == IPP_TAG_JOB)
+        ops = ipp_job_creation;
+      else if (group_tag == IPP_TAG_DOCUMENT)
+        ops = ipp_doc_creation;
+      else
+        ops = ipp_set_printer;

      if (!_cups_strcasecmp(option->value, "true") ||
          !_cups_strcasecmp(option->value, "false"))
@@ -336,6 +524,22 @@ cupsEncodeOptions2(
 	value_tag = IPP_TAG_NAME;
    }

+   /*
+    * Verify that we send this attribute for this operation...
+    */
+
+    while (*ops != IPP_OP_CUPS_NONE)
+      if (op == *ops)
+        break;
+      else
+        ops ++;
+
+    if (*ops == IPP_OP_CUPS_NONE)
+    {
+      DEBUG_printf(("2cupsEncodeOptions2: Skipping \"%s\".", option->name));
+      continue;
+    }
+
   /*
    * Count the number of values...
    */
@@ -539,7 +743,8 @@ cupsEncodeOptions2(
 	    else
 	      attr->values[j].resolution.yres = attr->values[j].resolution.xres;

-	    if (!_cups_strcasecmp(s, "dpc"))
+	    if (!_cups_strcasecmp(s, "dpc") ||
+	        !_cups_strcasecmp(s, "dpcm"))
              attr->values[j].resolution.units = IPP_RES_PER_CM;
            else
              attr->values[j].resolution.units = IPP_RES_PER_INCH;
@@ -610,6 +815,26 @@ cupsEncodeOptions2(
 }


+#ifdef DEBUG
+/*
+ * '_ippCheckOptions()' - Validate that the option array is sorted properly.
+ */
+
+const char *				/* O - First out-of-order option or NULL */
+_ippCheckOptions(void)
+{
+  int	i;				/* Looping var */
+
+
+  for (i = 0; i < (int)(sizeof(ipp_options) / sizeof(ipp_options[0]) - 1); i ++)
+    if (strcmp(ipp_options[i].name, ipp_options[i + 1].name) >= 0)
+      return (ipp_options[i + 1].name);
+
+  return (NULL);
+}
+#endif /* DEBUG */
+
+
 /*
 * '_ippFindOption()' - Find the attribute information for an option.
 */
@@ -8,7 +8,7 @@
 *   our own file functions allows us to provide transparent support of
 *   gzip'd print files, PPD files, etc.
 *
- *   Copyright 2007-2011 by Apple Inc.
+ *   Copyright 2007-2012 by Apple Inc.
 *   Copyright 1997-2007 by Easy Software Products, all rights reserved.
 *
 *   These coded instructions, statements, and computer programs are the
@@ -352,7 +352,7 @@ _cupsFileCheckFilter(
 /*
 * 'cupsFileClose()' - Close a CUPS file.
 *
- * @since CUPS 1.2/Mac OS X 10.5@
+ * @since CUPS 1.2/OS X 10.5@
 */

 int					/* O - 0 on success, -1 on error */
@@ -484,7 +484,7 @@ cupsFileClose(cups_file_t *fp)		/* I - CUPS file */
 /*
 * 'cupsFileCompression()' - Return whether a file is compressed.
 *
- * @since CUPS 1.2/Mac OS X 10.5@
+ * @since CUPS 1.2/OS X 10.5@
 */

 int					/* O - @code CUPS_FILE_NONE@ or @code CUPS_FILE_GZIP@ */
@@ -497,7 +497,7 @@ cupsFileCompression(cups_file_t *fp)	/* I - CUPS file */
 /*
 * 'cupsFileEOF()' - Return the end-of-file status.
 *
- * @since CUPS 1.2/Mac OS X 10.5@
+ * @since CUPS 1.2/OS X 10.5@
 */

 int					/* O - 1 on end of file, 0 otherwise */
@@ -516,7 +516,7 @@ cupsFileEOF(cups_file_t *fp)		/* I - CUPS file */
 * the supplied paths, @code NULL@ is returned. A @code NULL@ path only
 * matches the current directory.
 *
- * @since CUPS 1.2/Mac OS X 10.5@
+ * @since CUPS 1.2/OS X 10.5@
 */

 const char *				/* O - Full path to file or @code NULL@ if not found */
@@ -619,7 +619,7 @@ cupsFileFind(const char *filename,	/* I - File to find */
 /*
 * 'cupsFileFlush()' - Flush pending output.
 *
- * @since CUPS 1.2/Mac OS X 10.5@
+ * @since CUPS 1.2/OS X 10.5@
 */

 int					/* O - 0 on success, -1 on error */
@@ -667,7 +667,7 @@ cupsFileFlush(cups_file_t *fp)		/* I - CUPS file */
 /*
 * 'cupsFileGetChar()' - Get a single character from a file.
 *
- * @since CUPS 1.2/Mac OS X 10.5@
+ * @since CUPS 1.2/OS X 10.5@
 */

 int					/* O - Character or -1 on end of file */
@@ -711,7 +711,7 @@ cupsFileGetChar(cups_file_t *fp)	/* I - CUPS file */
 /*
 * 'cupsFileGetConf()' - Get a line from a configuration file.
 *
- * @since CUPS 1.2/Mac OS X 10.5@
+ * @since CUPS 1.2/OS X 10.5@
 */

 char *					/* O  - Line read or @code NULL@ on end of file or error */
@@ -855,7 +855,7 @@ cupsFileGetConf(cups_file_t *fp,	/* I  - CUPS file */
 * nul-terminated, however you should use the returned length to determine
 * the number of bytes on the line.
 *
- * @since CUPS 1.2/Mac OS X 10.5@
+ * @since CUPS 1.2/OS X 10.5@
 */

 size_t					/* O - Number of bytes on line or 0 on end of file */
@@ -930,7 +930,7 @@ cupsFileGetLine(cups_file_t *fp,	/* I - File to read from */
 /*
 * 'cupsFileGets()' - Get a CR and/or LF-terminated line.
 *
- * @since CUPS 1.2/Mac OS X 10.5@
+ * @since CUPS 1.2/OS X 10.5@
 */

 char *					/* O - Line read or @code NULL@ on end of file or error */
@@ -1012,7 +1012,7 @@ cupsFileGets(cups_file_t *fp,		/* I - CUPS file */
 /*
 * 'cupsFileLock()' - Temporarily lock access to a file.
 *
- * @since CUPS 1.2/Mac OS X 10.5@
+ * @since CUPS 1.2/OS X 10.5@
 */

 int					/* O - 0 on success, -1 on error */
@@ -1041,7 +1041,7 @@ cupsFileLock(cups_file_t *fp,		/* I - CUPS file */
 /*
 * 'cupsFileNumber()' - Return the file descriptor associated with a CUPS file.
 *
- * @since CUPS 1.2/Mac OS X 10.5@
+ * @since CUPS 1.2/OS X 10.5@
 */

 int					/* O - File descriptor */
@@ -1070,7 +1070,7 @@ cupsFileNumber(cups_file_t *fp)		/* I - CUPS file */
 * connection as needed, generally preferring IPv6 connections when there is
 * a choice.
 *
- * @since CUPS 1.2/Mac OS X 10.5@
+ * @since CUPS 1.2/OS X 10.5@
 */

 cups_file_t *				/* O - CUPS file or @code NULL@ if the file or socket cannot be opened */
@@ -1192,7 +1192,7 @@ cupsFileOpen(const char *filename,	/* I - Name of file */
 * supplied which enables Flate compression of the file.  Compression is
 * not supported for the "a" (append) mode.
 *
- * @since CUPS 1.2/Mac OS X 10.5@
+ * @since CUPS 1.2/OS X 10.5@
 */

 cups_file_t *				/* O - CUPS file or @code NULL@ if the file could not be opened */
@@ -1304,7 +1304,7 @@ cupsFileOpenFd(int        fd,		/* I - File descriptor */
 /*
 * 'cupsFilePeekChar()' - Peek at the next character from a file.
 *
- * @since CUPS 1.2/Mac OS X 10.5@
+ * @since CUPS 1.2/OS X 10.5@
 */

 int					/* O - Character or -1 on end of file */
@@ -1336,7 +1336,7 @@ cupsFilePeekChar(cups_file_t *fp)	/* I - CUPS file */
 /*
 * 'cupsFilePrintf()' - Write a formatted string.
 *
- * @since CUPS 1.2/Mac OS X 10.5@
+ * @since CUPS 1.2/OS X 10.5@
 */

 int					/* O - Number of bytes written or -1 on error */
@@ -1433,7 +1433,7 @@ cupsFilePrintf(cups_file_t *fp,		/* I - CUPS file */
 /*
 * 'cupsFilePutChar()' - Write a character.
 *
- * @since CUPS 1.2/Mac OS X 10.5@
+ * @since CUPS 1.2/OS X 10.5@
 */

 int					/* O - 0 on success, -1 on error */
@@ -1487,7 +1487,7 @@ cupsFilePutChar(cups_file_t *fp,	/* I - CUPS file */
 *
 * This function handles any comment escaping of the value.
 *
- * @since CUPS 1.4/Mac OS X 10.6@
+ * @since CUPS 1.4/OS X 10.6@
 */

 ssize_t					/* O - Number of bytes written or -1 on error */
@@ -1548,7 +1548,7 @@ cupsFilePutConf(cups_file_t *fp,	/* I - CUPS file */
 *
 * Like the @code fputs@ function, no newline is appended to the string.
 *
- * @since CUPS 1.2/Mac OS X 10.5@
+ * @since CUPS 1.2/OS X 10.5@
 */

 int					/* O - Number of bytes written or -1 on error */
@@ -1612,7 +1612,7 @@ cupsFilePuts(cups_file_t *fp,		/* I - CUPS file */
 /*
 * 'cupsFileRead()' - Read from a file.
 *
- * @since CUPS 1.2/Mac OS X 10.5@
+ * @since CUPS 1.2/OS X 10.5@
 */

 ssize_t					/* O - Number of bytes read or -1 on error */
@@ -1689,7 +1689,7 @@ cupsFileRead(cups_file_t *fp,		/* I - CUPS file */
 * 'cupsFileRewind()' - Set the current file position to the beginning of the
 *                      file.
 *
- * @since CUPS 1.2/Mac OS X 10.5@
+ * @since CUPS 1.2/OS X 10.5@
 */

 off_t					/* O - New file position or -1 on error */
@@ -1761,7 +1761,7 @@ cupsFileRewind(cups_file_t *fp)		/* I - CUPS file */
 /*
 * 'cupsFileSeek()' - Seek in a file.
 *
- * @since CUPS 1.2/Mac OS X 10.5@
+ * @since CUPS 1.2/OS X 10.5@
 */

 off_t					/* O - New file position or -1 on error */
@@ -1914,7 +1914,7 @@ cupsFileSeek(cups_file_t *fp,		/* I - CUPS file */
 /*
 * 'cupsFileStderr()' - Return a CUPS file associated with stderr.
 *
- * @since CUPS 1.2/Mac OS X 10.5@
+ * @since CUPS 1.2/OS X 10.5@
 */

 cups_file_t *				/* O - CUPS file */
@@ -1950,7 +1950,7 @@ cupsFileStderr(void)
 /*
 * 'cupsFileStdin()' - Return a CUPS file associated with stdin.
 *
- * @since CUPS 1.2/Mac OS X 10.5@
+ * @since CUPS 1.2/OS X 10.5@
 */

 cups_file_t *				/* O - CUPS file */
@@ -1980,7 +1980,7 @@ cupsFileStdin(void)
 /*
 * 'cupsFileStdout()' - Return a CUPS file associated with stdout.
 *
- * @since CUPS 1.2/Mac OS X 10.5@
+ * @since CUPS 1.2/OS X 10.5@
 */

 cups_file_t *				/* O - CUPS file */
@@ -2016,7 +2016,7 @@ cupsFileStdout(void)
 /*
 * 'cupsFileTell()' - Return the current file position.
 *
- * @since CUPS 1.2/Mac OS X 10.5@
+ * @since CUPS 1.2/OS X 10.5@
 */

 off_t					/* O - File position */
@@ -2033,7 +2033,7 @@ cupsFileTell(cups_file_t *fp)		/* I - CUPS file */
 /*
 * 'cupsFileUnlock()' - Unlock access to a file.
 *
- * @since CUPS 1.2/Mac OS X 10.5@
+ * @since CUPS 1.2/OS X 10.5@
 */

 int					/* O - 0 on success, -1 on error */
@@ -2063,7 +2063,7 @@ cupsFileUnlock(cups_file_t *fp)		/* I - CUPS file */
 /*
 * 'cupsFileWrite()' - Write to a file.
 *
- * @since CUPS 1.2/Mac OS X 10.5@
+ * @since CUPS 1.2/OS X 10.5@
 */

 ssize_t					/* O - Number of bytes written or -1 on error */
@@ -3,7 +3,7 @@
 *
 *   cupsGetDevices implementation for CUPS.
 *
- *   Copyright 2008-2011 by Apple Inc.
+ *   Copyright 2008-2013 by Apple Inc.
 *
 *   These coded instructions, statements, and computer programs are the
 *   property of Apple Inc. and are protected by Federal copyright
@@ -34,7 +34,7 @@
 * parameters provide comma-delimited lists of backends to include or omit from
 * the request respectively.
 *
- * @since CUPS 1.4/Mac OS X 10.6@
+ * @since CUPS 1.4/OS X 10.6@
 */

 ipp_status_t				/* O - Request status - @code IPP_OK@ on success. */
@@ -71,19 +71,19 @@ cupsGetDevices(
 		user_data));

  if (!callback)
-    return (IPP_INTERNAL_ERROR);
+    return (IPP_STATUS_ERROR_INTERNAL);

  if (!http)
    http = _cupsConnect();

  if (!http)
-    return (IPP_SERVICE_UNAVAILABLE);
+    return (IPP_STATUS_ERROR_SERVICE_UNAVAILABLE);

 /*
  * Create a CUPS-Get-Devices request...
  */

-  request = ippNewRequest(CUPS_GET_DEVICES);
+  request = ippNewRequest(IPP_OP_CUPS_GET_DEVICES);

  if (timeout > 0)
    ippAddInteger(request, IPP_TAG_OPERATION, IPP_TAG_INTEGER, "timeout",
@@ -115,14 +115,14 @@ cupsGetDevices(
    status = cupsSendRequest(http, request, "/", ippLength(request));

    DEBUG_puts("2cupsGetDevices: Waiting for response status...");
-    while (status == HTTP_CONTINUE)
+    while (status == HTTP_STATUS_CONTINUE)
      status = httpUpdate(http);

-    if (status != HTTP_OK)
+    if (status != HTTP_STATUS_OK)
    {
      httpFlush(http);

-      if (status == HTTP_UNAUTHORIZED)
+      if (status == HTTP_STATUS_UNAUTHORIZED)
      {
       /*
 	* See if we can do authentication...
@@ -131,16 +131,16 @@ cupsGetDevices(
 	DEBUG_puts("2cupsGetDevices: Need authorization...");

 	if (!cupsDoAuthentication(http, "POST", "/"))
-	  httpReconnect(http);
+	  httpReconnect2(http, 30000, NULL);
 	else
 	{
-	  status = HTTP_AUTHORIZATION_CANCELED;
+	  status = HTTP_STATUS_CUPS_AUTHORIZATION_CANCELED;
 	  break;
 	}
      }

 #ifdef HAVE_SSL
-      else if (status == HTTP_UPGRADE_REQUIRED)
+      else if (status == HTTP_STATUS_UPGRADE_REQUIRED)
      {
       /*
 	* Force a reconnect with encryption...
@@ -148,19 +148,20 @@ cupsGetDevices(

 	DEBUG_puts("2cupsGetDevices: Need encryption...");

-	if (!httpReconnect(http))
-	  httpEncryption(http, HTTP_ENCRYPT_REQUIRED);
+	if (!httpReconnect2(http, 30000, NULL))
+	  httpEncryption(http, HTTP_ENCRYPTION_REQUIRED);
      }
 #endif /* HAVE_SSL */
    }
  }
-  while (status == HTTP_UNAUTHORIZED || status == HTTP_UPGRADE_REQUIRED);
+  while (status == HTTP_STATUS_UNAUTHORIZED ||
+         status == HTTP_STATUS_UPGRADE_REQUIRED);

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

  ippDelete(request);

-  if (status != HTTP_OK)
+  if (status != HTTP_STATUS_OK)
  {
    _cupsSetHTTPError(status);
    return (cupsLastError());
@@ -186,7 +187,7 @@ cupsGetDevices(

  do
  {
-    if ((state = ippRead(http, response)) == IPP_ERROR)
+    if ((state = ippRead(http, response)) == IPP_STATE_ERROR)
      break;

    DEBUG_printf(("2cupsGetDevices: state=%d, response->last=%p", state,
@@ -240,7 +241,7 @@ cupsGetDevices(
        device_uri = attr->values[0].string.text;
    }
  }
-  while (state != IPP_DATA);
+  while (state != IPP_STATE_DATA);

  DEBUG_printf(("2cupsGetDevices: state=%d, response->last=%p", state,
 		response->last));
@@ -257,8 +258,8 @@ cupsGetDevices(
  httpBlocking(http, blocking);
  httpFlush(http);

-  if (status == HTTP_ERROR)
-    _cupsSetError(IPP_INTERNAL_ERROR, strerror(http->error), 0);
+  if (status == HTTP_STATUS_ERROR)
+    _cupsSetError(IPP_STATUS_ERROR_INTERNAL, strerror(http->error), 0);
  else
  {
    attr = ippFindAttribute(response, "status-message", IPP_TAG_TEXT);
@@ -3,7 +3,7 @@
 *
 *   Get/put file functions for CUPS.
 *
- *   Copyright 2007-2010 by Apple Inc.
+ *   Copyright 2007-2013 by Apple Inc.
 *   Copyright 1997-2006 by Easy Software Products.
 *
 *   These coded instructions, statements, and computer programs are the
@@ -39,9 +39,9 @@
 /*
 * 'cupsGetFd()' - Get a file from the server.
 *
- * This function returns @code HTTP_OK@ when the file is successfully retrieved.
+ * This function returns @code HTTP_STATUS_OK@ when the file is successfully retrieved.
 *
- * @since CUPS 1.1.20/Mac OS X 10.4@
+ * @since CUPS 1.1.20/OS X 10.4@
 */

 http_status_t				/* O - HTTP status */
@@ -68,12 +68,12 @@ cupsGetFd(http_t     *http,		/* I - Connection to server or @code CUPS_HTTP_DEFA
    if (http)
      http->error = EINVAL;

-    return (HTTP_ERROR);
+    return (HTTP_STATUS_ERROR);
  }

  if (!http)
    if ((http = _cupsConnect()) == NULL)
-      return (HTTP_SERVICE_UNAVAILABLE);
+      return (HTTP_STATUS_SERVICE_UNAVAILABLE);

 /*
  * Then send GET requests to the HTTP server...
@@ -90,21 +90,21 @@ cupsGetFd(http_t     *http,		/* I - Connection to server or @code CUPS_HTTP_DEFA

    if (httpGet(http, resource))
    {
-      if (httpReconnect(http))
+      if (httpReconnect2(http, 30000, NULL))
      {
-        status = HTTP_ERROR;
+        status = HTTP_STATUS_ERROR;
 	break;
      }
      else
      {
-        status = HTTP_UNAUTHORIZED;
+        status = HTTP_STATUS_UNAUTHORIZED;
        continue;
      }
    }

-    while ((status = httpUpdate(http)) == HTTP_CONTINUE);
+    while ((status = httpUpdate(http)) == HTTP_STATUS_CONTINUE);

-    if (status == HTTP_UNAUTHORIZED)
+    if (status == HTTP_STATUS_UNAUTHORIZED)
    {
     /*
      * Flush any error message...
@@ -118,46 +118,46 @@ cupsGetFd(http_t     *http,		/* I - Connection to server or @code CUPS_HTTP_DEFA

      if (cupsDoAuthentication(http, "GET", resource))
      {
-        status = HTTP_AUTHORIZATION_CANCELED;
+        status = HTTP_STATUS_CUPS_AUTHORIZATION_CANCELED;
        break;
      }

-      if (httpReconnect(http))
+      if (httpReconnect2(http, 30000, NULL))
      {
-        status = HTTP_ERROR;
+        status = HTTP_STATUS_ERROR;
        break;
      }

      continue;
    }
 #ifdef HAVE_SSL
-    else if (status == HTTP_UPGRADE_REQUIRED)
+    else if (status == HTTP_STATUS_UPGRADE_REQUIRED)
    {
      /* Flush any error message... */
      httpFlush(http);

      /* Reconnect... */
-      if (httpReconnect(http))
+      if (httpReconnect2(http, 30000, NULL))
      {
-        status = HTTP_ERROR;
+        status = HTTP_STATUS_ERROR;
        break;
      }

      /* Upgrade with encryption... */
-      httpEncryption(http, HTTP_ENCRYPT_REQUIRED);
+      httpEncryption(http, HTTP_ENCRYPTION_REQUIRED);

      /* Try again, this time with encryption enabled... */
      continue;
    }
 #endif /* HAVE_SSL */
  }
-  while (status == HTTP_UNAUTHORIZED || status == HTTP_UPGRADE_REQUIRED);
+  while (status == HTTP_STATUS_UNAUTHORIZED || status == HTTP_STATUS_UPGRADE_REQUIRED);

 /*
  * See if we actually got the file or an error...
  */

-  if (status == HTTP_OK)
+  if (status == HTTP_STATUS_OK)
  {
   /*
    * Yes, copy the file...
@@ -185,9 +185,9 @@ cupsGetFd(http_t     *http,		/* I - Connection to server or @code CUPS_HTTP_DEFA
 /*
 * 'cupsGetFile()' - Get a file from the server.
 *
- * This function returns @code HTTP_OK@ when the file is successfully retrieved.
+ * This function returns @code HTTP_STATUS_OK@ when the file is successfully retrieved.
 *
- * @since CUPS 1.1.20/Mac OS X 10.4@
+ * @since CUPS 1.1.20/OS X 10.4@
 */

 http_status_t				/* O - HTTP status */
@@ -208,7 +208,7 @@ cupsGetFile(http_t     *http,		/* I - Connection to server or @code CUPS_HTTP_DE
    if (http)
      http->error = EINVAL;

-    return (HTTP_ERROR);
+    return (HTTP_STATUS_ERROR);
  }

 /*
@@ -223,7 +223,7 @@ cupsGetFile(http_t     *http,		/* I - Connection to server or @code CUPS_HTTP_DE

    http->error = errno;

-    return (HTTP_ERROR);
+    return (HTTP_STATUS_ERROR);
  }

 /*
@@ -238,7 +238,7 @@ cupsGetFile(http_t     *http,		/* I - Connection to server or @code CUPS_HTTP_DE

  close(fd);

-  if (status != HTTP_OK)
+  if (status != HTTP_STATUS_OK)
    unlink(filename);

 /*
@@ -252,10 +252,10 @@ cupsGetFile(http_t     *http,		/* I - Connection to server or @code CUPS_HTTP_DE
 /*
 * 'cupsPutFd()' - Put a file on the server.
 *
- * This function returns @code HTTP_CREATED@ when the file is stored
+ * This function returns @code HTTP_STATUS_CREATED@ when the file is stored
 * successfully.
 *
- * @since CUPS 1.1.20/Mac OS X 10.4@
+ * @since CUPS 1.1.20/OS X 10.4@
 */

 http_status_t				/* O - HTTP status */
@@ -281,12 +281,12 @@ cupsPutFd(http_t     *http,		/* I - Connection to server or @code CUPS_HTTP_DEFA
    if (http)
      http->error = EINVAL;

-    return (HTTP_ERROR);
+    return (HTTP_STATUS_ERROR);
  }

  if (!http)
    if ((http = _cupsConnect()) == NULL)
-      return (HTTP_SERVICE_UNAVAILABLE);
+      return (HTTP_STATUS_SERVICE_UNAVAILABLE);

 /*
  * Then send PUT requests to the HTTP server...
@@ -302,18 +302,18 @@ cupsPutFd(http_t     *http,		/* I - Connection to server or @code CUPS_HTTP_DEFA
    httpClearFields(http);
    httpSetField(http, HTTP_FIELD_AUTHORIZATION, http->authstring);
    httpSetField(http, HTTP_FIELD_TRANSFER_ENCODING, "chunked");
-    httpSetExpect(http, HTTP_CONTINUE);
+    httpSetExpect(http, HTTP_STATUS_CONTINUE);

    if (httpPut(http, resource))
    {
-      if (httpReconnect(http))
+      if (httpReconnect2(http, 30000, NULL))
      {
-        status = HTTP_ERROR;
+        status = HTTP_STATUS_ERROR;
 	break;
      }
      else
      {
-        status = HTTP_UNAUTHORIZED;
+        status = HTTP_STATUS_UNAUTHORIZED;
        continue;
      }
    }
@@ -325,9 +325,9 @@ cupsPutFd(http_t     *http,		/* I - Connection to server or @code CUPS_HTTP_DEFA
    if (httpWait(http, 1000))
      status = httpUpdate(http);
    else
-      status = HTTP_CONTINUE;
+      status = HTTP_STATUS_CONTINUE;

-    if (status == HTTP_CONTINUE)
+    if (status == HTTP_STATUS_CONTINUE)
    {
     /*
      * Copy the file...
@@ -338,21 +338,21 @@ cupsPutFd(http_t     *http,		/* I - Connection to server or @code CUPS_HTTP_DEFA
      while ((bytes = read(fd, buffer, sizeof(buffer))) > 0)
 	if (httpCheck(http))
 	{
-          if ((status = httpUpdate(http)) != HTTP_CONTINUE)
+          if ((status = httpUpdate(http)) != HTTP_STATUS_CONTINUE)
            break;
 	}
 	else
          httpWrite2(http, buffer, bytes);
    }

-    if (status == HTTP_CONTINUE)
+    if (status == HTTP_STATUS_CONTINUE)
    {
      httpWrite2(http, buffer, 0);

-      while ((status = httpUpdate(http)) == HTTP_CONTINUE);
+      while ((status = httpUpdate(http)) == HTTP_STATUS_CONTINUE);
    }

-    if (status == HTTP_ERROR && !retries)
+    if (status == HTTP_STATUS_ERROR && !retries)
    {
      DEBUG_printf(("2cupsPutFd: retry on status %d", status));

@@ -362,9 +362,9 @@ cupsPutFd(http_t     *http,		/* I - Connection to server or @code CUPS_HTTP_DEFA
      httpFlush(http);

      /* Reconnect... */
-      if (httpReconnect(http))
+      if (httpReconnect2(http, 30000, NULL))
      {
-        status = HTTP_ERROR;
+        status = HTTP_STATUS_ERROR;
        break;
      }

@@ -374,7 +374,7 @@ cupsPutFd(http_t     *http,		/* I - Connection to server or @code CUPS_HTTP_DEFA

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

-    if (status == HTTP_UNAUTHORIZED)
+    if (status == HTTP_STATUS_UNAUTHORIZED)
    {
     /*
      * Flush any error message...
@@ -388,47 +388,47 @@ cupsPutFd(http_t     *http,		/* I - Connection to server or @code CUPS_HTTP_DEFA

      if (cupsDoAuthentication(http, "PUT", resource))
      {
-        status = HTTP_AUTHORIZATION_CANCELED;
+        status = HTTP_STATUS_CUPS_AUTHORIZATION_CANCELED;
        break;
      }

-      if (httpReconnect(http))
+      if (httpReconnect2(http, 30000, NULL))
      {
-        status = HTTP_ERROR;
+        status = HTTP_STATUS_ERROR;
        break;
      }

      continue;
    }
 #ifdef HAVE_SSL
-    else if (status == HTTP_UPGRADE_REQUIRED)
+    else if (status == HTTP_STATUS_UPGRADE_REQUIRED)
    {
      /* Flush any error message... */
      httpFlush(http);

      /* Reconnect... */
-      if (httpReconnect(http))
+      if (httpReconnect2(http, 30000, NULL))
      {
-        status = HTTP_ERROR;
+        status = HTTP_STATUS_ERROR;
        break;
      }

      /* Upgrade with encryption... */
-      httpEncryption(http, HTTP_ENCRYPT_REQUIRED);
+      httpEncryption(http, HTTP_ENCRYPTION_REQUIRED);

      /* Try again, this time with encryption enabled... */
      continue;
    }
 #endif /* HAVE_SSL */
  }
-  while (status == HTTP_UNAUTHORIZED || status == HTTP_UPGRADE_REQUIRED ||
-         (status == HTTP_ERROR && retries < 2));
+  while (status == HTTP_STATUS_UNAUTHORIZED || status == HTTP_STATUS_UPGRADE_REQUIRED ||
+         (status == HTTP_STATUS_ERROR && retries < 2));

 /*
  * See if we actually put the file or an error...
  */

-  if (status != HTTP_CREATED)
+  if (status != HTTP_STATUS_CREATED)
  {
    _cupsSetHTTPError(status);
    httpFlush(http);
@@ -446,7 +446,7 @@ cupsPutFd(http_t     *http,		/* I - Connection to server or @code CUPS_HTTP_DEFA
 * This function returns @code HTTP_CREATED@ when the file is stored
 * successfully.
 *
- * @since CUPS 1.1.20/Mac OS X 10.4@
+ * @since CUPS 1.1.20/OS X 10.4@
 */

 http_status_t				/* O - HTTP status */
@@ -467,7 +467,7 @@ cupsPutFile(http_t     *http,		/* I - Connection to server or @code CUPS_HTTP_DE
    if (http)
      http->error = EINVAL;

-    return (HTTP_ERROR);
+    return (HTTP_STATUS_ERROR);
  }

 /*
@@ -482,7 +482,7 @@ cupsPutFile(http_t     *http,		/* I - Connection to server or @code CUPS_HTTP_DE

    http->error = errno;

-    return (HTTP_ERROR);
+    return (HTTP_STATUS_ERROR);
  }

 /*
@@ -3,7 +3,7 @@
 *
 *   Global variable access routines for CUPS.
 *
- *   Copyright 2007-2010 by Apple Inc.
+ *   Copyright 2007-2013 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 @@
 *   _cupsGlobals()       - Return a pointer to thread local storage
 *   _cupsGlobalUnlock()  - Unlock the global mutex.
 *   DllMain()            - Main entry for library.
+ *   cups_fix_path()      - Fix a file path to use forward slashes consistently.
 *   cups_globals_alloc() - Allocate and initialize global data.
 *   cups_globals_free()  - Free global data.
 *   cups_globals_init()  - Initialize environment variables.
@@ -37,22 +38,33 @@
 */


+#ifdef DEBUG
+static int		cups_global_index = 0;
+					/* Next thread number */
+#endif /* DEBUG */
 static _cups_threadkey_t cups_globals_key = _CUPS_THREADKEY_INITIALIZER;
 					/* Thread local storage key */
 #ifdef HAVE_PTHREAD_H
 static pthread_once_t	cups_globals_key_once = PTHREAD_ONCE_INIT;
 					/* One-time initialization object */
 #endif /* HAVE_PTHREAD_H */
+#if defined(HAVE_PTHREAD_H) || defined(WIN32)
 static _cups_mutex_t	cups_global_mutex = _CUPS_MUTEX_INITIALIZER;
 					/* Global critical section */
+#endif /* HAVE_PTHREAD_H || WIN32 */


 /*
 * Local functions...
 */

+#ifdef WIN32
+static void		cups_fix_path(char *path);
+#endif /* WIN32 */
 static _cups_globals_t	*cups_globals_alloc(void);
+#if defined(HAVE_PTHREAD_H) || defined(WIN32)
 static void		cups_globals_free(_cups_globals_t *g);
+#endif /* HAVE_PTHREAD_H || WIN32 */
 #ifdef HAVE_PTHREAD_H
 static void		cups_globals_init(void);
 #endif /* HAVE_PTHREAD_H */
@@ -187,9 +199,9 @@ cups_globals_alloc(void)
 #ifdef WIN32
  HKEY		key;			/* Registry key */
  DWORD		size;			/* Size of string */
-  static char	installdir[1024],	/* Install directory */
-		confdir[1024],		/* Server root directory */
-		localedir[1024];	/* Locale directory */
+  static char	installdir[1024] = "",	/* Install directory */
+		confdir[1024] = "",	/* Server root directory */
+		localedir[1024] = "";	/* Locale directory */
 #endif /* WIN32 */


@@ -202,37 +214,66 @@ cups_globals_alloc(void)
  */

  memset(cg, 0, sizeof(_cups_globals_t));
-  cg->encryption    = (http_encryption_t)-1;
-  cg->password_cb   = (cups_password_cb2_t)_cupsGetPassword;
-  cg->any_root      = 1;
-  cg->expired_certs = 1;
-  cg->expired_root  = 1;
+  cg->encryption     = (http_encryption_t)-1;
+  cg->password_cb    = (cups_password_cb2_t)_cupsGetPassword;
+  cg->any_root       = 1;
+  cg->expired_certs  = 1;
+  cg->expired_root   = 1;
+  cg->server_version = 20;
+
+#ifdef DEBUG
+ /*
+  * Friendly thread ID for debugging...
+  */
+
+  cg->thread_id = ++ cups_global_index;
+#endif /* DEBUG */

 /*
  * Then set directories as appropriate...
  */

 #ifdef WIN32
- /*
-  * Open the registry...
-  */
-
-  strcpy(installdir, "C:/Program Files/cups.org");
-
-  if (!RegOpenKeyEx(HKEY_LOCAL_MACHINE, "SOFTWARE\\cups.org", 0, KEY_READ,
-                    &key))
+  if (!installdir[0])
  {
   /*
-    * Grab the installation directory...
+    * Open the registry...
    */

-    size = sizeof(installdir);
-    RegQueryValueEx(key, "installdir", NULL, NULL, installdir, &size);
-    RegCloseKey(key);
-  }
+    strlcpy(installdir, "C:/Program Files/cups.org", sizeof(installdir));

-  snprintf(confdir, sizeof(confdir), "%s/conf", installdir);
-  snprintf(localedir, sizeof(localedir), "%s/locale", installdir);
+    if (!RegOpenKeyEx(HKEY_LOCAL_MACHINE, "SOFTWARE\\cups.org", 0, KEY_READ,
+                      &key))
+    {
+     /*
+      * Grab the installation directory...
+      */
+
+      char  *ptr;			/* Pointer into installdir */
+
+      size = sizeof(installdir);
+      RegQueryValueEx(key, "installdir", NULL, NULL, installdir, &size);
+      RegCloseKey(key);
+
+      for (ptr = installdir; *ptr;)
+      {
+        if (*ptr == '\\')
+        {
+          if (ptr[1])
+            *ptr++ = '/';
+          else
+            *ptr = '\0';		/* Strip trailing \ */
+        }
+        else if (*ptr == '/' && !ptr[1])
+          *ptr = '\0';			/* Strip trailing / */
+        else
+          ptr ++;
+      }
+    }
+
+    snprintf(confdir, sizeof(confdir), "%s/conf", installdir);
+    snprintf(localedir, sizeof(localedir), "%s/locale", installdir);
+  }

  if ((cg->cups_datadir = getenv("CUPS_DATADIR")) == NULL)
    cg->cups_datadir = installdir;
@@ -298,6 +339,7 @@ cups_globals_alloc(void)
 * 'cups_globals_free()' - Free global data.
 */

+#if defined(HAVE_PTHREAD_H) || defined(WIN32)
 static void
 cups_globals_free(_cups_globals_t *cg)	/* I - Pointer to global data */
 {
@@ -330,6 +372,7 @@ cups_globals_free(_cups_globals_t *cg)	/* I - Pointer to global data */

  free(cg);
 }
+#endif /* HAVE_PTHREAD_H || WIN32 */


 #ifdef HAVE_PTHREAD_H
@@ -3,7 +3,7 @@
 *
 *   HTTP address routines for CUPS.
 *
- *   Copyright 2007-2011 by Apple Inc.
+ *   Copyright 2007-2013 by Apple Inc.
 *   Copyright 1997-2006 by Easy Software Products, all rights reserved.
 *
 *   These coded instructions, statements, and computer programs are the
@@ -14,16 +14,19 @@
 *
 * Contents:
 *
- *   httpAddrAny()       - Check for the "any" address.
- *   httpAddrEqual()     - Compare two addresses.
+ *   httpAddrAny()	 - Check for the "any" address.
+ *   httpAddrEqual()	 - Compare two addresses.
+ *   httpAddrLength()	 - Return the length of the address in bytes.
+ *   httpAddrListen()	 - Create a listening socket bound to the specified
+ *			   address and port.
 *   httpAddrLocalhost() - Check for the local loopback address.
- *   httpAddrLookup()    - Lookup the hostname associated with the address.
- *   _httpAddrPort()     - Get the port number associated with an address.
+ *   httpAddrLookup()	 - Lookup the hostname associated with the address.
+ *   httpAddrPort()	 - Get the port number associated with an address.
 *   _httpAddrSetPort()  - Set the port number associated with an address.
- *   httpAddrString()    - Convert an IP address to a dotted string.
- *   httpGetHostByName() - Lookup a hostname or IP address, and return
- *                         address records for the specified name.
- *   httpGetHostname()   - Get the FQDN for the local system.
+ *   httpAddrString()	 - Convert an address to a numeric string.
+ *   httpGetHostByName() - Lookup a hostname or IPv4 address, and return
+ *			   address records for the specified name.
+ *   httpGetHostname()	 - Get the FQDN for the connection or local system.
 */

 /*
@@ -34,18 +37,16 @@
 #ifdef HAVE_RESOLV_H
 #  include <resolv.h>
 #endif /* HAVE_RESOLV_H */
-#ifdef HAVE_COREFOUNDATION
+#ifdef __APPLE__
 #  include <CoreFoundation/CoreFoundation.h>
-#endif /* HAVE_COREFOUNDATION */
-#ifdef HAVE_SYSTEMCONFIGURATION
 #  include <SystemConfiguration/SystemConfiguration.h>
-#endif /* HAVE_SYSTEMCONFIGURATION */
+#endif /* __APPLE__ */


 /*
 * 'httpAddrAny()' - Check for the "any" address.
 *
- * @since CUPS 1.2/Mac OS X 10.5@
+ * @since CUPS 1.2/OS X 10.5@
 */

 int					/* O - 1 if "any", 0 otherwise */
@@ -71,7 +72,7 @@ httpAddrAny(const http_addr_t *addr)	/* I - Address to check */
 /*
 * 'httpAddrEqual()' - Compare two addresses.
 *
- * @since CUPS 1.2/Mac OS X 10.5@
+ * @since CUPS 1.2/OS X 10.5@
 */

 int						/* O - 1 if equal, 0 if not */
@@ -104,7 +105,7 @@ httpAddrEqual(const http_addr_t *addr1,		/* I - First address */
 /*
 * 'httpAddrLength()' - Return the length of the address in bytes.
 *
- * @since CUPS 1.2/Mac OS X 10.5@
+ * @since CUPS 1.2/OS X 10.5@
 */

 int					/* O - Length in bytes */
@@ -132,10 +133,79 @@ httpAddrLength(const http_addr_t *addr)	/* I - Address */
 }


+/*
+ * 'httpAddrListen()' - Create a listening socket bound to the specified
+ *                      address and port.
+ *
+ * @since CUPS 1.7@
+ */
+
+int					/* O - Socket or -1 on error */
+httpAddrListen(http_addr_t *addr,	/* I - Address to bind to */
+               int         port)	/* I - Port number to bind to */
+{
+  int		fd = -1,		/* Socket */
+		val;			/* Socket value */
+
+
+ /*
+  * Range check input...
+  */
+
+  if (!addr || port <= 0)
+    return (-1);
+
+  if ((fd = socket(addr->addr.sa_family, SOCK_STREAM, 0)) < 0)
+  {
+    _cupsSetHTTPError(HTTP_STATUS_ERROR);
+    return (-1);
+  }
+
+  val = 1;
+  setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, CUPS_SOCAST &val, sizeof(val));
+
+#ifdef IPV6_V6ONLY
+  if (addr->addr.sa_family == AF_INET6)
+    setsockopt(fd, IPPROTO_IPV6, IPV6_V6ONLY, CUPS_SOCAST &val, sizeof(val));
+#endif /* IPV6_V6ONLY */
+
+  _httpAddrSetPort(addr, port);
+
+  if (bind(fd, (struct sockaddr *)addr, httpAddrLength(addr)))
+  {
+    _cupsSetHTTPError(HTTP_STATUS_ERROR);
+
+    close(fd);
+
+    return (-1);
+  }
+
+  if (listen(fd, 5))
+  {
+    _cupsSetHTTPError(HTTP_STATUS_ERROR);
+
+    close(fd);
+
+    return (-1);
+  }
+
+#ifdef SO_NOSIGPIPE
+ /*
+  * Disable SIGPIPE for this socket.
+  */
+
+  val = 1;
+  setsockopt(fd, SOL_SOCKET, SO_NOSIGPIPE, CUPS_SOCAST &val, sizeof(val));
+#endif /* SO_NOSIGPIPE */
+
+  return (fd);
+}
+
+
 /*
 * 'httpAddrLocalhost()' - Check for the local loopback address.
 *
- * @since CUPS 1.2/Mac OS X 10.5@
+ * @since CUPS 1.2/OS X 10.5@
 */

 int					/* O - 1 if local host, 0 otherwise */
@@ -164,17 +234,10 @@ httpAddrLocalhost(
 }


-#ifdef __sgi
-#  define ADDR_CAST (struct sockaddr *)
-#else
-#  define ADDR_CAST (char *)
-#endif /* __sgi */
-
-
 /*
 * 'httpAddrLookup()' - Lookup the hostname associated with the address.
 *
- * @since CUPS 1.2/Mac OS X 10.5@
+ * @since CUPS 1.2/OS X 10.5@
 */

 char *					/* O - Host name */
@@ -269,11 +332,11 @@ httpAddrLookup(

 #  ifdef AF_INET6
    if (addr->addr.sa_family == AF_INET6)
-      host = gethostbyaddr(ADDR_CAST &(addr->ipv6.sin6_addr),
+      host = gethostbyaddr((char *)&(addr->ipv6.sin6_addr),
                	   sizeof(struct in_addr), AF_INET6);
    else
 #  endif /* AF_INET6 */
-    host = gethostbyaddr(ADDR_CAST &(addr->ipv4.sin_addr),
+    host = gethostbyaddr((char *)&(addr->ipv4.sin_addr),
                	 sizeof(struct in_addr), AF_INET);

    if (host == NULL)
@@ -299,11 +362,13 @@ httpAddrLookup(


 /*
- * '_httpAddrPort()' - Get the port number associated with an address.
+ * 'httpAddrPort()' - Get the port number associated with an address.
+ *
+ * @since CUPS 1.7@
 */

 int					/* O - Port number */
-_httpAddrPort(http_addr_t *addr)	/* I - Address */
+httpAddrPort(http_addr_t *addr)		/* I - Address */
 {
  if (!addr)
    return (ippPort());
@@ -317,6 +382,9 @@ _httpAddrPort(http_addr_t *addr)	/* I - Address */
    return (ippPort());
 }

+/* For OS X 10.8 and earlier */
+int _httpAddrPort(http_addr_t *addr) { return (httpAddrPort(addr)); }
+

 /*
 * '_httpAddrSetPort()' - Set the port number associated with an address.
@@ -342,7 +410,7 @@ _httpAddrSetPort(http_addr_t *addr,	/* I - Address */
 /*
 * 'httpAddrString()' - Convert an address to a numeric string.
 *
- * @since CUPS 1.2/Mac OS X 10.5@
+ * @since CUPS 1.2/OS X 10.5@
 */

 char *					/* O - Numeric address string */
@@ -616,7 +684,7 @@ httpGetHostByName(const char *name)	/* I - Hostname or IP address */
 * Otherwise, return the FQDN for the local system using both gethostname()
 * and gethostbyname() to get the local hostname with domain.
 *
- * @since CUPS 1.2/Mac OS X 10.5@
+ * @since CUPS 1.2/OS X 10.5@
 */

 const char *				/* O - FQDN for connection or system */
@@ -3,7 +3,7 @@
 *
 *   HTTP address list routines for CUPS.
 *
- *   Copyright 2007-2012 by Apple Inc.
+ *   Copyright 2007-2013 by Apple Inc.
 *   Copyright 1997-2007 by Easy Software Products, all rights reserved.
 *
 *   These coded instructions, statements, and computer programs are the
@@ -14,11 +14,12 @@
 *
 * Contents:
 *
- *   httpAddrConnect()  - Connect to any of the addresses in the list.
+ *   httpAddrConnect()	- Connect to any of the addresses in the list.
 *   httpAddrConnect2() - Connect to any of the addresses in the list with a
- *                        timeout and optional cancel.
+ *			  timeout and optional cancel.
+ *   httpAddrCopyList() - Copy an address list.
 *   httpAddrFreeList() - Free an address list.
- *   httpAddrGetList()  - Get a list of addresses for a hostname.
+ *   httpAddrGetList()	- Get a list of addresses for a hostname.
 */

 /*
@@ -32,12 +33,15 @@
 #ifdef HAVE_POLL
 #  include <poll.h>
 #endif /* HAVE_POLL */
+#ifndef WIN32
+#  include <fcntl.h>
+#endif /* WIN32 */


 /*
 * 'httpAddrConnect()' - Connect to any of the addresses in the list.
 *
- * @since CUPS 1.2/Mac OS X 10.5@
+ * @since CUPS 1.2/OS X 10.5@
 */

 http_addrlist_t *			/* O - Connected address or NULL on failure */
@@ -55,7 +59,7 @@ httpAddrConnect(
 * 'httpAddrConnect2()' - Connect to any of the addresses in the list with a
 *                        timeout and optional cancel.
 *
- * @since CUPS 1.6@
+ * @since CUPS 1.7@
 */

 http_addrlist_t *			/* O - Connected address or NULL on failure */
@@ -68,6 +72,7 @@ httpAddrConnect2(
  int			val;		/* Socket option value */
 #ifdef O_NONBLOCK
  socklen_t		len;		/* Length of value */
+  http_addr_t		peer;		/* Peer address */
  int			flags,		/* Socket flags */
 			remaining;	/* Remaining timeout */
 #  ifdef HAVE_POLL
@@ -90,14 +95,14 @@ httpAddrConnect2(
  if (!sock)
  {
    errno = EINVAL;
-    _cupsSetError(IPP_INTERNAL_ERROR, strerror(errno), 0);
+    _cupsSetError(IPP_STATUS_ERROR_INTERNAL, strerror(errno), 0);
    return (NULL);
  }

  if (cancel && *cancel)
    return (NULL);

-  if (msec <= 0)
+  if (msec <= 0 || getenv("CUPS_DISABLE_ASYNC_CONNECT"))
    msec = INT_MAX;

 /*
@@ -106,13 +111,16 @@ httpAddrConnect2(

  while (addrlist)
  {
+    if (cancel && *cancel)
+      return (NULL);
+
   /*
    * Create the socket...
    */

    DEBUG_printf(("2httpAddrConnect2: Trying %s:%d...",
 		  httpAddrString(&(addrlist->addr), temp, sizeof(temp)),
-		  _httpAddrPort(&(addrlist->addr))));
+		  httpAddrPort(&(addrlist->addr))));

    if ((*sock = (int)socket(_httpAddrFamily(&(addrlist->addr)), SOCK_STREAM,
                             0)) < 0)
@@ -131,21 +139,16 @@ httpAddrConnect2(
    */

    val = 1;
-#ifdef WIN32
-    setsockopt(*sock, SOL_SOCKET, SO_REUSEADDR, (const char *)&val,
-               sizeof(val));
-#else
-    setsockopt(*sock, SOL_SOCKET, SO_REUSEADDR, &val, sizeof(val));
-#endif /* WIN32 */
+    setsockopt(*sock, SOL_SOCKET, SO_REUSEADDR, CUPS_SOCAST &val, sizeof(val));

 #ifdef SO_REUSEPORT
    val = 1;
-    setsockopt(*sock, SOL_SOCKET, SO_REUSEPORT, &val, sizeof(val));
+    setsockopt(*sock, SOL_SOCKET, SO_REUSEPORT, CUPS_SOCAST &val, sizeof(val));
 #endif /* SO_REUSEPORT */

 #ifdef SO_NOSIGPIPE
    val = 1;
-    setsockopt(*sock, SOL_SOCKET, SO_NOSIGPIPE, &val, sizeof(val));
+    setsockopt(*sock, SOL_SOCKET, SO_NOSIGPIPE, CUPS_SOCAST &val, sizeof(val));
 #endif /* SO_NOSIGPIPE */

   /*
@@ -154,12 +157,7 @@ httpAddrConnect2(
    */

    val = 1;
-#ifdef WIN32
-    setsockopt(*sock, IPPROTO_TCP, TCP_NODELAY, (const char *)&val,
-               sizeof(val));
-#else
-    setsockopt(*sock, IPPROTO_TCP, TCP_NODELAY, &val, sizeof(val));
-#endif /* WIN32 */
+    setsockopt(*sock, IPPROTO_TCP, TCP_NODELAY, CUPS_SOCAST &val, sizeof(val));

 #ifdef FD_CLOEXEC
   /*
@@ -177,8 +175,12 @@ httpAddrConnect2(
    DEBUG_printf(("httpAddrConnect2: Setting non-blocking connect()"));

    flags = fcntl(*sock, F_GETFL, 0);
-    if (msec > 0)
+    if (msec != INT_MAX)
+    {
+      DEBUG_puts("httpAddrConnect2: Setting non-blocking connect()");
+
      fcntl(*sock, F_SETFL, flags | O_NONBLOCK);
+    }
 #endif /* O_NONBLOCK */

   /*
@@ -190,7 +192,7 @@ httpAddrConnect2(
    {
      DEBUG_printf(("1httpAddrConnect2: Connected to %s:%d...",
 		    httpAddrString(&(addrlist->addr), temp, sizeof(temp)),
-		    _httpAddrPort(&(addrlist->addr))));
+		    httpAddrPort(&(addrlist->addr))));

 #ifdef O_NONBLOCK
      fcntl(*sock, F_SETFL, flags);
@@ -201,13 +203,16 @@ httpAddrConnect2(

 #ifdef O_NONBLOCK
 #  ifdef WIN32
-    if (errno == WSAEINPROGRESS)
+    if (WSAGetLastError() == WSAEINPROGRESS ||
+        WSAGetLastError() == WSAEWOULDBLOCK)
 #  else
-    if (errno == EINPROGRESS)
+    if (errno == EINPROGRESS || errno == EWOULDBLOCK)
 #  endif /* WIN32 */
    {
      DEBUG_puts("1httpAddrConnect2: Finishing async connect()");

+      fcntl(*sock, F_SETFL, flags);
+
      for (remaining = msec; remaining > 0; remaining -= 250)
      {
 	do
@@ -263,14 +268,13 @@ httpAddrConnect2(

        if (nfds > 0)
        {
-          len = sizeof(val);
-          if (getsockopt(*sock, SOL_SOCKET, SO_ERROR, &val, &len) >= 0)
+          len = sizeof(peer);
+          if (!getpeername(*sock, (struct sockaddr *)&peer, &len))
          {
 	    DEBUG_printf(("1httpAddrConnect2: Connected to %s:%d...",
-			  httpAddrString(&(addrlist->addr), temp, sizeof(temp)),
-			  _httpAddrPort(&(addrlist->addr))));
+			  httpAddrString(&peer, temp, sizeof(temp)),
+			  httpAddrPort(&peer)));

-	    fcntl(*sock, F_SETFL, flags);
 	    return (addrlist);
 	  }

@@ -282,7 +286,7 @@ httpAddrConnect2(

    DEBUG_printf(("1httpAddrConnect2: Unable to connect to %s:%d: %s",
 		  httpAddrString(&(addrlist->addr), temp, sizeof(temp)),
-		  _httpAddrPort(&(addrlist->addr)), strerror(errno)));
+		  httpAddrPort(&(addrlist->addr)), strerror(errno)));

 #ifndef WIN32
    if (errno == EINPROGRESS)
@@ -305,19 +309,69 @@ httpAddrConnect2(

  if (!addrlist)
 #ifdef WIN32
-    _cupsSetError(IPP_SERVICE_UNAVAILABLE, "Connection failed", 0);
+    _cupsSetError(IPP_STATUS_ERROR_SERVICE_UNAVAILABLE, "Connection failed", 0);
 #else
-    _cupsSetError(IPP_SERVICE_UNAVAILABLE, strerror(errno), 0);
+    _cupsSetError(IPP_STATUS_ERROR_SERVICE_UNAVAILABLE, strerror(errno), 0);
 #endif /* WIN32 */

  return (addrlist);
 }


+
+/*
+ * 'httpAddrCopyList()' - Copy an address list.
+ *
+ * @since CUPS 1.7@
+ */
+
+http_addrlist_t	*			/* O - New address list or @code NULL@ on error */
+httpAddrCopyList(
+    http_addrlist_t *src)		/* I - Source address list */
+{
+  http_addrlist_t	*dst = NULL,	/* First list entry */
+			*prev = NULL,	/* Previous list entry */
+			*current = NULL;/* Current list entry */
+
+
+  while (src)
+  {
+    if ((current = malloc(sizeof(http_addrlist_t))) == NULL)
+    {
+      current = dst;
+
+      while (current)
+      {
+        prev    = current;
+        current = current->next;
+
+        free(prev);
+      }
+
+      return (NULL);
+    }
+
+    memcpy(current, src, sizeof(http_addrlist_t));
+
+    current->next = NULL;
+
+    if (prev)
+      prev->next = current;
+    else
+      dst = current;
+
+    prev = current;
+    src  = src->next;
+  }
+
+  return (dst);
+}
+
+
 /*
 * 'httpAddrFreeList()' - Free an address list.
 *
- * @since CUPS 1.2/Mac OS X 10.5@
+ * @since CUPS 1.2/OS X 10.5@
 */

 void
@@ -345,7 +399,7 @@ httpAddrFreeList(
 /*
 * 'httpAddrGetList()' - Get a list of addresses for a hostname.
 *
- * @since CUPS 1.2/Mac OS X 10.5@
+ * @since CUPS 1.2/OS X 10.5@
 */

 http_addrlist_t	*			/* O - List of addresses or NULL */
@@ -495,7 +549,7 @@ httpAddrGetList(const char *hostname,	/* I - Hostname, IP address, or NULL for p
 	  if (!temp)
 	  {
 	    httpAddrFreeList(first);
-	    _cupsSetError(IPP_INTERNAL_ERROR, strerror(errno), 0);
+	    _cupsSetError(IPP_STATUS_ERROR_INTERNAL, strerror(errno), 0);
 	    return (NULL);
 	  }

@@ -530,7 +584,7 @@ httpAddrGetList(const char *hostname,	/* I - Hostname, IP address, or NULL for p
      if (error == EAI_FAIL)
        cg->need_res_init = 1;

-      _cupsSetError(IPP_INTERNAL_ERROR, gai_strerror(error), 0);
+      _cupsSetError(IPP_STATUS_ERROR_INTERNAL, gai_strerror(error), 0);
    }

 #else
@@ -654,7 +708,7 @@ httpAddrGetList(const char *hostname,	/* I - Hostname, IP address, or NULL for p
        if (h_errno == NO_RECOVERY)
          cg->need_res_init = 1;

-	_cupsSetError(IPP_INTERNAL_ERROR, hstrerror(h_errno), 0);
+	_cupsSetError(IPP_STATUS_ERROR_INTERNAL, hstrerror(h_errno), 0);
      }
    }
 #endif /* HAVE_GETADDRINFO */
@@ -694,7 +748,7 @@ httpAddrGetList(const char *hostname,	/* I - Hostname, IP address, or NULL for p
    {
      httpAddrFreeList(first);

-      _cupsSetError(IPP_INTERNAL_ERROR, _("Unknown service name."), 1);
+      _cupsSetError(IPP_STATUS_ERROR_INTERNAL, _("Unknown service name."), 1);
      return (NULL);
    }

@@ -717,7 +771,7 @@ httpAddrGetList(const char *hostname,	/* I - Hostname, IP address, or NULL for p
 	temp = (http_addrlist_t *)calloc(1, sizeof(http_addrlist_t));
 	if (!temp)
 	{
-	  _cupsSetError(IPP_INTERNAL_ERROR, strerror(errno), 0);
+	  _cupsSetError(IPP_STATUS_ERROR_INTERNAL, strerror(errno), 0);
 	  httpAddrFreeList(first);
 	  return (NULL);
 	}
@@ -746,7 +800,7 @@ httpAddrGetList(const char *hostname,	/* I - Hostname, IP address, or NULL for p
 	temp = (http_addrlist_t *)calloc(1, sizeof(http_addrlist_t));
 	if (!temp)
 	{
-	  _cupsSetError(IPP_INTERNAL_ERROR, strerror(errno), 0);
+	  _cupsSetError(IPP_STATUS_ERROR_INTERNAL, strerror(errno), 0);
 	  httpAddrFreeList(first);
 	  return (NULL);
 	}
@@ -778,7 +832,7 @@ httpAddrGetList(const char *hostname,	/* I - Hostname, IP address, or NULL for p
 	temp = (http_addrlist_t *)calloc(1, sizeof(http_addrlist_t));
 	if (!temp)
 	{
-	  _cupsSetError(IPP_INTERNAL_ERROR, strerror(errno), 0);
+	  _cupsSetError(IPP_STATUS_ERROR_INTERNAL, strerror(errno), 0);
 	  httpAddrFreeList(first);
 	  return (NULL);
 	}
@@ -802,7 +856,7 @@ httpAddrGetList(const char *hostname,	/* I - Hostname, IP address, or NULL for p
 	temp = (http_addrlist_t *)calloc(1, sizeof(http_addrlist_t));
 	if (!temp)
 	{
-	  _cupsSetError(IPP_INTERNAL_ERROR, strerror(errno), 0);
+	  _cupsSetError(IPP_STATUS_ERROR_INTERNAL, strerror(errno), 0);
 	  httpAddrFreeList(first);
 	  return (NULL);
 	}
@@ -3,7 +3,7 @@
 *
 *   Private HTTP definitions for CUPS.
 *
- *   Copyright 2007-2011 by Apple Inc.
+ *   Copyright 2007-2013 by Apple Inc.
 *   Copyright 1997-2007 by Easy Software Products, all rights reserved.
 *
 *   These coded instructions, statements, and computer programs are the
@@ -34,53 +34,40 @@
 #  ifdef WIN32
 #    include <io.h>
 #    include <winsock2.h>
+#    define CUPS_SOCAST (const char *)
 #  else
 #    include <unistd.h>
 #    include <fcntl.h>
 #    include <sys/socket.h>
 #    define closesocket(f) close(f)
+#    define CUPS_SOCAST
 #  endif /* WIN32 */

 #  ifdef HAVE_GSSAPI
 #    ifdef HAVE_GSS_GSSAPI_H
 #      include <GSS/gssapi.h>
-#      ifdef HAVE_GSSAPI_GENERIC_H
-#        include <GSS/gssapi_generic.h>
-#      endif /* HAVE_GSSAPI_GENERIC_H */
-#      ifdef HAVE_GSSAPI_KRB5_H
-#        include <GSS/gssapi_krb5.h>
-#      endif /* HAVE_GSSAPI_KRB5_H */
 #    elif defined(HAVE_GSSAPI_GSSAPI_H)
 #      include <gssapi/gssapi.h>
-#      ifdef HAVE_GSSAPI_GENERIC_H
-#        include <gssapi/gssapi_generic.h>
-#      endif /* HAVE_GSSAPI_GENERIC_H */
-#      ifdef HAVE_GSSAPI_KRB5_H
-#        include <gssapi/gssapi_krb5.h>
-#      endif /* HAVE_GSSAPI_KRB5_H */
 #    elif defined(HAVE_GSSAPI_H)
 #      include <gssapi.h>
 #    endif /* HAVE_GSS_GSSAPI_H */
 #    ifndef HAVE_GSS_C_NT_HOSTBASED_SERVICE
 #      define GSS_C_NT_HOSTBASED_SERVICE gss_nt_service_name
 #    endif /* !HAVE_GSS_C_NT_HOSTBASED_SERVICE */
-#    ifdef HAVE_KRB5_H
-#      include <krb5.h>
-#    endif /* HAVE_KRB5_H */
 #  endif /* HAVE_GSSAPI */

 #  ifdef HAVE_AUTHORIZATION_H
 #    include <Security/Authorization.h>
 #  endif /* HAVE_AUTHORIZATION_H */

-#  if defined(__sgi) || (defined(__APPLE__) && !defined(_SOCKLEN_T))
+#  if defined(__APPLE__) && !defined(_SOCKLEN_T)
 /*
- * IRIX and MacOS X 10.2.x do not define socklen_t, and in fact use an int instead of
+ * MacOS X 10.2.x does not define socklen_t, and in fact uses an int instead of
 * unsigned type for length values...
 */

 typedef int socklen_t;
-#  endif /* __sgi || (__APPLE__ && !_SOCKLEN_T) */
+#  endif /* __APPLE__ && !_SOCKLEN_T */

 #  include <cups/http.h>
 #  include "md5-private.h"
@@ -136,6 +123,10 @@ typedef int socklen_t;
 #    endif /* HAVE_GETIFADDRS */
 #  endif /* !WIN32 */

+#  ifdef HAVE_LIBZ
+#    include <zlib.h>
+#  endif /* HAVE_LIBZ */
+

 /*
 * C++ magic...
@@ -154,6 +145,7 @@ extern "C" {
 #define _HTTP_RESOLVE_DEFAULT	0	/* Just resolve with default options */
 #define _HTTP_RESOLVE_STDERR	1	/* Log resolve progress to stderr */
 #define _HTTP_RESOLVE_FQDN	2	/* Resolve to a FQDN */
+#define _HTTP_RESOLVE_FAXOUT	4	/* Resolve FaxOut service? */


 /*
@@ -235,7 +227,22 @@ typedef void *http_tls_t;
 typedef void *http_tls_credentials_t;
 #  endif /* HAVE_LIBSSL */

-struct _http_s				/**** HTTP connection structure. ****/
+typedef enum _http_coding_e		/**** HTTP content coding enumeration ****/
+{
+  _HTTP_CODING_IDENTITY,		/* No content coding */
+  _HTTP_CODING_GZIP,			/* LZ77+gzip decompression */
+  _HTTP_CODING_DEFLATE,			/* LZ77+zlib compression */
+  _HTTP_CODING_GUNZIP,			/* LZ77+gzip decompression */
+  _HTTP_CODING_INFLATE			/* LZ77+zlib decompression */
+} _http_coding_t;
+
+typedef enum _http_mode_e		/**** HTTP mode enumeration ****/
+{
+  _HTTP_MODE_CLIENT,			/* Client connected to server */
+  _HTTP_MODE_SERVER			/* Server connected (accepted) from client */
+} _http_mode_t;
+
+struct _http_s				/**** HTTP connection structure ****/
 {
  int			fd;		/* File descriptor for this socket */
  int			blocking;	/* To block or not to block */
@@ -248,8 +255,8 @@ struct _http_s				/**** HTTP connection structure. ****/
  struct sockaddr_in	_hostaddr;	/* Address of connected host (deprecated) */
  char			hostname[HTTP_MAX_HOST],
  					/* Name of connected host */
-			fields[HTTP_FIELD_MAX][HTTP_MAX_VALUE];
-					/* Field values */
+			fields[HTTP_FIELD_ACCEPT_ENCODING][HTTP_MAX_VALUE];
+					/* Field values up to Accept-Encoding */
  char			*data;		/* Pointer to data buffer */
  http_encoding_t	data_encoding;	/* Chunked or not */
  int			_data_remaining;/* Number of bytes left (deprecated) */
@@ -263,16 +270,19 @@ struct _http_s				/**** HTTP connection structure. ****/
  int			nonce_count;	/* Nonce count */
  http_tls_t		tls;		/* TLS state information */
  http_encryption_t	encryption;	/* Encryption requirements */
+
  /**** New in CUPS 1.1.19 ****/
  fd_set		*input_set;	/* select() set for httpWait() (deprecated) */
  http_status_t		expect;		/* Expect: header */
  char			*cookie;	/* Cookie value(s) */
+
  /**** New in CUPS 1.1.20 ****/
  char			_authstring[HTTP_MAX_VALUE],
-					/* Current Authentication value (deprecated) */
+					/* Current Authorization value (deprecated) */
 			userpass[HTTP_MAX_VALUE];
 					/* Username:password string */
  int			digest_tries;	/* Number of tries for digest auth */
+
  /**** New in CUPS 1.2 ****/
  off_t			data_remaining;	/* Number of bytes left */
  http_addr_t		*hostaddr;	/* Current host address and port */
@@ -280,10 +290,11 @@ struct _http_s				/**** HTTP connection structure. ****/
  char			wbuffer[HTTP_MAX_BUFFER];
 					/* Buffer for outgoing data */
  int			wused;		/* Write buffer bytes used */
+
  /**** New in CUPS 1.3 ****/
  char			*field_authorization;
 					/* Authorization field */
-  char			*authstring;	/* Current authorization field */
+  char			*authstring;	/* Current Authorization field */
 #  ifdef HAVE_GSSAPI
  gss_OID 		gssmech;	/* Authentication mechanism */
  gss_ctx_id_t		gssctx;		/* Authentication context */
@@ -292,6 +303,7 @@ struct _http_s				/**** HTTP connection structure. ****/
 #  ifdef HAVE_AUTHORIZATION_H
  AuthorizationRef	auth_ref;	/* Authorization ref */
 #  endif /* HAVE_AUTHORIZATION_H */
+
  /**** New in CUPS 1.5 ****/
  http_tls_credentials_t tls_credentials;
 					/* TLS credentials */
@@ -302,6 +314,23 @@ struct _http_s				/**** HTTP connection structure. ****/
 #  ifdef HAVE_GSSAPI
  char			gsshost[256];	/* Hostname for Kerberos */
 #  endif /* HAVE_GSSAPI */
+
+  /**** New in CUPS 1.7 ****/
+  int			tls_upgrade;	/* Non-zero if we are doing an upgrade */
+  _http_mode_t		mode;		/* _HTTP_MODE_CLIENT or _HTTP_MODE_SERVER */
+  char			*accept_encoding,
+					/* Accept-Encoding field */
+			*allow,		/* Allow field */
+			*server,	/* Server field */
+			*default_accept_encoding,
+			*default_server,
+			*default_user_agent;
+					/* Default field values */
+#  ifdef HAVE_LIBZ
+  _http_coding_t	coding;		/* _HTTP_CODING_xxx */
+  z_stream		stream;		/* (De)compression stream */
+  Bytef			*dbuffer;	/* Decompression buffer */
+#  endif /* HAVE_LIBZ */
 };


@@ -367,15 +396,18 @@ extern void	_cups_freeifaddrs(struct ifaddrs *addrs);
 */

 #define			_httpAddrFamily(addrp) (addrp)->addr.sa_family
-extern int		_httpAddrPort(http_addr_t *addr);
+extern int		_httpAddrPort(http_addr_t *addr)
+			              _CUPS_INTERNAL_MSG("Use httpAddrPort instead.");
 extern void		_httpAddrSetPort(http_addr_t *addr, int port);
 extern char		*_httpAssembleUUID(const char *server, int port,
 					   const char *name, int number,
-					   char *buffer, size_t bufsize);
+					   char *buffer, size_t bufsize)
+					   _CUPS_INTERNAL_MSG("Use httpAssembleUUID instead.");
 extern http_t		*_httpCreate(const char *host, int port,
 			             http_addrlist_t *addrlist,
 				     http_encryption_t encryption,
-				     int family);
+				     int family)
+				     _CUPS_INTERNAL_MSG("Use httpConnect2 or httpAccept instead.");
 extern http_tls_credentials_t
 			_httpCreateCredentials(cups_array_t *credentials);
 extern char		*_httpDecodeURI(char *dst, const char *src,
@@ -384,7 +416,8 @@ extern void		_httpDisconnect(http_t *http);
 extern char		*_httpEncodeURI(char *dst, const char *src,
 			                size_t dstsize);
 extern void		_httpFreeCredentials(http_tls_credentials_t credentials);
-extern ssize_t		_httpPeek(http_t *http, char *buffer, size_t length);
+extern ssize_t		_httpPeek(http_t *http, char *buffer, size_t length)
+			          _CUPS_INTERNAL_MSG("Use httpPeek instead.");
 extern const char	*_httpResolveURI(const char *uri, char *resolved_uri,
 			                 size_t resolved_size, int options,
 					 int (*cb)(void *context),
@@ -3,7 +3,7 @@
 *
 *   Hyper-Text Transport Protocol definitions for CUPS.
 *
- *   Copyright 2007-2012 by Apple Inc.
+ *   Copyright 2007-2013 by Apple Inc.
 *   Copyright 1997-2007 by Easy Software Products, all rights reserved.
 *
 *   These coded instructions, statements, and computer programs are the
@@ -36,9 +36,6 @@ typedef off_t ssize_t;			/* @private@ */
 #    include <winsock2.h>
 #    include <ws2tcpip.h>
 #  else
-#    ifdef __sgi
-#      define INET6			/* IRIX IPv6 support... */
-#    endif /* __sgi */
 #    include <unistd.h>
 #    include <sys/time.h>
 #    include <sys/socket.h>
@@ -124,22 +121,35 @@ typedef enum http_auth_e		/**** HTTP authentication types ****/
  HTTP_AUTH_MD5_SESS,			/* MD5-session authentication in use */
  HTTP_AUTH_MD5_INT,			/* Digest authentication in use for body */
  HTTP_AUTH_MD5_SESS_INT,		/* MD5-session authentication in use for body */
-  HTTP_AUTH_NEGOTIATE			/* GSSAPI authentication in use @since CUPS 1.3/Mac OS X 10.5@ */
+  HTTP_AUTH_NEGOTIATE			/* GSSAPI authentication in use @since CUPS 1.3/OS X 10.5@ */
 } http_auth_t;

 typedef enum http_encoding_e		/**** HTTP transfer encoding values ****/
 {
-  HTTP_ENCODE_LENGTH,			/* Data is sent with Content-Length */
-  HTTP_ENCODE_CHUNKED,			/* Data is chunked */
-  HTTP_ENCODE_FIELDS			/* Sending HTTP fields */
+  HTTP_ENCODING_LENGTH,			/* Data is sent with Content-Length */
+  HTTP_ENCODING_CHUNKED,		/* Data is chunked */
+  HTTP_ENCODING_FIELDS			/* Sending HTTP fields */
+
+#  ifndef _CUPS_NO_DEPRECATED
+#    define HTTP_ENCODE_LENGTH	HTTP_ENCODING_LENGTH
+#    define HTTP_ENCODE_CHUNKED	HTTP_ENCODING_CHUNKED
+#    define HTTP_ENCODE_FIELDS	HTTP_ENCODING_FIELDS
+#  endif /* !_CUPS_NO_DEPRECATED */
 } http_encoding_t;

 typedef enum http_encryption_e		/**** HTTP encryption values ****/
 {
-  HTTP_ENCRYPT_IF_REQUESTED,		/* Encrypt if requested (TLS upgrade) */
-  HTTP_ENCRYPT_NEVER,			/* Never encrypt */
-  HTTP_ENCRYPT_REQUIRED,		/* Encryption is required (TLS upgrade) */
-  HTTP_ENCRYPT_ALWAYS			/* Always encrypt (SSL) */
+  HTTP_ENCRYPTION_IF_REQUESTED,		/* Encrypt if requested (TLS upgrade) */
+  HTTP_ENCRYPTION_NEVER,		/* Never encrypt */
+  HTTP_ENCRYPTION_REQUIRED,		/* Encryption is required (TLS upgrade) */
+  HTTP_ENCRYPTION_ALWAYS		/* Always encrypt (SSL) */
+
+#  ifndef _CUPS_NO_DEPRECATED
+#    define HTTP_ENCRYPT_IF_REQUESTED	HTTP_ENCRYPTION_IF_REQUESTED
+#    define HTTP_ENCRYPT_NEVER		HTTP_ENCRYPTION_NEVER
+#    define HTTP_ENCRYPT_REQUIRED	HTTP_ENCRYPTION_REQUIRED
+#    define HTTP_ENCRYPT_ALWAYS		HTTP_ENCRYPTION_ALWAYS
+#  endif /* !_CUPS_NO_DEPRECATED */
 } http_encryption_t;

 typedef enum http_field_e		/**** HTTP field names ****/
@@ -172,6 +182,9 @@ typedef enum http_field_e		/**** HTTP field names ****/
  HTTP_FIELD_UPGRADE,			/* Upgrade field */
  HTTP_FIELD_USER_AGENT,		/* User-Agent field */
  HTTP_FIELD_WWW_AUTHENTICATE,		/* WWW-Authenticate field */
+  HTTP_FIELD_ACCEPT_ENCODING,		/* Accepting-Encoding field @since CUPS 1.7@ */
+  HTTP_FIELD_ALLOW,			/* Allow field @since CUPS 1.7@ */
+  HTTP_FIELD_SERVER,			/* Server field @since CUPS 1.7@ */
  HTTP_FIELD_MAX			/* Maximum field index */
 } http_field_t;

@@ -185,90 +198,181 @@ typedef enum http_state_e		/**** HTTP state values; states
 					 **** are server-oriented...
 					 ****/
 {
-  HTTP_WAITING,				/* Waiting for command */
-  HTTP_OPTIONS,				/* OPTIONS command, waiting for blank line */
-  HTTP_GET,				/* GET command, waiting for blank line */
-  HTTP_GET_SEND,			/* GET command, sending data */
-  HTTP_HEAD,				/* HEAD command, waiting for blank line */
-  HTTP_POST,				/* POST command, waiting for blank line */
-  HTTP_POST_RECV,			/* POST command, receiving data */
-  HTTP_POST_SEND,			/* POST command, sending data */
-  HTTP_PUT,				/* PUT command, waiting for blank line */
-  HTTP_PUT_RECV,			/* PUT command, receiving data */
-  HTTP_DELETE,				/* DELETE command, waiting for blank line */
-  HTTP_TRACE,				/* TRACE command, waiting for blank line */
-  HTTP_CLOSE,				/* CLOSE command, waiting for blank line */
-  HTTP_STATUS				/* Command complete, sending status */
+  HTTP_STATE_ERROR = -1,		/* Error on socket */
+  HTTP_STATE_WAITING,			/* Waiting for command */
+  HTTP_STATE_OPTIONS,			/* OPTIONS command, waiting for blank line */
+  HTTP_STATE_GET,			/* GET command, waiting for blank line */
+  HTTP_STATE_GET_SEND,			/* GET command, sending data */
+  HTTP_STATE_HEAD,			/* HEAD command, waiting for blank line */
+  HTTP_STATE_POST,			/* POST command, waiting for blank line */
+  HTTP_STATE_POST_RECV,			/* POST command, receiving data */
+  HTTP_STATE_POST_SEND,			/* POST command, sending data */
+  HTTP_STATE_PUT,			/* PUT command, waiting for blank line */
+  HTTP_STATE_PUT_RECV,			/* PUT command, receiving data */
+  HTTP_STATE_DELETE,			/* DELETE command, waiting for blank line */
+  HTTP_STATE_TRACE,			/* TRACE command, waiting for blank line */
+  HTTP_STATE_CONNECT,			/* CONNECT command, waiting for blank line */
+  HTTP_STATE_STATUS,			/* Command complete, sending status */
+  HTTP_STATE_UNKNOWN_METHOD,		/* Unknown request method, waiting for blank line @since CUPS 1.7@ */
+  HTTP_STATE_UNKNOWN_VERSION		/* Unknown request method, waiting for blank line @since CUPS 1.7@ */
+
+#  ifndef _CUPS_NO_DEPRECATED
+#    define HTTP_WAITING	HTTP_STATE_WAITING
+#    define HTTP_OPTIONS	HTTP_STATE_OPTIONS
+#    define HTTP_GET		HTTP_STATE_GET
+#    define HTTP_GET_SEND	HTTP_STATE_GET_SEND
+#    define HTTP_HEAD		HTTP_STATE_HEAD
+#    define HTTP_POST		HTTP_STATE_POST
+#    define HTTP_POST_RECV	HTTP_STATE_POST_RECV
+#    define HTTP_POST_SEND	HTTP_STATE_POST_SEND
+#    define HTTP_PUT		HTTP_STATE_PUT
+#    define HTTP_PUT_RECV	HTTP_STATE_PUT_RECV
+#    define HTTP_DELETE		HTTP_STATE_DELETE
+#    define HTTP_TRACE		HTTP_STATE_TRACE
+#    define HTTP_CLOSE		HTTP_STATE_CONNECT
+#    define HTTP_STATUS		HTTP_STATE_STATUS
+#  endif /* !_CUPS_NO_DEPRECATED */
 } http_state_t;

 typedef enum http_status_e		/**** HTTP status codes ****/
 {
-  HTTP_ERROR = -1,			/* An error response from httpXxxx() */
+  HTTP_STATUS_ERROR = -1,		/* An error response from httpXxxx() */
+  HTTP_STATUS_NONE = 0,			/* No Expect value @since CUPS 1.7@ */

-  HTTP_CONTINUE = 100,			/* Everything OK, keep going... */
-  HTTP_SWITCHING_PROTOCOLS,		/* HTTP upgrade to TLS/SSL */
+  HTTP_STATUS_CONTINUE = 100,		/* Everything OK, keep going... */
+  HTTP_STATUS_SWITCHING_PROTOCOLS,	/* HTTP upgrade to TLS/SSL */

-  HTTP_OK = 200,			/* OPTIONS/GET/HEAD/POST/TRACE command was successful */
-  HTTP_CREATED,				/* PUT command was successful */
-  HTTP_ACCEPTED,			/* DELETE command was successful */
-  HTTP_NOT_AUTHORITATIVE,		/* Information isn't authoritative */
-  HTTP_NO_CONTENT,			/* Successful command, no new data */
-  HTTP_RESET_CONTENT,			/* Content was reset/recreated */
-  HTTP_PARTIAL_CONTENT,			/* Only a partial file was recieved/sent */
+  HTTP_STATUS_OK = 200,			/* OPTIONS/GET/HEAD/POST/TRACE command was successful */
+  HTTP_STATUS_CREATED,			/* PUT command was successful */
+  HTTP_STATUS_ACCEPTED,			/* DELETE command was successful */
+  HTTP_STATUS_NOT_AUTHORITATIVE,	/* Information isn't authoritative */
+  HTTP_STATUS_NO_CONTENT,		/* Successful command, no new data */
+  HTTP_STATUS_RESET_CONTENT,		/* Content was reset/recreated */
+  HTTP_STATUS_PARTIAL_CONTENT,		/* Only a partial file was recieved/sent */

-  HTTP_MULTIPLE_CHOICES = 300,		/* Multiple files match request */
-  HTTP_MOVED_PERMANENTLY,		/* Document has moved permanently */
-  HTTP_MOVED_TEMPORARILY,		/* Document has moved temporarily */
-  HTTP_SEE_OTHER,			/* See this other link... */
-  HTTP_NOT_MODIFIED,			/* File not modified */
-  HTTP_USE_PROXY,			/* Must use a proxy to access this URI */
+  HTTP_STATUS_MULTIPLE_CHOICES = 300,	/* Multiple files match request */
+  HTTP_STATUS_MOVED_PERMANENTLY,	/* Document has moved permanently */
+  HTTP_STATUS_MOVED_TEMPORARILY,	/* Document has moved temporarily */
+  HTTP_STATUS_SEE_OTHER,		/* See this other link... */
+  HTTP_STATUS_NOT_MODIFIED,		/* File not modified */
+  HTTP_STATUS_USE_PROXY,		/* Must use a proxy to access this URI */

-  HTTP_BAD_REQUEST = 400,		/* Bad request */
-  HTTP_UNAUTHORIZED,			/* Unauthorized to access host */
-  HTTP_PAYMENT_REQUIRED,		/* Payment required */
-  HTTP_FORBIDDEN,			/* Forbidden to access this URI */
-  HTTP_NOT_FOUND,			/* URI was not found */
-  HTTP_METHOD_NOT_ALLOWED,		/* Method is not allowed */
-  HTTP_NOT_ACCEPTABLE,			/* Not Acceptable */
-  HTTP_PROXY_AUTHENTICATION,		/* Proxy Authentication is Required */
-  HTTP_REQUEST_TIMEOUT,			/* Request timed out */
-  HTTP_CONFLICT,			/* Request is self-conflicting */
-  HTTP_GONE,				/* Server has gone away */
-  HTTP_LENGTH_REQUIRED,			/* A content length or encoding is required */
-  HTTP_PRECONDITION,			/* Precondition failed */
-  HTTP_REQUEST_TOO_LARGE,		/* Request entity too large */
-  HTTP_URI_TOO_LONG,			/* URI too long */
-  HTTP_UNSUPPORTED_MEDIATYPE,		/* The requested media type is unsupported */
-  HTTP_REQUESTED_RANGE,			/* The requested range is not satisfiable */
-  HTTP_EXPECTATION_FAILED,		/* The expectation given in an Expect header field was not met */
-  HTTP_UPGRADE_REQUIRED = 426,		/* Upgrade to SSL/TLS required */
+  HTTP_STATUS_BAD_REQUEST = 400,	/* Bad request */
+  HTTP_STATUS_UNAUTHORIZED,		/* Unauthorized to access host */
+  HTTP_STATUS_PAYMENT_REQUIRED,		/* Payment required */
+  HTTP_STATUS_FORBIDDEN,		/* Forbidden to access this URI */
+  HTTP_STATUS_NOT_FOUND,		/* URI was not found */
+  HTTP_STATUS_METHOD_NOT_ALLOWED,	/* Method is not allowed */
+  HTTP_STATUS_NOT_ACCEPTABLE,		/* Not Acceptable */
+  HTTP_STATUS_PROXY_AUTHENTICATION,	/* Proxy Authentication is Required */
+  HTTP_STATUS_REQUEST_TIMEOUT,		/* Request timed out */
+  HTTP_STATUS_CONFLICT,			/* Request is self-conflicting */
+  HTTP_STATUS_GONE,			/* Server has gone away */
+  HTTP_STATUS_LENGTH_REQUIRED,		/* A content length or encoding is required */
+  HTTP_STATUS_PRECONDITION,		/* Precondition failed */
+  HTTP_STATUS_REQUEST_TOO_LARGE,	/* Request entity too large */
+  HTTP_STATUS_URI_TOO_LONG,		/* URI too long */
+  HTTP_STATUS_UNSUPPORTED_MEDIATYPE,	/* The requested media type is unsupported */
+  HTTP_STATUS_REQUESTED_RANGE,		/* The requested range is not satisfiable */
+  HTTP_STATUS_EXPECTATION_FAILED,	/* The expectation given in an Expect header field was not met */
+  HTTP_STATUS_UPGRADE_REQUIRED = 426,	/* Upgrade to SSL/TLS required */

-  HTTP_SERVER_ERROR = 500,		/* Internal server error */
-  HTTP_NOT_IMPLEMENTED,			/* Feature not implemented */
-  HTTP_BAD_GATEWAY,			/* Bad gateway */
-  HTTP_SERVICE_UNAVAILABLE,		/* Service is unavailable */
-  HTTP_GATEWAY_TIMEOUT,			/* Gateway connection timed out */
-  HTTP_NOT_SUPPORTED,			/* HTTP version not supported */
+  HTTP_STATUS_SERVER_ERROR = 500,	/* Internal server error */
+  HTTP_STATUS_NOT_IMPLEMENTED,		/* Feature not implemented */
+  HTTP_STATUS_BAD_GATEWAY,		/* Bad gateway */
+  HTTP_STATUS_SERVICE_UNAVAILABLE,	/* Service is unavailable */
+  HTTP_STATUS_GATEWAY_TIMEOUT,		/* Gateway connection timed out */
+  HTTP_STATUS_NOT_SUPPORTED,		/* HTTP version not supported */

-  HTTP_AUTHORIZATION_CANCELED = 1000,	/* User canceled authorization @since CUPS 1.4@ */
-  HTTP_PKI_ERROR,			/* Error negotiating a secure connection @since CUPS 1.5/Mac OS X 10.7@ */
-  HTTP_WEBIF_DISABLED			/* Web interface is disabled @private@ */
+  HTTP_STATUS_CUPS_AUTHORIZATION_CANCELED = 1000,
+					/* User canceled authorization @since CUPS 1.4@ */
+  HTTP_STATUS_CUPS_PKI_ERROR,		/* Error negotiating a secure connection @since CUPS 1.5/OS X 10.7@ */
+  HTTP_STATUS_CUPS_WEBIF_DISABLED	/* Web interface is disabled @private@ */
+
+#  ifndef _CUPS_NO_DEPRECATED
+/* Old names for this enumeration */
+#    define HTTP_ERROR			HTTP_STATUS_ERROR
+
+#    define HTTP_CONTINUE		HTTP_STATUS_CONTINUE
+#    define HTTP_SWITCHING_PROTOCOLS	HTTP_STATUS_SWITCHING_PROTOCOLS
+
+#    define HTTP_OK			HTTP_STATUS_OK
+#    define HTTP_CREATED		HTTP_STATUS_CREATED
+#    define HTTP_ACCEPTED		HTTP_STATUS_ACCEPTED
+#    define HTTP_NOT_AUTHORITATIVE	HTTP_STATUS_NOT_AUTHORITATIVE
+#    define HTTP_NO_CONTENT		HTTP_STATUS_NO_CONTENT
+#    define HTTP_RESET_CONTENT		HTTP_STATUS_RESET_CONTENT
+#    define HTTP_PARTIAL_CONTENT	HTTP_STATUS_PARTIAL_CONTENT
+
+#    define HTTP_MULTIPLE_CHOICES	HTTP_STATUS_MULTIPLE_CHOICES
+#    define HTTP_MOVED_PERMANENTLY	HTTP_STATUS_MOVED_PERMANENTLY
+#    define HTTP_MOVED_TEMPORARILY	HTTP_STATUS_MOVED_TEMPORARILY
+#    define HTTP_SEE_OTHER		HTTP_STATUS_SEE_OTHER
+#    define HTTP_NOT_MODIFIED		HTTP_STATUS_NOT_MODIFIED
+#    define HTTP_USE_PROXY		HTTP_STATUS_USE_PROXY
+
+#    define HTTP_BAD_REQUEST		HTTP_STATUS_BAD_REQUEST
+#    define HTTP_UNAUTHORIZED		HTTP_STATUS_UNAUTHORIZED
+#    define HTTP_PAYMENT_REQUIRED	HTTP_STATUS_PAYMENT_REQUIRED
+#    define HTTP_FORBIDDEN		HTTP_STATUS_FORBIDDEN
+#    define HTTP_NOT_FOUND		HTTP_STATUS_NOT_FOUND
+#    define HTTP_METHOD_NOT_ALLOWED	HTTP_STATUS_METHOD_NOT_ALLOWED
+#    define HTTP_NOT_ACCEPTABLE		HTTP_STATUS_NOT_ACCEPTABLE
+#    define HTTP_PROXY_AUTHENTICATION	HTTP_STATUS_PROXY_AUTHENTICATION
+#    define HTTP_REQUEST_TIMEOUT	HTTP_STATUS_REQUEST_TIMEOUT
+#    define HTTP_CONFLICT		HTTP_STATUS_CONFLICT
+#    define HTTP_GONE			HTTP_STATUS_GONE
+#    define HTTP_LENGTH_REQUIRED	HTTP_STATUS_LENGTH_REQUIRED
+#    define HTTP_PRECONDITION		HTTP_STATUS_PRECONDITION
+#    define HTTP_REQUEST_TOO_LARGE	HTTP_STATUS_REQUEST_TOO_LARGE
+#    define HTTP_URI_TOO_LONG		HTTP_STATUS_URI_TOO_LONG
+#    define HTTP_UNSUPPORTED_MEDIATYPE	HTTP_STATUS_UNSUPPORTED_MEDIATYPE
+#    define HTTP_REQUESTED_RANGE	HTTP_STATUS_REQUESTED_RANGE
+#    define HTTP_EXPECTATION_FAILED	HTTP_STATUS_EXPECTATION_FAILED
+#    define HTTP_UPGRADE_REQUIRED	HTTP_STATUS_UPGRADE_REQUIRED
+
+#    define HTTP_SERVER_ERROR		HTTP_STATUS_SERVER_ERROR
+#    define HTTP_NOT_IMPLEMENTED	HTTP_STATUS_NOT_IMPLEMENTED
+#    define HTTP_BAD_GATEWAY		HTTP_STATUS_BAD_GATEWAY
+#    define HTTP_SERVICE_UNAVAILABLE	HTTP_STATUS_SERVICE_UNAVAILABLE
+#    define HTTP_GATEWAY_TIMEOUT	HTTP_STATUS_GATEWAY_TIMEOUT
+#    define HTTP_NOT_SUPPORTED		HTTP_STATUS_NOT_SUPPORTED
+
+#    define HTTP_AUTHORIZATION_CANCELED	HTTP_STATUS_CUPS_AUTHORIZATION_CANCELED
+#    define HTTP_PKI_ERROR		HTTP_STATUS_CUPS_PKI_ERROR
+#    define HTTP_WEBIF_DISABLED		HTTP_STATUS_CUPS_WEBIF_DISABLED
+#  endif /* !_CUPS_NO_DEPRECATED */
 } http_status_t;

 typedef enum http_uri_status_e		/**** URI separation status @since CUPS 1.2@ ****/
 {
-  HTTP_URI_OVERFLOW = -8,		/* URI buffer for httpAssembleURI is too small */
-  HTTP_URI_BAD_ARGUMENTS = -7,		/* Bad arguments to function (error) */
-  HTTP_URI_BAD_RESOURCE = -6,		/* Bad resource in URI (error) */
-  HTTP_URI_BAD_PORT = -5,		/* Bad port number in URI (error) */
-  HTTP_URI_BAD_HOSTNAME = -4,		/* Bad hostname in URI (error) */
-  HTTP_URI_BAD_USERNAME = -3,		/* Bad username in URI (error) */
-  HTTP_URI_BAD_SCHEME = -2,		/* Bad scheme in URI (error) */
-  HTTP_URI_BAD_URI = -1,		/* Bad/empty URI (error) */
-  HTTP_URI_OK = 0,			/* URI decoded OK */
-  HTTP_URI_MISSING_SCHEME,		/* Missing scheme in URI (warning) */
-  HTTP_URI_UNKNOWN_SCHEME,		/* Unknown scheme in URI (warning) */
-  HTTP_URI_MISSING_RESOURCE		/* Missing resource in URI (warning) */
+  HTTP_URI_STATUS_OVERFLOW = -8,	/* URI buffer for httpAssembleURI is too small */
+  HTTP_URI_STATUS_BAD_ARGUMENTS = -7,	/* Bad arguments to function (error) */
+  HTTP_URI_STATUS_BAD_RESOURCE = -6,	/* Bad resource in URI (error) */
+  HTTP_URI_STATUS_BAD_PORT = -5,	/* Bad port number in URI (error) */
+  HTTP_URI_STATUS_BAD_HOSTNAME = -4,	/* Bad hostname in URI (error) */
+  HTTP_URI_STATUS_BAD_USERNAME = -3,	/* Bad username in URI (error) */
+  HTTP_URI_STATUS_BAD_SCHEME = -2,	/* Bad scheme in URI (error) */
+  HTTP_URI_STATUS_BAD_URI = -1,		/* Bad/empty URI (error) */
+  HTTP_URI_STATUS_OK = 0,		/* URI decoded OK */
+  HTTP_URI_STATUS_MISSING_SCHEME,	/* Missing scheme in URI (warning) */
+  HTTP_URI_STATUS_UNKNOWN_SCHEME,	/* Unknown scheme in URI (warning) */
+  HTTP_URI_STATUS_MISSING_RESOURCE	/* Missing resource in URI (warning) */
+
+#  ifndef _CUPS_NO_DEPRECATED
+#    define HTTP_URI_OVERFLOW		HTTP_URI_STATUS_OVERFLOW
+#    define HTTP_URI_BAD_ARGUMENTS	HTTP_URI_STATUS_BAD_ARGUMENTS
+#    define HTTP_URI_BAD_RESOURCE	HTTP_URI_STATUS_BAD_RESOURCE
+#    define HTTP_URI_BAD_PORT		HTTP_URI_STATUS_BAD_PORT
+#    define HTTP_URI_BAD_HOSTNAME	HTTP_URI_STATUS_BAD_HOSTNAME
+#    define HTTP_URI_BAD_USERNAME	HTTP_URI_STATUS_BAD_USERNAME
+#    define HTTP_URI_BAD_SCHEME		HTTP_URI_STATUS_BAD_SCHEME
+#    define HTTP_URI_BAD_URI		HTTP_URI_STATUS_BAD_URI
+#    define HTTP_URI_OK			HTTP_URI_STATUS_OK
+#    define HTTP_URI_MISSING_SCHEME	HTTP_URI_STATUS_MISSING_SCHEME
+#    define HTTP_URI_UNKNOWN_SCHEME	HTTP_URI_STATUS_UNKNOWN_SCHEME
+#    define HTTP_URI_MISSING_RESOURCE	HTTP_URI_STATUS_MISSING_RESOURCE
+#  endif /* !_CUPS_NO_DEPRECATED */
 } http_uri_status_t;

 typedef enum http_uri_coding_e		/**** URI en/decode flags ****/
@@ -284,15 +388,21 @@ typedef enum http_uri_coding_e		/**** URI en/decode flags ****/

 typedef enum http_version_e		/**** HTTP version numbers ****/
 {
-  HTTP_0_9 = 9,				/* HTTP/0.9 */
-  HTTP_1_0 = 100,			/* HTTP/1.0 */
-  HTTP_1_1 = 101			/* HTTP/1.1 */
+  HTTP_VERSION_0_9 = 9,			/* HTTP/0.9 */
+  HTTP_VERSION_1_0 = 100,		/* HTTP/1.0 */
+  HTTP_VERSION_1_1 = 101		/* HTTP/1.1 */
+
+#  ifndef _CUPS_NO_DEPRECATED
+#    define HTTP_0_9	HTTP_VERSION_0_9
+#    define HTTP_1_0	HTTP_VERSION_1_0
+#    define HTTP_1_1	HTTP_VERSION_1_1
+#  endif /* !_CUPS_NO_DEPRECATED */
 } http_version_t;

 typedef union _http_addr_u		/**** Socket address union, which
 					 **** makes using IPv6 and other
 					 **** address types easier and
-					 **** more portable. @since CUPS 1.2/Mac OS X 10.5@
+					 **** more portable. @since CUPS 1.2/OS X 10.5@
 					 ****/
 {
  struct sockaddr	addr;		/* Base structure for family value */
@@ -309,7 +419,7 @@ typedef union _http_addr_u		/**** Socket address union, which
 typedef struct http_addrlist_s		/**** Socket address list, which is
 					 **** used to enumerate all of the
 					 **** addresses that are associated
-					 **** with a hostname. @since CUPS 1.2/Mac OS X 10.5@
+					 **** with a hostname. @since CUPS 1.2/OS X 10.5@
 					 ****/
 {
  struct http_addrlist_s *next;		/* Pointer to next address in list */
@@ -318,14 +428,14 @@ typedef struct http_addrlist_s		/**** Socket address list, which is

 typedef struct _http_s http_t;		/**** HTTP connection type ****/

-typedef struct http_credential_s	/**** HTTP credential data @since CUPS 1.5/Mac OS X 10.7@ ****/
+typedef struct http_credential_s	/**** HTTP credential data @since CUPS 1.5/OS X 10.7@ ****/
 {
  void		*data;			/* Pointer to credential data */
  size_t	datalen;		/* Credential length */
 } http_credential_t;

 typedef int (*http_timeout_cb_t)(http_t *http, void *user_data);
-					/**** HTTP timeout callback @since CUPS 1.5/Mac OS X 10.7@ ****/
+					/**** HTTP timeout callback @since CUPS 1.5/OS X 10.7@ ****/



@@ -337,9 +447,11 @@ extern void		httpBlocking(http_t *http, int b);
 extern int		httpCheck(http_t *http);
 extern void		httpClearFields(http_t *http);
 extern void		httpClose(http_t *http);
-extern http_t		*httpConnect(const char *host, int port);
+extern http_t		*httpConnect(const char *host, int port)
+			             _CUPS_DEPRECATED_MSG("Use httpConnect2 instead.");
 extern http_t		*httpConnectEncrypt(const char *host, int port,
-			                    http_encryption_t encryption);
+			                    http_encryption_t encryption)
+			                    _CUPS_DEPRECATED_MSG("Use httpConnect2 instead.");
 extern int		httpDelete(http_t *http, const char *uri);
 extern int		httpEncryption(http_t *http, http_encryption_t e);
 extern int		httpError(http_t *http);
@@ -359,20 +471,20 @@ extern int		httpPost(http_t *http, const char *uri);
 extern int		httpPrintf(http_t *http, const char *format, ...)
 			__attribute__ ((__format__ (__printf__, 2, 3)));
 extern int		httpPut(http_t *http, const char *uri);
-extern int		httpRead(http_t *http, char *buffer, int length) _CUPS_DEPRECATED;
-extern int		httpReconnect(http_t *http);
+extern int		httpRead(http_t *http, char *buffer, int length) _CUPS_DEPRECATED_MSG("Use httpRead2 instead.");
+extern int		httpReconnect(http_t *http) _CUPS_DEPRECATED_MSG("Use httpReconnect2 instead.");
 extern void		httpSeparate(const char *uri, char *method,
 			             char *username, char *host, int *port,
-				     char *resource) _CUPS_DEPRECATED;
+				     char *resource) _CUPS_DEPRECATED_MSG("Use httpSeparateURI instead.");
 extern void		httpSetField(http_t *http, http_field_t field,
 			             const char *value);
 extern const char	*httpStatus(http_status_t status);
 extern int		httpTrace(http_t *http, const char *uri);
 extern http_status_t	httpUpdate(http_t *http);
-extern int		httpWrite(http_t *http, const char *buffer, int length) _CUPS_DEPRECATED;
-extern char		*httpEncode64(char *out, const char *in) _CUPS_DEPRECATED;
-extern char		*httpDecode64(char *out, const char *in) _CUPS_DEPRECATED;
-extern int		httpGetLength(http_t *http) _CUPS_DEPRECATED;
+extern int		httpWrite(http_t *http, const char *buffer, int length) _CUPS_DEPRECATED_MSG("Use httpWrite2 instead.");
+extern char		*httpEncode64(char *out, const char *in) _CUPS_DEPRECATED_MSG("Use httpEncode64_2 instead.");
+extern char		*httpDecode64(char *out, const char *in) _CUPS_DEPRECATED_MSG("Use httpDecode64_2 instead.");
+extern int		httpGetLength(http_t *http) _CUPS_DEPRECATED_MSG("Use httpGetLength2 instead.");
 extern char		*httpMD5(const char *, const char *, const char *,
 			         char [33]);
 extern char		*httpMD5Final(const char *, const char *, const char *,
@@ -393,9 +505,9 @@ extern void		httpSeparate2(const char *uri,
 			              char *method, int methodlen,
 			              char *username, int usernamelen,
 				      char *host, int hostlen, int *port,
-				      char *resource, int resourcelen) _CUPS_DEPRECATED;
+				      char *resource, int resourcelen) _CUPS_DEPRECATED_MSG("Use httpSeparateURI instead.");

-/**** New in CUPS 1.2/Mac OS X 10.5 ****/
+/**** New in CUPS 1.2/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,
@@ -443,12 +555,12 @@ 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/Mac OS X 10.5 ****/
+/**** New in CUPS 1.3/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;

-/**** New in CUPS 1.5/Mac OS X 10.7 ****/
+/**** New in CUPS 1.5/OS X 10.7 ****/
 extern int		httpAddCredential(cups_array_t *credentials,
 			                  const void *data, size_t datalen)
 					  _CUPS_API_1_5;
@@ -462,7 +574,7 @@ extern void		httpSetTimeout(http_t *http, double timeout,
 			               http_timeout_cb_t cb, void *user_data)
 			               _CUPS_API_1_5;

-/**** New in CUPS 1.6 ****/
+/**** New in CUPS 1.6/OS X 10.8 ****/
 extern http_addrlist_t	*httpAddrConnect2(http_addrlist_t *addrlist, int *sock,
 			                  int msec, int *cancel)
 			                  _CUPS_API_1_6;
@@ -472,6 +584,34 @@ extern int		httpReconnect2(http_t *http, int msec, int *cancel)
 			               _CUPS_API_1_6;


+/**** New in CUPS 1.7 ****/
+extern http_t		*httpAcceptConnection(int fd, int blocking)
+			                      _CUPS_API_1_7;
+extern http_addrlist_t	*httpAddrCopyList(http_addrlist_t *src) _CUPS_API_1_7;
+extern int		httpAddrListen(http_addr_t *addr, int port)
+			               _CUPS_API_1_7;
+extern int		httpAddrPort(http_addr_t *addr) _CUPS_API_1_7;
+extern char		*httpAssembleUUID(const char *server, int port,
+					  const char *name, int number,
+					  char *buffer, size_t bufsize)
+					  _CUPS_API_1_7;
+extern http_t		*httpConnect2(const char *host, int port,
+				      http_addrlist_t *addrlist,
+				      int family, http_encryption_t encryption,
+				      int blocking, int msec, int *cancel)
+				      _CUPS_API_1_7;
+extern const char	*httpGetContentEncoding(http_t *http) _CUPS_API_1_7;
+extern http_status_t	httpGetExpect(http_t *http) _CUPS_API_1_7;
+extern ssize_t		httpPeek(http_t *http, char *buffer, size_t length)
+			         _CUPS_API_1_7;
+extern http_state_t	httpReadRequest(http_t *http, char *resource,
+			                size_t resourcelen) _CUPS_API_1_7;
+extern void		httpSetDefaultField(http_t *http, http_field_t field,
+			                    const char *value) _CUPS_API_1_7;
+extern http_state_t	httpWriteResponse(http_t *http,
+			                  http_status_t status) _CUPS_API_1_7;
+
+
 /*
 * C++ magic...
 */
@@ -3,7 +3,7 @@
 *
 *   Private IPP definitions for CUPS.
 *
- *   Copyright 2007-2011 by Apple Inc.
+ *   Copyright 2007-2012 by Apple Inc.
 *   Copyright 1997-2006 by Easy Software Products.
 *
 *   These coded instructions, statements, and computer programs are the
@@ -46,103 +46,6 @@ extern "C" {
 * Structures...
 */

-typedef union _ipp_request_u		/**** Request Header ****/
-{
-  struct				/* Any Header */
-  {
-    ipp_uchar_t	version[2];		/* Protocol version number */
-    int		op_status;		/* Operation ID or status code*/
-    int		request_id;		/* Request ID */
-  }		any;
-
-  struct				/* Operation Header */
-  {
-    ipp_uchar_t	version[2];		/* Protocol version number */
-    ipp_op_t	operation_id;		/* Operation ID */
-    int		request_id;		/* Request ID */
-  }		op;
-
-  struct				/* Status Header */
-  {
-    ipp_uchar_t	version[2];		/* Protocol version number */
-    ipp_status_t status_code;		/* Status code */
-    int		request_id;		/* Request ID */
-  }		status;
-
-  /**** New in CUPS 1.1.19 ****/
-  struct				/* Event Header @since CUPS 1.1.19/Mac OS X 10.3@ */
-  {
-    ipp_uchar_t	version[2];		/* Protocol version number */
-    ipp_status_t status_code;		/* Status code */
-    int		request_id;		/* Request ID */
-  }		event;
-} _ipp_request_t;
-
-/**** New in CUPS 1.1.19 ****/
-
-typedef union _ipp_value_u		/**** Attribute Value ****/
-{
-  int		integer;		/* Integer/enumerated value */
-
-  char		boolean;		/* Boolean value */
-
-  ipp_uchar_t	date[11];		/* Date/time value */
-
-  struct
-  {
-    int		xres,			/* Horizontal resolution */
-		yres;			/* Vertical resolution */
-    ipp_res_t	units;			/* Resolution units */
-  }		resolution;		/* Resolution value */
-
-  struct
-  {
-    int		lower,			/* Lower value */
-		upper;			/* Upper value */
-  }		range;			/* Range of integers value */
-
-  struct
-  {
-    char	*language;		/* Language code */
-    char	*text;			/* String */
-  }		string;			/* String with language value */
-
-  struct
-  {
-    int		length;			/* Length of attribute */
-    void	*data;			/* Data in attribute */
-  }		unknown;		/* Unknown attribute type */
-
-/**** New in CUPS 1.1.19 ****/
-  ipp_t		*collection;		/* Collection value @since CUPS 1.1.19/Mac OS X 10.3@ */
-} _ipp_value_t;
-
-struct _ipp_attribute_s		/**** Attribute ****/
-{
-  ipp_attribute_t *next;		/* Next attribute in list */
-  ipp_tag_t	group_tag,		/* Job/Printer/Operation group tag */
-		value_tag;		/* What type of value is it? */
-  char		*name;			/* Name of attribute */
-  int		num_values;		/* Number of values */
-  _ipp_value_t	values[1];		/* Values */
-};
-
-struct _ipp_s				/**** IPP Request/Response/Notification ****/
-{
-  ipp_state_t		state;		/* State of request */
-  _ipp_request_t	request;	/* Request header */
-  ipp_attribute_t	*attrs;		/* Attributes */
-  ipp_attribute_t	*last;		/* Last attribute in list */
-  ipp_attribute_t	*current;	/* Current attribute (for read/write) */
-  ipp_tag_t		curtag;		/* Current attribute group tag */
-
-/**** 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.4.4 ****/
-  int			use;		/* Use count @since CUPS 1.4.4/Mac OS X 10.6.?@ */
-};
-
 typedef struct				/**** Attribute mapping data ****/
 {
  int		multivalue;		/* Option has multiple values? */
@@ -151,6 +54,7 @@ typedef struct				/**** Attribute mapping data ****/
  ipp_tag_t	group_tag;		/* Group tag for this attribute */
  ipp_tag_t	alt_group_tag;		/* Alternate group tag for this
 					 * attribute */
+  const ipp_op_t *operations;		/* Allowed operations for this attr */
 } _ipp_option_t;


@@ -158,9 +62,11 @@ typedef struct				/**** Attribute mapping data ****/
 * Prototypes for private functions...
 */

+#ifdef DEBUG
+extern const char	*_ippCheckOptions(void);
+#endif /* DEBUG */
 extern _ipp_option_t	*_ippFindOption(const char *name);

-
 /*
 * C++ magic...
 */
@@ -3,7 +3,7 @@
 *
 *   Internet Printing Protocol definitions for CUPS.
 *
- *   Copyright 2007-2011 by Apple Inc.
+ *   Copyright 2007-2013 by Apple Inc.
 *   Copyright 1997-2006 by Easy Software Products.
 *
 *   These coded instructions, statements, and computer programs are the
@@ -23,6 +23,7 @@
 */

 #  include "http.h"
+#  include <stdarg.h>


 /*
@@ -54,8 +55,16 @@ extern "C" {
 * Common limits...
 */

+#  define IPP_MAX_CHARSET	64	/* Maximum length of charset values w/nul */
+#  define IPP_MAX_KEYWORD	256	/* Maximum length of keyword values w/nul */
+#  define IPP_MAX_LANGUAGE	64	/* Maximum length of naturalLanguage values w/nul */
 #  define IPP_MAX_LENGTH	32767	/* Maximum size of any single value */
-#  define IPP_MAX_NAME		256	/* Maximum length of common name values */
+#  define IPP_MAX_MIMETYPE	256	/* Maximum length of mimeMediaType values w/nul */
+#  define IPP_MAX_NAME		256	/* Maximum length of common name values w/nul */
+#  define IPP_MAX_OCTETSTRING	1023	/* Maximum length of octetString values w/o nul */
+#  define IPP_MAX_TEXT		1024	/* Maximum length of text values w/nul */
+#  define IPP_MAX_URI		1024	/* Maximum length of uri values w/nul */
+#  define IPP_MAX_URISCHEME	64	/* Maximum length of uriScheme values w/nul */
 #  define IPP_MAX_VALUES	8	/* Power-of-2 allocation increment */


@@ -65,14 +74,22 @@ extern "C" {

 typedef enum ipp_dstate_e		/**** Document states ****/
 {
-  IPP_DOCUMENT_PENDING = 3,
-  IPP_DOCUMENT_PROCESSING = 5,
-  IPP_DOCUMENT_CANCELED = 7,
-  IPP_DOCUMENT_ABORTED,
-  IPP_DOCUMENT_COMPLETED
+  IPP_DOCUMENT_PENDING = 3,		/* Document is pending */
+  IPP_DOCUMENT_PROCESSING = 5,		/* Document is processing */
+  IPP_DOCUMENT_CANCELED = 7,		/* Document is canceled */
+  IPP_DOCUMENT_ABORTED,			/* Document is aborted */
+  IPP_DOCUMENT_COMPLETED		/* Document is completed */
+
+#  ifndef _CUPS_NO_DEPRECATED
+#    define IPP_DOCUMENT_PENDING	IPP_DSTATE_PENDING
+#    define IPP_DOCUMENT_PROCESSING	IPP_DSTATE_PROCESSING
+#    define IPP_DOCUMENT_CANCELED	IPP_DSTATE_CANCELED
+#    define IPP_DOCUMENT_ABORTED	IPP_DSTATE_ABORTED
+#    define IPP_DOCUMENT_COMPLETED	IPP_DSTATE_COMPLETED
+#  endif /* !_CUPS_NO_DEPRECATED */
 } ipp_dstate_t;

-typedef enum ipp_finish_e		/**** Finishings ****/
+typedef enum ipp_finishings_e		/**** Finishings ****/
 {
  IPP_FINISHINGS_NONE = 3,		/* No finishing */
  IPP_FINISHINGS_STAPLE,		/* Staple (any location) */
@@ -85,7 +102,7 @@ typedef enum ipp_finish_e		/**** Finishings ****/
  IPP_FINISHINGS_TRIM,			/* Trim (any type) */
  IPP_FINISHINGS_BALE,			/* Bale (any type) */
  IPP_FINISHINGS_BOOKLET_MAKER,		/* Fold to make booklet */
-  IPP_FINISHINGS_JOB_OFFSET,		/* Offset for binding (any type) */
+  IPP_FINISHINGS_JOG_OFFSET,		/* Offset for binding (any type) */
  IPP_FINISHINGS_STAPLE_TOP_LEFT = 20,	/* Staple top left corner */
  IPP_FINISHINGS_STAPLE_BOTTOM_LEFT,	/* Staple bottom left corner */
  IPP_FINISHINGS_STAPLE_TOP_RIGHT,	/* Staple top right corner */
@@ -105,125 +122,274 @@ typedef enum ipp_finish_e		/**** Finishings ****/
  IPP_FINISHINGS_TRIM_AFTER_PAGES = 60,	/* Trim output after each page */
  IPP_FINISHINGS_TRIM_AFTER_DOCUMENTS,	/* Trim output after each document */
  IPP_FINISHINGS_TRIM_AFTER_COPIES,	/* Trim output after each copy */
-  IPP_FINISHINGS_TRIM_AFTER_JOB		/* Trim output after job */
-} ipp_finish_t;
+  IPP_FINISHINGS_TRIM_AFTER_JOB,	/* Trim output after job */
+
+  /* Proposed extensions for finishings */
+  IPP_FINISHINGS_CUPS_PUNCH_TOP_LEFT = 0x40000046,
+					/* Punch 1 hole top left */
+  IPP_FINISHINGS_CUPS_PUNCH_BOTTOM_LEFT,/* Punch 1 hole bottom left */
+  IPP_FINISHINGS_CUPS_PUNCH_TOP_RIGHT,	/* Punch 1 hole top right */
+  IPP_FINISHINGS_CUPS_PUNCH_BOTTOM_RIGHT,
+					/* Punch 1 hole bottom right */
+  IPP_FINISHINGS_CUPS_PUNCH_DUAL_LEFT,	/* Punch 2 holes left side */
+  IPP_FINISHINGS_CUPS_PUNCH_DUAL_TOP,	/* Punch 2 holes top edge */
+  IPP_FINISHINGS_CUPS_PUNCH_DUAL_RIGHT,	/* Punch 2 holes right side */
+  IPP_FINISHINGS_CUPS_PUNCH_DUAL_BOTTOM,/* Punch 2 holes bottom edge */
+  IPP_FINISHINGS_CUPS_PUNCH_TRIPLE_LEFT,/* Punch 3 holes left side */
+  IPP_FINISHINGS_CUPS_PUNCH_TRIPLE_TOP,	/* Punch 3 holes top edge */
+  IPP_FINISHINGS_CUPS_PUNCH_TRIPLE_RIGHT,
+					/* Punch 3 holes right side */
+  IPP_FINISHINGS_CUPS_PUNCH_TRIPLE_BOTTOM,
+					/* Punch 3 holes bottom edge */
+  IPP_FINISHINGS_CUPS_PUNCH_QUAD_LEFT,	/* Punch 4 holes left side */
+  IPP_FINISHINGS_CUPS_PUNCH_QUAD_TOP,	/* Punch 4 holes top edge */
+  IPP_FINISHINGS_CUPS_PUNCH_QUAD_RIGHT,	/* Punch 4 holes right side */
+  IPP_FINISHINGS_CUPS_PUNCH_QUAD_BOTTOM,/* Punch 4 holes bottom edge */
+
+  IPP_FINISHINGS_CUPS_FOLD_ACCORDIAN = 0x4000005A,
+					/* Accordian-fold the paper vertically into four sections */
+  IPP_FINISHINGS_CUPS_FOLD_DOUBLE_GATE,	/* Fold the top and bottom quarters of the paper towards the midline, then fold in half vertically */
+  IPP_FINISHINGS_CUPS_FOLD_GATE,	/* Fold the top and bottom quarters of the paper towards the midline */
+  IPP_FINISHINGS_CUPS_FOLD_HALF,	/* Fold the paper in half vertically */
+  IPP_FINISHINGS_CUPS_FOLD_HALF_Z,	/* Fold the paper in half horizontally, then Z-fold the paper vertically */
+  IPP_FINISHINGS_CUPS_FOLD_LEFT_GATE,	/* Fold the top quarter of the paper towards the midline */
+  IPP_FINISHINGS_CUPS_FOLD_LETTER,	/* Fold the paper into three sections vertically; sometimes also known as a C fold*/
+  IPP_FINISHINGS_CUPS_FOLD_PARALLEL,	/* Fold the paper in half vertically two times, yielding four sections */
+  IPP_FINISHINGS_CUPS_FOLD_POSTER,	/* Fold the paper in half horizontally and vertically; sometimes also called a cross fold */
+  IPP_FINISHINGS_CUPS_FOLD_RIGHT_GATE,	/* Fold the bottom quarter of the paper towards the midline */
+  IPP_FINISHINGS_CUPS_FOLD_Z		/* Fold the paper vertically into three sections, forming a Z */
+} ipp_finishings_t;
+#  ifndef _CUPS_NO_DEPRECATED
+#    define IPP_FINISHINGS_JOB_OFFSET	IPP_FINISHINGS_JOG_OFFSET
+					/* Long-time misspelling... */
+typedef enum ipp_finishings_e ipp_finish_t;
+#  endif /* !_CUPS_NO_DEPRECATED */

 typedef enum ipp_jcollate_e		/**** Job collation types ****/
 {
-  IPP_JOB_UNCOLLATED_SHEETS = 3,
-  IPP_JOB_COLLATED_DOCUMENTS,
-  IPP_JOB_UNCOLLATED_DOCUMENTS
+  IPP_JCOLLATE_UNCOLLATED_SHEETS = 3,
+  IPP_JCOLLATE_COLLATED_DOCUMENTS,
+  IPP_JCOLLATE_UNCOLLATED_DOCUMENTS
+
+#  ifndef _CUPS_NO_DEPRECATED
+#    define IPP_JOB_UNCOLLATED_SHEETS		IPP_JCOLLATE_UNCOLLATED_SHEETS
+#    define IPP_JOB_COLLATED_DOCUMENTS		IPP_JCOLLATE_COLLATED_DOCUMENTS
+#    define IPP_JOB_UNCOLLATED_DOCUMENTS	IPP_JCOLLATE_UNCOLLATED_DOCUMENTS
+#  endif /* !_CUPS_NO_DEPRECATED */
 } ipp_jcollate_t;

 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 */
-  IPP_JOB_PROCESSING,			/* Job is currently printing */
-  IPP_JOB_STOPPED,			/* Job has been stopped */
-  IPP_JOB_CANCELED,			/* Job has been canceled */
-  IPP_JOB_ABORTED,			/* Job has aborted due to error */
-  IPP_JOB_COMPLETED			/* Job has completed successfully */
+  IPP_JSTATE_PENDING = 3,		/* Job is waiting to be printed */
+  IPP_JSTATE_HELD,			/* Job is held for printing */
+  IPP_JSTATE_PROCESSING,		/* Job is currently printing */
+  IPP_JSTATE_STOPPED,			/* Job has been stopped */
+  IPP_JSTATE_CANCELED,			/* Job has been canceled */
+  IPP_JSTATE_ABORTED,			/* Job has aborted due to error */
+  IPP_JSTATE_COMPLETED			/* Job has completed successfully */
+
+#  ifndef _CUPS_NO_DEPRECATED
+#    define IPP_JOB_PENDING	IPP_JSTATE_PENDING
+#    define IPP_JOB_HELD	IPP_JSTATE_HELD
+#    define IPP_JOB_PROCESSING	IPP_JSTATE_PROCESSING
+#    define IPP_JOB_STOPPED	IPP_JSTATE_STOPPED
+#    define IPP_JOB_CANCELED	IPP_JSTATE_CANCELED
+#    define IPP_JOB_ABORTED	IPP_JSTATE_ABORTED
+#    define IPP_JOB_COMPLETED	IPP_JSTATE_COMPLETED
  /* Legacy name for canceled state */
-#define IPP_JOB_CANCELLED IPP_JOB_CANCELED
+#    define IPP_JOB_CANCELLED	IPP_JSTATE_CANCELED
+#  endif /* !_CUPS_NO_DEPRECATED */
 } ipp_jstate_t;

 typedef enum ipp_op_e			/**** IPP operations ****/
 {
  IPP_OP_CUPS_INVALID = -1,		/* Invalid operation name for @link ippOpValue@ */
-  IPP_PRINT_JOB = 0x0002,		/* Print a single file */
-  IPP_PRINT_URI,			/* Print a single URL @private@ */
-  IPP_VALIDATE_JOB,			/* Validate job options */
-  IPP_CREATE_JOB,			/* Create an empty print job */
-  IPP_SEND_DOCUMENT,			/* Add a file to a job */
-  IPP_SEND_URI,				/* Add a URL to a job @private@ */
-  IPP_CANCEL_JOB,			/* Cancel a job */
-  IPP_GET_JOB_ATTRIBUTES,		/* Get job attributes */
-  IPP_GET_JOBS,				/* Get a list of jobs */
-  IPP_GET_PRINTER_ATTRIBUTES,		/* Get printer attributes */
-  IPP_HOLD_JOB,				/* Hold a job for printing */
-  IPP_RELEASE_JOB,			/* Release a job for printing */
-  IPP_RESTART_JOB,			/* Reprint a job */
-  IPP_PAUSE_PRINTER = 0x0010,		/* Stop a printer */
-  IPP_RESUME_PRINTER,			/* Start a printer */
-  IPP_PURGE_JOBS,			/* Cancel all jobs */
-  IPP_SET_PRINTER_ATTRIBUTES,		/* Set printer attributes @private@ */
-  IPP_SET_JOB_ATTRIBUTES,		/* Set job attributes */
-  IPP_GET_PRINTER_SUPPORTED_VALUES,	/* Get supported attribute values */
-  IPP_CREATE_PRINTER_SUBSCRIPTION,	/* Create a printer subscription @since CUPS 1.2/Mac OS X 10.5@ */
-  IPP_CREATE_JOB_SUBSCRIPTION,		/* Create a job subscription @since CUPS 1.2/Mac OS X 10.5@ */
-  IPP_GET_SUBSCRIPTION_ATTRIBUTES,	/* Get subscription attributes @since CUPS 1.2/Mac OS X 10.5@ */
-  IPP_GET_SUBSCRIPTIONS,		/* Get list of subscriptions @since CUPS 1.2/Mac OS X 10.5@ */
-  IPP_RENEW_SUBSCRIPTION,		/* Renew a printer subscription @since CUPS 1.2/Mac OS X 10.5@ */
-  IPP_CANCEL_SUBSCRIPTION,		/* Cancel a subscription @since CUPS 1.2/Mac OS X 10.5@ */
-  IPP_GET_NOTIFICATIONS,		/* Get notification events @since CUPS 1.2/Mac OS X 10.5@ */
-  IPP_SEND_NOTIFICATIONS,		/* Send notification events @private@ */
-  IPP_GET_RESOURCE_ATTRIBUTES,		/* Get resource attributes @private@ */
-  IPP_GET_RESOURCE_DATA,		/* Get resource data @private@ */
-  IPP_GET_RESOURCES,			/* Get list of resources @private@ */
-  IPP_GET_PRINT_SUPPORT_FILES,		/* Get printer support files @private@ */
-  IPP_ENABLE_PRINTER,			/* Start a printer */
-  IPP_DISABLE_PRINTER,			/* Stop a printer */
-  IPP_PAUSE_PRINTER_AFTER_CURRENT_JOB,	/* Stop printer after the current job @private@ */
-  IPP_HOLD_NEW_JOBS,			/* Hold new jobs @private@ */
-  IPP_RELEASE_HELD_NEW_JOBS,		/* Release new jobs @private@ */
-  IPP_DEACTIVATE_PRINTER,		/* Stop a printer @private@ */
-  IPP_ACTIVATE_PRINTER,			/* Start a printer @private@ */
-  IPP_RESTART_PRINTER,			/* Restart a printer @private@ */
-  IPP_SHUTDOWN_PRINTER,			/* Turn a printer off @private@ */
-  IPP_STARTUP_PRINTER,			/* Turn a printer on @private@ */
-  IPP_REPROCESS_JOB,			/* Reprint a job @private@ */
-  IPP_CANCEL_CURRENT_JOB,		/* Cancel the current job @private@ */
-  IPP_SUSPEND_CURRENT_JOB,		/* Suspend the current job @private@ */
-  IPP_RESUME_JOB,			/* Resume the current job @private@ */
-  IPP_PROMOTE_JOB,			/* Promote a job to print sooner @private@ */
-  IPP_SCHEDULE_JOB_AFTER,		/* Schedule a job to print after another @private@ */
-  IPP_CANCEL_DOCUMENT = 0x0033,		/* Cancel-Document @private@ */
-  IPP_GET_DOCUMENT_ATTRIBUTES,		/* Get-Document-Attributes @private@ */
-  IPP_GET_DOCUMENTS,			/* Get-Documents @private@ */
-  IPP_DELETE_DOCUMENT,			/* Delete-Document @private@ */
-  IPP_SET_DOCUMENT_ATTRIBUTES,		/* Set-Document-Attributes @private@ */
-  IPP_CANCEL_JOBS,			/* Cancel-Jobs */
-  IPP_CANCEL_MY_JOBS,			/* Cancel-My-Jobs */
-  IPP_RESUBMIT_JOB,			/* Resubmit-Job */
-  IPP_CLOSE_JOB,			/* Close-Job */
-  IPP_IDENTIFY_PRINTER,			/* Identify-Printer (proposed IPP JPS3) */
-  IPP_PRIVATE = 0x4000,			/* Reserved @private@ */
-  CUPS_GET_DEFAULT,			/* Get the default printer */
-  CUPS_GET_PRINTERS,			/* Get a list of printers and/or classes */
-  CUPS_ADD_MODIFY_PRINTER,		/* Add or modify a printer */
-  CUPS_DELETE_PRINTER,			/* Delete a printer */
-  CUPS_GET_CLASSES,			/* Get a list of classes @deprecated@ */
-  CUPS_ADD_MODIFY_CLASS,		/* Add or modify a class */
-  CUPS_DELETE_CLASS,			/* Delete a class */
-  CUPS_ACCEPT_JOBS,			/* Accept new jobs on a printer */
-  CUPS_REJECT_JOBS,			/* Reject new jobs on a printer */
-  CUPS_SET_DEFAULT,			/* Set the default printer */
-  CUPS_GET_DEVICES,			/* Get a list of supported devices */
-  CUPS_GET_PPDS,			/* Get a list of supported drivers */
-  CUPS_MOVE_JOB,			/* Move a job to a different printer */
-  CUPS_AUTHENTICATE_JOB,		/* Authenticate a job @since CUPS 1.2/Mac OS X 10.5@ */
-  CUPS_GET_PPD,				/* Get a PPD file @since CUPS 1.3/Mac OS X 10.5@ */
-  CUPS_GET_DOCUMENT = 0x4027		/* Get a document file @since CUPS 1.4/Mac OS X 10.6@ */
+  IPP_OP_CUPS_NONE = 0,			/* No operation @private@ */
+  IPP_OP_PRINT_JOB = 0x0002,		/* Print a single file */
+  IPP_OP_PRINT_URI,			/* Print a single URL @private@ */
+  IPP_OP_VALIDATE_JOB,			/* Validate job options */
+  IPP_OP_CREATE_JOB,			/* Create an empty print job */
+  IPP_OP_SEND_DOCUMENT,			/* Add a file to a job */
+  IPP_OP_SEND_URI,			/* Add a URL to a job @private@ */
+  IPP_OP_CANCEL_JOB,			/* Cancel a job */
+  IPP_OP_GET_JOB_ATTRIBUTES,		/* Get job attributes */
+  IPP_OP_GET_JOBS,			/* Get a list of jobs */
+  IPP_OP_GET_PRINTER_ATTRIBUTES,	/* Get printer attributes */
+  IPP_OP_HOLD_JOB,			/* Hold a job for printing */
+  IPP_OP_RELEASE_JOB,			/* Release a job for printing */
+  IPP_OP_RESTART_JOB,			/* Reprint a job */
+  IPP_OP_PAUSE_PRINTER = 0x0010,	/* Stop a printer */
+  IPP_OP_RESUME_PRINTER,		/* Start a printer */
+  IPP_OP_PURGE_JOBS,			/* Cancel all jobs */
+  IPP_OP_SET_PRINTER_ATTRIBUTES,	/* Set printer attributes @private@ */
+  IPP_OP_SET_JOB_ATTRIBUTES,		/* Set job attributes */
+  IPP_OP_GET_PRINTER_SUPPORTED_VALUES,	/* Get supported attribute values */
+  IPP_OP_CREATE_PRINTER_SUBSCRIPTION,	/* Create a printer subscription @since CUPS 1.2/OS X 10.5@ */
+  IPP_OP_CREATE_JOB_SUBSCRIPTION,	/* Create a job subscription @since CUPS 1.2/OS X 10.5@ */
+  IPP_OP_GET_SUBSCRIPTION_ATTRIBUTES,	/* Get subscription attributes @since CUPS 1.2/OS X 10.5@ */
+  IPP_OP_GET_SUBSCRIPTIONS,		/* Get list of subscriptions @since CUPS 1.2/OS X 10.5@ */
+  IPP_OP_RENEW_SUBSCRIPTION,		/* Renew a printer subscription @since CUPS 1.2/OS X 10.5@ */
+  IPP_OP_CANCEL_SUBSCRIPTION,		/* Cancel a subscription @since CUPS 1.2/OS X 10.5@ */
+  IPP_OP_GET_NOTIFICATIONS,		/* Get notification events @since CUPS 1.2/OS X 10.5@ */
+  IPP_OP_SEND_NOTIFICATIONS,		/* Send notification events @private@ */
+  IPP_OP_GET_RESOURCE_ATTRIBUTES,	/* Get resource attributes @private@ */
+  IPP_OP_GET_RESOURCE_DATA,		/* Get resource data @private@ */
+  IPP_OP_GET_RESOURCES,			/* Get list of resources @private@ */
+  IPP_OP_GET_PRINT_SUPPORT_FILES,	/* Get printer support files @private@ */
+  IPP_OP_ENABLE_PRINTER,		/* Start a printer */
+  IPP_OP_DISABLE_PRINTER,		/* Stop a printer */
+  IPP_OP_PAUSE_PRINTER_AFTER_CURRENT_JOB,
+					/* Stop printer after the current job @private@ */
+  IPP_OP_HOLD_NEW_JOBS,			/* Hold new jobs @private@ */
+  IPP_OP_RELEASE_HELD_NEW_JOBS,		/* Release new jobs @private@ */
+  IPP_OP_DEACTIVATE_PRINTER,		/* Stop a printer @private@ */
+  IPP_OP_ACTIVATE_PRINTER,		/* Start a printer @private@ */
+  IPP_OP_RESTART_PRINTER,		/* Restart a printer @private@ */
+  IPP_OP_SHUTDOWN_PRINTER,		/* Turn a printer off @private@ */
+  IPP_OP_STARTUP_PRINTER,		/* Turn a printer on @private@ */
+  IPP_OP_REPROCESS_JOB,			/* Reprint a job @private@ */
+  IPP_OP_CANCEL_CURRENT_JOB,		/* Cancel the current job @private@ */
+  IPP_OP_SUSPEND_CURRENT_JOB,		/* Suspend the current job @private@ */
+  IPP_OP_RESUME_JOB,			/* Resume the current job @private@ */
+  IPP_OP_PROMOTE_JOB,			/* Promote a job to print sooner @private@ */
+  IPP_OP_SCHEDULE_JOB_AFTER,		/* Schedule a job to print after another @private@ */
+  IPP_OP_CANCEL_DOCUMENT = 0x0033,	/* Cancel-Document @private@ */
+  IPP_OP_GET_DOCUMENT_ATTRIBUTES,	/* Get-Document-Attributes @private@ */
+  IPP_OP_GET_DOCUMENTS,			/* Get-Documents @private@ */
+  IPP_OP_DELETE_DOCUMENT,		/* Delete-Document @private@ */
+  IPP_OP_SET_DOCUMENT_ATTRIBUTES,	/* Set-Document-Attributes @private@ */
+  IPP_OP_CANCEL_JOBS,			/* Cancel-Jobs */
+  IPP_OP_CANCEL_MY_JOBS,		/* Cancel-My-Jobs */
+  IPP_OP_RESUBMIT_JOB,			/* Resubmit-Job */
+  IPP_OP_CLOSE_JOB,			/* Close-Job */
+  IPP_OP_IDENTIFY_PRINTER,		/* Identify-Printer (proposed IPP JPS3) */
+  IPP_OP_VALIDATE_DOCUMENT,		/* Validate-Document (proposed IPP JPS3) */
+  IPP_OP_PRIVATE = 0x4000,		/* Reserved @private@ */
+  IPP_OP_CUPS_GET_DEFAULT,		/* Get the default printer */
+  IPP_OP_CUPS_GET_PRINTERS,		/* Get a list of printers and/or classes */
+  IPP_OP_CUPS_ADD_MODIFY_PRINTER,	/* Add or modify a printer */
+  IPP_OP_CUPS_DELETE_PRINTER,		/* Delete a printer */
+  IPP_OP_CUPS_GET_CLASSES,		/* Get a list of classes @deprecated@ */
+  IPP_OP_CUPS_ADD_MODIFY_CLASS,		/* Add or modify a class */
+  IPP_OP_CUPS_DELETE_CLASS,		/* Delete a class */
+  IPP_OP_CUPS_ACCEPT_JOBS,		/* Accept new jobs on a printer */
+  IPP_OP_CUPS_REJECT_JOBS,		/* Reject new jobs on a printer */
+  IPP_OP_CUPS_SET_DEFAULT,		/* Set the default printer */
+  IPP_OP_CUPS_GET_DEVICES,		/* Get a list of supported devices */
+  IPP_OP_CUPS_GET_PPDS,			/* Get a list of supported drivers */
+  IPP_OP_CUPS_MOVE_JOB,			/* Move a job to a different printer */
+  IPP_OP_CUPS_AUTHENTICATE_JOB,		/* Authenticate a job @since CUPS 1.2/OS X 10.5@ */
+  IPP_OP_CUPS_GET_PPD,			/* Get a PPD file @since CUPS 1.3/OS X 10.5@ */
+  IPP_OP_CUPS_GET_DOCUMENT = 0x4027	/* Get a document file @since CUPS 1.4/OS X 10.6@ */

-  /* Legacy names for the add operations */
-#define CUPS_ADD_PRINTER	CUPS_ADD_MODIFY_PRINTER
-#define CUPS_ADD_CLASS		CUPS_ADD_MODIFY_CLASS
+#  ifndef _CUPS_NO_DEPRECATED
+#    define IPP_PRINT_JOB			IPP_OP_PRINT_JOB
+#    define IPP_PRINT_URI			IPP_OP_PRINT_URI
+#    define IPP_VALIDATE_JOB			IPP_OP_VALIDATE_JOB
+#    define IPP_CREATE_JOB			IPP_OP_CREATE_JOB
+#    define IPP_SEND_DOCUMENT			IPP_OP_SEND_DOCUMENT
+#    define IPP_SEND_URI			IPP_OP_SEND_URI
+#    define IPP_CANCEL_JOB			IPP_OP_CANCEL_JOB
+#    define IPP_GET_JOB_ATTRIBUTES		IPP_OP_GET_JOB_ATTRIBUTES
+#    define IPP_GET_JOBS			IPP_OP_GET_JOBS
+#    define IPP_GET_PRINTER_ATTRIBUTES		IPP_OP_GET_PRINTER_ATTRIBUTES
+#    define IPP_HOLD_JOB			IPP_OP_HOLD_JOB
+#    define IPP_RELEASE_JOB			IPP_OP_RELEASE_JOB
+#    define IPP_RESTART_JOB			IPP_OP_RESTART_JOB
+#    define IPP_PAUSE_PRINTER			IPP_OP_PAUSE_PRINTER
+#    define IPP_RESUME_PRINTER			IPP_OP_RESUME_PRINTER
+#    define IPP_PURGE_JOBS			IPP_OP_PURGE_JOBS
+#    define IPP_SET_PRINTER_ATTRIBUTES		IPP_OP_SET_PRINTER_ATTRIBUTES
+#    define IPP_SET_JOB_ATTRIBUTES		IPP_OP_SET_JOB_ATTRIBUTES
+#    define IPP_GET_PRINTER_SUPPORTED_VALUES	IPP_OP_GET_PRINTER_SUPPORTED_VALUES
+#    define IPP_CREATE_PRINTER_SUBSCRIPTION	IPP_OP_CREATE_PRINTER_SUBSCRIPTION
+#    define IPP_CREATE_JOB_SUBSCRIPTION		IPP_OP_CREATE_JOB_SUBSCRIPTION
+#    define IPP_GET_SUBSCRIPTION_ATTRIBUTES	IPP_OP_GET_SUBSCRIPTION_ATTRIBUTES
+#    define IPP_GET_SUBSCRIPTIONS		IPP_OP_GET_SUBSCRIPTIONS
+#    define IPP_RENEW_SUBSCRIPTION		IPP_OP_RENEW_SUBSCRIPTION
+#    define IPP_CANCEL_SUBSCRIPTION		IPP_OP_CANCEL_SUBSCRIPTION
+#    define IPP_GET_NOTIFICATIONS		IPP_OP_GET_NOTIFICATIONS
+#    define IPP_SEND_NOTIFICATIONS		IPP_OP_SEND_NOTIFICATIONS
+#    define IPP_GET_RESOURCE_ATTRIBUTES		IPP_OP_GET_RESOURCE_ATTRIBUTES
+#    define IPP_GET_RESOURCE_DATA		IPP_OP_GET_RESOURCE_DATA
+#    define IPP_GET_RESOURCES			IPP_OP_GET_RESOURCES
+#    define IPP_GET_PRINT_SUPPORT_FILES		IPP_OP_GET_PRINT_SUPPORT_FILES
+#    define IPP_ENABLE_PRINTER			IPP_OP_ENABLE_PRINTER
+#    define IPP_DISABLE_PRINTER			IPP_OP_DISABLE_PRINTER
+#    define IPP_PAUSE_PRINTER_AFTER_CURRENT_JOB	IPP_OP_PAUSE_PRINTER_AFTER_CURRENT_JOB
+#    define IPP_HOLD_NEW_JOBS			IPP_OP_HOLD_NEW_JOBS
+#    define IPP_RELEASE_HELD_NEW_JOBS		IPP_OP_RELEASE_HELD_NEW_JOBS
+#    define IPP_DEACTIVATE_PRINTER		IPP_OP_DEACTIVATE_PRINTER
+#    define IPP_ACTIVATE_PRINTER		IPP_OP_ACTIVATE_PRINTER
+#    define IPP_RESTART_PRINTER			IPP_OP_RESTART_PRINTER
+#    define IPP_SHUTDOWN_PRINTER		IPP_OP_SHUTDOWN_PRINTER
+#    define IPP_STARTUP_PRINTER			IPP_OP_STARTUP_PRINTER
+#    define IPP_REPROCESS_JOB			IPP_OP_REPROCESS_JOB
+#    define IPP_CANCEL_CURRENT_JOB		IPP_OP_CANCEL_CURRENT_JOB
+#    define IPP_SUSPEND_CURRENT_JOB		IPP_OP_SUSPEND_CURRENT_JOB
+#    define IPP_RESUME_JOB			IPP_OP_RESUME_JOB
+#    define IPP_PROMOTE_JOB			IPP_OP_PROMOTE_JOB
+#    define IPP_SCHEDULE_JOB_AFTER		IPP_OP_SCHEDULE_JOB_AFTER
+#    define IPP_CANCEL_DOCUMENT			IPP_OP_CANCEL_DOCUMENT
+#    define IPP_GET_DOCUMENT_ATTRIBUTES		IPP_OP_GET_DOCUMENT_ATTRIBUTES
+#    define IPP_GET_DOCUMENTS			IPP_OP_GET_DOCUMENTS
+#    define IPP_DELETE_DOCUMENT			IPP_OP_DELETE_DOCUMENT
+#    define IPP_SET_DOCUMENT_ATTRIBUTES		IPP_OP_SET_DOCUMENT_ATTRIBUTES
+#    define IPP_CANCEL_JOBS			IPP_OP_CANCEL_JOBS
+#    define IPP_CANCEL_MY_JOBS			IPP_OP_CANCEL_MY_JOBS
+#    define IPP_RESUBMIT_JOB			IPP_OP_RESUBMIT_JOB
+#    define IPP_CLOSE_JOB			IPP_OP_CLOSE_JOB
+#    define IPP_IDENTIFY_PRINTER		IPP_OP_IDENTIFY_PRINTER
+#    define IPP_VALIDATE_DOCUMENT		IPP_OP_VALIDATE_DOCUMENT
+#    define IPP_PRIVATE				IPP_OP_PRIVATE
+#    define CUPS_GET_DEFAULT			IPP_OP_CUPS_GET_DEFAULT
+#    define CUPS_GET_PRINTERS			IPP_OP_CUPS_GET_PRINTERS
+#    define CUPS_ADD_MODIFY_PRINTER		IPP_OP_CUPS_ADD_MODIFY_PRINTER
+#    define CUPS_DELETE_PRINTER			IPP_OP_CUPS_DELETE_PRINTER
+#    define CUPS_GET_CLASSES			IPP_OP_CUPS_GET_CLASSES
+#    define CUPS_ADD_MODIFY_CLASS		IPP_OP_CUPS_ADD_MODIFY_CLASS
+#    define CUPS_DELETE_CLASS			IPP_OP_CUPS_DELETE_CLASS
+#    define CUPS_ACCEPT_JOBS			IPP_OP_CUPS_ACCEPT_JOBS
+#    define CUPS_REJECT_JOBS			IPP_OP_CUPS_REJECT_JOBS
+#    define CUPS_SET_DEFAULT			IPP_OP_CUPS_SET_DEFAULT
+#    define CUPS_GET_DEVICES			IPP_OP_CUPS_GET_DEVICES
+#    define CUPS_GET_PPDS			IPP_OP_CUPS_GET_PPDS
+#    define CUPS_MOVE_JOB			IPP_OP_CUPS_MOVE_JOB
+#    define CUPS_AUTHENTICATE_JOB		IPP_OP_CUPS_AUTHENTICATE_JOB
+#    define CUPS_GET_PPD			IPP_OP_CUPS_GET_PPD
+#    define CUPS_GET_DOCUMENT			IPP_OP_CUPS_GET_DOCUMENT
+     /* Legacy names */
+#    define CUPS_ADD_PRINTER			IPP_OP_CUPS_ADD_MODIFY_PRINTER
+#    define CUPS_ADD_CLASS			IPP_OP_CUPS_ADD_MODIFY_CLASS
+#  endif /* !_CUPS_NO_DEPRECATED */
 } ipp_op_t;

 typedef enum ipp_orient_e		/**** Orientation values ****/
 {
-  IPP_PORTRAIT = 3,			/* No rotation */
-  IPP_LANDSCAPE,			/* 90 degrees counter-clockwise */
-  IPP_REVERSE_LANDSCAPE,		/* 90 degrees clockwise */
-  IPP_REVERSE_PORTRAIT			/* 180 degrees */
+  IPP_ORIENT_PORTRAIT = 3,		/* No rotation */
+  IPP_ORIENT_LANDSCAPE,			/* 90 degrees counter-clockwise */
+  IPP_ORIENT_REVERSE_LANDSCAPE,		/* 90 degrees clockwise */
+  IPP_ORIENT_REVERSE_PORTRAIT		/* 180 degrees */
+
+#  ifndef _CUPS_NO_DEPRECATED
+#    define IPP_PORTRAIT		IPP_ORIENT_PORTRAIT
+#    define IPP_LANDSCAPE		IPP_ORIENT_LANDSCAPE
+#    define IPP_REVERSE_LANDSCAPE	IPP_ORIENT_REVERSE_LANDSCAPE
+#    define IPP_REVERSE_PORTRAIT	IPP_ORIENT_REVERSE_PORTRAIT
+#  endif /* !_CUPS_NO_DEPRECATED */
 } ipp_orient_t;

 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_IDLE = 3,			/* Printer is idle */
+  IPP_PSTATE_PROCESSING,		/* Printer is working */
+  IPP_PSTATE_STOPPED			/* Printer is stopped */
+
+#  ifndef _CUPS_NO_DEPRECATED
+#    define IPP_PRINTER_IDLE		IPP_PSTATE_IDLE
+#    define IPP_PRINTER_PROCESSING	IPP_PSTATE_PROCESSING
+#    define IPP_PRINTER_STOPPED		IPP_PSTATE_STOPPED
+#  endif /* _CUPS_NO_DEPRECATED */
 } ipp_pstate_t;

 typedef enum ipp_quality_e		/**** Qualities ****/
@@ -241,76 +407,163 @@ typedef enum ipp_res_e			/**** Resolution units ****/

 typedef enum ipp_state_e		/**** IPP states ****/
 {
-  IPP_ERROR = -1,			/* An error occurred */
-  IPP_IDLE,				/* Nothing is happening/request completed */
-  IPP_HEADER,				/* The request header needs to be sent/received */
-  IPP_ATTRIBUTE,			/* One or more attributes need to be sent/received */
-  IPP_DATA				/* IPP request data needs to be sent/received */
+  IPP_STATE_ERROR = -1,			/* An error occurred */
+  IPP_STATE_IDLE,			/* Nothing is happening/request completed */
+  IPP_STATE_HEADER,			/* The request header needs to be sent/received */
+  IPP_STATE_ATTRIBUTE,			/* One or more attributes need to be sent/received */
+  IPP_STATE_DATA			/* IPP request data needs to be sent/received */
+
+#  ifndef _CUPS_NO_DEPRECATED
+#    define IPP_ERROR		IPP_STATE_ERROR
+#    define IPP_IDLE		IPP_STATE_IDLE
+#    define IPP_HEADER		IPP_STATE_HEADER
+#    define IPP_ATTRIBUTE	IPP_STATE_ATTRIBUTE
+#    define IPP_DATA		IPP_STATE_DATA
+#  endif /* !_CUPS_NO_DEPRECATED */
 } ipp_state_t;

 typedef enum ipp_status_e		/**** IPP status codes ****/
 {
  IPP_STATUS_CUPS_INVALID = -1,		/* Invalid status name for @link ippErrorValue@ */
-  IPP_OK = 0x0000,			/* successful-ok */
-  IPP_OK_SUBST,				/* successful-ok-ignored-or-substituted-attributes */
-  IPP_OK_CONFLICT,			/* successful-ok-conflicting-attributes */
-  IPP_OK_IGNORED_SUBSCRIPTIONS,		/* successful-ok-ignored-subscriptions */
-  IPP_OK_IGNORED_NOTIFICATIONS,		/* successful-ok-ignored-notifications @private@ */
-  IPP_OK_TOO_MANY_EVENTS,		/* successful-ok-too-many-events */
-  IPP_OK_BUT_CANCEL_SUBSCRIPTION,	/* successful-ok-but-cancel-subscription @private@ */
-  IPP_OK_EVENTS_COMPLETE,		/* successful-ok-events-complete */
-  IPP_REDIRECTION_OTHER_SITE = 0x200,	/* redirection-other-site @private@ */
-  CUPS_SEE_OTHER = 0x280,		/* cups-see-other */
-  IPP_BAD_REQUEST = 0x0400,		/* client-error-bad-request */
-  IPP_FORBIDDEN,			/* client-error-forbidden */
-  IPP_NOT_AUTHENTICATED,		/* client-error-not-authenticated */
-  IPP_NOT_AUTHORIZED,			/* client-error-not-authorized */
-  IPP_NOT_POSSIBLE,			/* client-error-not-possible */
-  IPP_TIMEOUT,				/* client-error-timeout */
-  IPP_NOT_FOUND,			/* client-error-not-found */
-  IPP_GONE,				/* client-error-gone */
-  IPP_REQUEST_ENTITY,			/* client-error-request-entity-too-large */
-  IPP_REQUEST_VALUE,			/* client-error-request-value-too-long */
-  IPP_DOCUMENT_FORMAT,			/* client-error-document-format-not-supported */
-  IPP_ATTRIBUTES,			/* client-error-attributes-or-values-not-supported */
-  IPP_URI_SCHEME,			/* client-error-uri-scheme-not-supported */
-  IPP_CHARSET,				/* client-error-charset-not-supported */
-  IPP_CONFLICT,				/* client-error-conflicting-attributes */
-  IPP_COMPRESSION_NOT_SUPPORTED,	/* client-error-compression-not-supported */
-  IPP_COMPRESSION_ERROR,		/* client-error-compression-error */
-  IPP_DOCUMENT_FORMAT_ERROR,		/* client-error-document-format-error */
-  IPP_DOCUMENT_ACCESS_ERROR,		/* client-error-document-access-error */
-  IPP_ATTRIBUTES_NOT_SETTABLE,		/* client-error-attributes-not-settable */
-  IPP_IGNORED_ALL_SUBSCRIPTIONS,	/* client-error-ignored-all-subscriptions */
-  IPP_TOO_MANY_SUBSCRIPTIONS,		/* client-error-too-many-subscriptions */
-  IPP_IGNORED_ALL_NOTIFICATIONS,	/* client-error-ignored-all-notifications @private@ */
-  IPP_PRINT_SUPPORT_FILE_NOT_FOUND,	/* client-error-print-support-file-not-found @private@ */
-  IPP_DOCUMENT_PASSWORD_ERROR,		/* client-error-document-password-error */
-  IPP_DOCUMENT_PERMISSION_ERROR,	/* client-error-document-permission-error */
-  IPP_DOCUMENT_SECURITY_ERROR,		/* client-error-document-security-error */
-  IPP_DOCUMENT_UNPRINTABLE_ERROR,	/* client-error-document-unprintable-error */
+  IPP_STATUS_OK = 0x0000,		/* successful-ok */
+  IPP_STATUS_OK_IGNORED_OR_SUBSTITUTED,	/* successful-ok-ignored-or-substituted-attributes */
+  IPP_STATUS_OK_CONFLICTING,		/* successful-ok-conflicting-attributes */
+  IPP_STATUS_OK_IGNORED_SUBSCRIPTIONS,	/* successful-ok-ignored-subscriptions */
+  IPP_STATUS_OK_IGNORED_NOTIFICATIONS,	/* successful-ok-ignored-notifications @private@ */
+  IPP_STATUS_OK_TOO_MANY_EVENTS,	/* successful-ok-too-many-events */
+  IPP_STATUS_OK_BUT_CANCEL_SUBSCRIPTION,/* successful-ok-but-cancel-subscription @private@ */
+  IPP_STATUS_OK_EVENTS_COMPLETE,	/* successful-ok-events-complete */
+  IPP_STATUS_REDIRECTION_OTHER_SITE = 0x0200,
+					/* redirection-other-site @private@ */
+  IPP_STATUS_CUPS_SEE_OTHER = 0x0280,	/* cups-see-other */
+  IPP_STATUS_ERROR_BAD_REQUEST = 0x0400,/* client-error-bad-request */
+  IPP_STATUS_ERROR_FORBIDDEN,		/* client-error-forbidden */
+  IPP_STATUS_ERROR_NOT_AUTHENTICATED,	/* client-error-not-authenticated */
+  IPP_STATUS_ERROR_NOT_AUTHORIZED,	/* client-error-not-authorized */
+  IPP_STATUS_ERROR_NOT_POSSIBLE,	/* client-error-not-possible */
+  IPP_STATUS_ERROR_TIMEOUT,		/* client-error-timeout */
+  IPP_STATUS_ERROR_NOT_FOUND,		/* client-error-not-found */
+  IPP_STATUS_ERROR_GONE,		/* client-error-gone */
+  IPP_STATUS_ERROR_REQUEST_ENTITY,	/* client-error-request-entity-too-large */
+  IPP_STATUS_ERROR_REQUEST_VALUE,	/* client-error-request-value-too-long */
+  IPP_STATUS_ERROR_DOCUMENT_FORMAT_NOT_SUPPORTED,
+					/* client-error-document-format-not-supported */
+  IPP_STATUS_ERROR_ATTRIBUTES_OR_VALUES,/* client-error-attributes-or-values-not-supported */
+  IPP_STATUS_ERROR_URI_SCHEME,		/* client-error-uri-scheme-not-supported */
+  IPP_STATUS_ERROR_CHARSET,		/* client-error-charset-not-supported */
+  IPP_STATUS_ERROR_CONFLICTING,		/* client-error-conflicting-attributes */
+  IPP_STATUS_ERROR_COMPRESSION_NOT_SUPPORTED,
+					/* client-error-compression-not-supported */
+  IPP_STATUS_ERROR_COMPRESSION_ERROR,	/* client-error-compression-error */
+  IPP_STATUS_ERROR_DOCUMENT_FORMAT_ERROR,
+					/* client-error-document-format-error */
+  IPP_STATUS_ERROR_DOCUMENT_ACCESS,	/* client-error-document-access-error */
+  IPP_STATUS_ERROR_ATTRIBUTES_NOT_SETTABLE,
+					/* client-error-attributes-not-settable */
+  IPP_STATUS_ERROR_IGNORED_ALL_SUBSCRIPTIONS,
+					/* client-error-ignored-all-subscriptions */
+  IPP_STATUS_ERROR_TOO_MANY_SUBSCRIPTIONS,
+					/* client-error-too-many-subscriptions */
+  IPP_STATUS_ERROR_IGNORED_ALL_NOTIFICATIONS,
+					/* client-error-ignored-all-notifications @private@ */
+  IPP_STATUS_ERROR_PRINT_SUPPORT_FILE_NOT_FOUND,
+					/* client-error-print-support-file-not-found @private@ */
+  IPP_STATUS_ERROR_DOCUMENT_PASSWORD,	/* client-error-document-password-error */
+  IPP_STATUS_ERROR_DOCUMENT_PERMISSION,	/* client-error-document-permission-error */
+  IPP_STATUS_ERROR_DOCUMENT_SECURITY,	/* client-error-document-security-error */
+  IPP_STATUS_ERROR_DOCUMENT_UNPRINTABLE,/* client-error-document-unprintable-error */

-  IPP_INTERNAL_ERROR = 0x0500,		/* server-error-internal-error */
-  IPP_OPERATION_NOT_SUPPORTED,		/* server-error-operation-not-supported */
-  IPP_SERVICE_UNAVAILABLE,		/* server-error-service-unavailable */
-  IPP_VERSION_NOT_SUPPORTED,		/* server-error-version-not-supported */
-  IPP_DEVICE_ERROR,			/* server-error-device-error */
-  IPP_TEMPORARY_ERROR,			/* server-error-temporary-error */
-  IPP_NOT_ACCEPTING,			/* server-error-not-accepting-jobs */
-  IPP_PRINTER_BUSY,			/* server-error-busy */
-  IPP_ERROR_JOB_CANCELED,		/* server-error-job-canceled */
-  IPP_MULTIPLE_JOBS_NOT_SUPPORTED,	/* server-error-multiple-document-jobs-not-supported */
-  IPP_PRINTER_IS_DEACTIVATED,		/* server-error-printer-is-deactivated */
-  IPP_TOO_MANY_JOBS,			/* server-error-too-many-jobs */
-  IPP_TOO_MANY_DOCUMENTS,		/* server-error-too-many-documents */
+  /* Proposed extensions for paid printing */
+  IPP_STATUS_ERROR_CUPS_ACCOUNT_INFO_NEEDED = 0x049C,
+					/* cups-error-account-info-needed @since CUPS 1.7@ */
+  IPP_STATUS_ERROR_CUPS_ACCOUNT_CLOSED,	/* cups-error-account-closed @since CUPS 1.7@ */
+  IPP_STATUS_ERROR_CUPS_ACCOUNT_LIMIT_REACHED,
+					/* cups-error-account-limit-reached @since CUPS 1.7@ */
+  IPP_STATUS_ERROR_CUPS_ACCOUNT_AUTHORIZATION_FAILED,
+					/* cups-error-account-authorization-failed @since CUPS 1.7@ */

-  IPP_AUTHENTICATION_CANCELED = 0x1000,	/* Authentication canceled by user @since CUPS 1.5/Mac OS X 10.7@ */
-  IPP_PKI_ERROR,			/* Error negotiating a secure connection @since CUPS 1.5/Mac OS X 10.7@ */
-  IPP_UPGRADE_REQUIRED			/* TLS upgrade required */
+  IPP_STATUS_ERROR_INTERNAL = 0x0500,	/* server-error-internal-error */
+  IPP_STATUS_ERROR_OPERATION_NOT_SUPPORTED,
+					/* server-error-operation-not-supported */
+  IPP_STATUS_ERROR_SERVICE_UNAVAILABLE,	/* server-error-service-unavailable */
+  IPP_STATUS_ERROR_VERSION_NOT_SUPPORTED,
+					/* server-error-version-not-supported */
+  IPP_STATUS_ERROR_DEVICE,		/* server-error-device-error */
+  IPP_STATUS_ERROR_TEMPORARY,		/* server-error-temporary-error */
+  IPP_STATUS_ERROR_NOT_ACCEPTING_JOBS,	/* server-error-not-accepting-jobs */
+  IPP_STATUS_ERROR_BUSY,		/* server-error-busy */
+  IPP_STATUS_ERROR_JOB_CANCELED,	/* server-error-job-canceled */
+  IPP_STATUS_ERROR_MULTIPLE_JOBS_NOT_SUPPORTED,
+					/* server-error-multiple-document-jobs-not-supported */
+  IPP_STATUS_ERROR_PRINTER_IS_DEACTIVATED,
+					/* server-error-printer-is-deactivated */
+  IPP_STATUS_ERROR_TOO_MANY_JOBS,	/* server-error-too-many-jobs */
+  IPP_STATUS_ERROR_TOO_MANY_DOCUMENTS,	/* server-error-too-many-documents */

-  /* Legacy name for canceled status */
-#define IPP_ERROR_JOB_CANCELLED IPP_ERROR_JOB_CANCELED
+  /* These are internal and never sent over the wire... */
+  IPP_STATUS_ERROR_CUPS_AUTHENTICATION_CANCELED = 0x1000,
+					/* cups-authentication-canceled - Authentication canceled by user @since CUPS 1.5/OS X 10.7@ */
+  IPP_STATUS_ERROR_CUPS_PKI,		/* cups-pki-error - Error negotiating a secure connection @since CUPS 1.5/OS X 10.7@ */
+  IPP_STATUS_ERROR_CUPS_UPGRADE_REQUIRED/* cups-upgrade-required - TLS upgrade required */

+#  ifndef _CUPS_NO_DEPRECATED
+#    define IPP_OK				IPP_STATUS_OK
+#    define IPP_OK_SUBST			IPP_STATUS_OK_IGNORED_OR_SUBSTITUTED
+#    define IPP_OK_CONFLICT			IPP_STATUS_OK_CONFLICTING
+#    define IPP_OK_IGNORED_SUBSCRIPTIONS	IPP_STATUS_OK_IGNORED_SUBSCRIPTIONS
+#    define IPP_OK_IGNORED_NOTIFICATIONS	IPP_STATUS_OK_IGNORED_NOTIFICATIONS
+#    define IPP_OK_TOO_MANY_EVENTS		IPP_STATUS_OK_TOO_MANY_EVENTS
+#    define IPP_OK_BUT_CANCEL_SUBSCRIPTION	IPP_STATUS_OK_BUT_CANCEL_SUBSCRIPTION
+#    define IPP_OK_EVENTS_COMPLETE		IPP_STATUS_OK_EVENTS_COMPLETE
+#    define IPP_REDIRECTION_OTHER_SITE		IPP_STATUS_REDIRECTION_OTHER_SITE
+#    define CUPS_SEE_OTHER			IPP_STATUS_CUPS_SEE_OTHER
+#    define IPP_BAD_REQUEST			IPP_STATUS_ERROR_BAD_REQUEST
+#    define IPP_FORBIDDEN			IPP_STATUS_ERROR_FORBIDDEN
+#    define IPP_NOT_AUTHENTICATED		IPP_STATUS_ERROR_NOT_AUTHENTICATED
+#    define IPP_NOT_AUTHORIZED			IPP_STATUS_ERROR_NOT_AUTHORIZED
+#    define IPP_NOT_POSSIBLE			IPP_STATUS_ERROR_NOT_POSSIBLE
+#    define IPP_TIMEOUT				IPP_STATUS_ERROR_TIMEOUT
+#    define IPP_NOT_FOUND			IPP_STATUS_ERROR_NOT_FOUND
+#    define IPP_GONE				IPP_STATUS_ERROR_GONE
+#    define IPP_REQUEST_ENTITY			IPP_STATUS_ERROR_REQUEST_ENTITY
+#    define IPP_REQUEST_VALUE			IPP_STATUS_ERROR_REQUEST_VALUE
+#    define IPP_DOCUMENT_FORMAT			IPP_STATUS_ERROR_DOCUMENT_FORMAT_NOT_SUPPORTED
+#    define IPP_ATTRIBUTES			IPP_STATUS_ERROR_ATTRIBUTES_OR_VALUES
+#    define IPP_URI_SCHEME			IPP_STATUS_ERROR_URI_SCHEME
+#    define IPP_CHARSET				IPP_STATUS_ERROR_CHARSET
+#    define IPP_CONFLICT			IPP_STATUS_ERROR_CONFLICTING
+#    define IPP_COMPRESSION_NOT_SUPPORTED	IPP_STATUS_ERROR_COMPRESSION_NOT_SUPPORTED
+#    define IPP_COMPRESSION_ERROR		IPP_STATUS_ERROR_COMPRESSION_ERROR
+#    define IPP_DOCUMENT_FORMAT_ERROR		IPP_STATUS_ERROR_DOCUMENT_FORMAT_ERROR
+#    define IPP_DOCUMENT_ACCESS_ERROR		IPP_STATUS_ERROR_DOCUMENT_ACCESS
+#    define IPP_ATTRIBUTES_NOT_SETTABLE		IPP_STATUS_ERROR_ATTRIBUTES_NOT_SETTABLE
+#    define IPP_IGNORED_ALL_SUBSCRIPTIONS	IPP_STATUS_ERROR_IGNORED_ALL_SUBSCRIPTIONS
+#    define IPP_TOO_MANY_SUBSCRIPTIONS		IPP_STATUS_ERROR_TOO_MANY_SUBSCRIPTIONS
+#    define IPP_IGNORED_ALL_NOTIFICATIONS	IPP_STATUS_ERROR_IGNORED_ALL_NOTIFICATIONS
+#    define IPP_PRINT_SUPPORT_FILE_NOT_FOUND	IPP_STATUS_ERROR_PRINT_SUPPORT_FILE_NOT_FOUND
+#    define IPP_DOCUMENT_PASSWORD_ERROR		IPP_STATUS_ERROR_DOCUMENT_PASSWORD
+#    define IPP_DOCUMENT_PERMISSION_ERROR	IPP_STATUS_ERROR_DOCUMENT_PERMISSION
+#    define IPP_DOCUMENT_SECURITY_ERROR		IPP_STATUS_ERROR_DOCUMENT_SECURITY
+#    define IPP_DOCUMENT_UNPRINTABLE_ERROR	IPP_STATUS_ERROR_DOCUMENT_UNPRINTABLE
+#    define IPP_INTERNAL_ERROR			IPP_STATUS_ERROR_INTERNAL
+#    define IPP_OPERATION_NOT_SUPPORTED		IPP_STATUS_ERROR_OPERATION_NOT_SUPPORTED
+#    define IPP_SERVICE_UNAVAILABLE		IPP_STATUS_ERROR_SERVICE_UNAVAILABLE
+#    define IPP_VERSION_NOT_SUPPORTED		IPP_STATUS_ERROR_VERSION_NOT_SUPPORTED
+#    define IPP_DEVICE_ERROR			IPP_STATUS_ERROR_DEVICE
+#    define IPP_TEMPORARY_ERROR			IPP_STATUS_ERROR_TEMPORARY
+#    define IPP_NOT_ACCEPTING			IPP_STATUS_ERROR_NOT_ACCEPTING_JOBS
+#    define IPP_PRINTER_BUSY			IPP_STATUS_ERROR_BUSY
+#    define IPP_ERROR_JOB_CANCELED		IPP_STATUS_ERROR_JOB_CANCELED
+#    define IPP_MULTIPLE_JOBS_NOT_SUPPORTED	IPP_STATUS_ERROR_MULTIPLE_JOBS_NOT_SUPPORTED
+#    define IPP_PRINTER_IS_DEACTIVATED		IPP_STATUS_ERROR_PRINTER_IS_DEACTIVATED
+#    define IPP_TOO_MANY_JOBS			IPP_STATUS_ERROR_TOO_MANY_JOBS
+#    define IPP_TOO_MANY_DOCUMENTS		IPP_STATUS_ERROR_TOO_MANY_DOCUMENTS
+#    define IPP_AUTHENTICATION_CANCELED		IPP_STATUS_ERROR_CUPS_AUTHENTICATION_CANCELED
+#    define IPP_PKI_ERROR			IPP_STATUS_ERROR_CUPS_PKI
+#    define IPP_UPGRADE_REQUIRED		IPP_STATUS_ERROR_CUPS_UPGRADE_REQUIRED
+     /* Legacy name for canceled status */
+#    define IPP_ERROR_JOB_CANCELLED		IPP_STATUS_ERROR_JOB_CANCELED
+#  endif /* _CUPS_NO_DEPRECATED */
 } ipp_status_t;

 typedef enum ipp_tag_e			/**** Format tags for attributes ****/
@@ -355,9 +608,14 @@ typedef enum ipp_tag_e			/**** Format tags for attributes ****/
  IPP_TAG_MIMETYPE,			/* MIME media type value */
  IPP_TAG_MEMBERNAME,			/* Collection member name value */
  IPP_TAG_EXTENSION = 0x7f,		/* Extension point for 32-bit tags */
-  IPP_TAG_MASK = 0x7fffffff,		/* Mask for copied attribute values @private@ */
+  IPP_TAG_CUPS_MASK = 0x7fffffff,	/* Mask for copied attribute values @private@ */
  /* The following expression is used to avoid compiler warnings with +/-0x80000000 */
-  IPP_TAG_COPY = -0x7fffffff-1		/* Bitflag for copied attribute values @private@ */
+  IPP_TAG_CUPS_CONST = -0x7fffffff-1	/* Bitflag for copied/const attribute values @private@ */
+
+#  ifndef _CUPS_NO_DEPRECATED
+#    define IPP_TAG_MASK		IPP_TAG_CUPS_MASK
+#    define IPP_TAG_COPY		IPP_TAG_CUPS_CONST
+#  endif /* !_CUPS_NO_DEPRECATED */
 } ipp_tag_t;

 typedef unsigned char ipp_uchar_t;	/**** Unsigned 8-bit integer/character ****/
@@ -365,14 +623,146 @@ typedef struct _ipp_s ipp_t;		/**** IPP request/response data ****/
 typedef struct _ipp_attribute_s ipp_attribute_t;
 					/**** IPP attribute ****/

-/**** New in CUPS 1.2 ****/
+/**** New in CUPS 1.2/OS X 10.5 ****/
 typedef ssize_t	(*ipp_iocb_t)(void *context, ipp_uchar_t *buffer, size_t bytes);
-					/**** IPP IO Callback Function @since CUPS 1.2/Mac OS X 10.5@ ****/
+					/**** IPP IO Callback Function @since CUPS 1.2/OS X 10.5@ ****/

-/**** New in CUPS 1.6 ****/
+/**** New in CUPS 1.6/OS X 10.8 ****/
 typedef int (*ipp_copycb_t)(void *context, ipp_t *dst, ipp_attribute_t *attr);


+/*
+ * The following structures are PRIVATE starting with CUPS 1.6/OS X 10.8.
+ * Please use the new accessor functions available in CUPS 1.6 and later, as
+ * these definitions will be moved to a private header file in a future release.
+ *
+ * Define _IPP_PRIVATE_STRUCTURES to 1 to cause the private IPP structures to be
+ * exposed in CUPS 1.6.  This happens automatically on OS X when compiling for
+ * a deployment target of 10.7 or earlier.
+ *
+ * Define _IPP_PRIVATE_STRUCTURES to 0 to prevent the private IPP structures
+ * from being exposed.  This is useful when migrating existing code to the new
+ * accessors.
+ */
+
+#  ifdef _IPP_PRIVATE_STRUCTURES
+     /* Somebody has overridden the value */
+#  elif defined(_CUPS_SOURCE) || defined(_CUPS_IPP_PRIVATE_H_)
+     /* Building CUPS */
+#    define _IPP_PRIVATE_STRUCTURES 1
+#  elif defined(__APPLE__)
+#    if defined(MAC_OS_X_VERSION_10_8) && MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_8
+       /* Building for 10.7 and earlier */
+#      define _IPP_PRIVATE_STRUCTURES 1
+#    elif !defined(MAC_OS_X_VERSION_10_8)
+       /* Building for 10.7 and earlier */
+#      define _IPP_PRIVATE_STRUCTURES 1
+#    endif /* MAC_OS_X_VERSION_10_8 && MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_8 */
+#  else
+#    define _IPP_PRIVATE_STRUCTURES 0
+#  endif /* _CUPS_SOURCE || _CUPS_IPP_PRIVATE_H_ */
+
+#  if _IPP_PRIVATE_STRUCTURES
+typedef union _ipp_request_u		/**** Request Header ****/
+{
+  struct				/* Any Header */
+  {
+    ipp_uchar_t	version[2];		/* Protocol version number */
+    int		op_status;		/* Operation ID or status code*/
+    int		request_id;		/* Request ID */
+  }		any;
+
+  struct				/* Operation Header */
+  {
+    ipp_uchar_t	version[2];		/* Protocol version number */
+    ipp_op_t	operation_id;		/* Operation ID */
+    int		request_id;		/* Request ID */
+  }		op;
+
+  struct				/* Status Header */
+  {
+    ipp_uchar_t	version[2];		/* Protocol version number */
+    ipp_status_t status_code;		/* Status code */
+    int		request_id;		/* Request ID */
+  }		status;
+
+  /**** New in CUPS 1.1.19 ****/
+  struct				/* Event Header @since CUPS 1.1.19/OS X 10.3@ */
+  {
+    ipp_uchar_t	version[2];		/* Protocol version number */
+    ipp_status_t status_code;		/* Status code */
+    int		request_id;		/* Request ID */
+  }		event;
+} _ipp_request_t;
+
+/**** New in CUPS 1.1.19 ****/
+
+typedef union _ipp_value_u		/**** Attribute Value ****/
+{
+  int		integer;		/* Integer/enumerated value */
+
+  char		boolean;		/* Boolean value */
+
+  ipp_uchar_t	date[11];		/* Date/time value */
+
+  struct
+  {
+    int		xres,			/* Horizontal resolution */
+		yres;			/* Vertical resolution */
+    ipp_res_t	units;			/* Resolution units */
+  }		resolution;		/* Resolution value */
+
+  struct
+  {
+    int		lower,			/* Lower value */
+		upper;			/* Upper value */
+  }		range;			/* Range of integers value */
+
+  struct
+  {
+    char	*language;		/* Language code */
+    char	*text;			/* String */
+  }		string;			/* String with language value */
+
+  struct
+  {
+    int		length;			/* Length of attribute */
+    void	*data;			/* Data in attribute */
+  }		unknown;		/* Unknown attribute type */
+
+/**** New in CUPS 1.1.19 ****/
+  ipp_t		*collection;		/* Collection value @since CUPS 1.1.19/OS X 10.3@ */
+} _ipp_value_t;
+typedef _ipp_value_t ipp_value_t;	/**** Convenience typedef that will be removed @private@ ****/
+
+struct _ipp_attribute_s			/**** Attribute ****/
+{
+  ipp_attribute_t *next;		/* Next attribute in list */
+  ipp_tag_t	group_tag,		/* Job/Printer/Operation group tag */
+		value_tag;		/* What type of value is it? */
+  char		*name;			/* Name of attribute */
+  int		num_values;		/* Number of values */
+  _ipp_value_t	values[1];		/* Values */
+};
+
+struct _ipp_s				/**** IPP Request/Response/Notification ****/
+{
+  ipp_state_t		state;		/* State of request */
+  _ipp_request_t	request;	/* Request header */
+  ipp_attribute_t	*attrs;		/* Attributes */
+  ipp_attribute_t	*last;		/* Last attribute in list */
+  ipp_attribute_t	*current;	/* Current attribute (for read/write) */
+  ipp_tag_t		curtag;		/* Current attribute group tag */
+
+/**** New in CUPS 1.2 ****/
+  ipp_attribute_t	*prev;		/* Previous attribute (for read) @since CUPS 1.2/OS X 10.5@ */
+
+/**** New in CUPS 1.4.4 ****/
+  int			use;		/* Use count @since CUPS 1.4.4/OS X 10.6.?@ */
+};
+#  endif /* _IPP_PRIVATE_STRUCTURES */
+
+
 /*
 * Prototypes...
 */
@@ -435,7 +825,7 @@ extern void		ippDeleteAttribute(ipp_t *ipp, ipp_attribute_t *attr) _CUPS_API_1_1
 extern ipp_state_t	ippReadFile(int fd, ipp_t *ipp) _CUPS_API_1_1_19;
 extern ipp_state_t	ippWriteFile(int fd, ipp_t *ipp) _CUPS_API_1_1_19;

-/**** New in CUPS 1.2/Mac OS X 10.5 ****/
+/**** New in CUPS 1.2/OS X 10.5 ****/
 extern ipp_attribute_t	*ippAddOctetString(ipp_t *ipp, ipp_tag_t group,
 			                   const char *name,
 					   const void *data, int datalen) _CUPS_API_1_2;
@@ -448,11 +838,11 @@ extern ipp_state_t	ippReadIO(void *src, ipp_iocb_t cb, int blocking,
 extern ipp_state_t	ippWriteIO(void *dst, ipp_iocb_t cb, int blocking,
 			           ipp_t *parent, ipp_t *ipp) _CUPS_API_1_2;

-/**** New in CUPS 1.4/Mac OS X 10.6 ****/
+/**** New in CUPS 1.4/OS X 10.6 ****/
 extern const char	*ippTagString(ipp_tag_t tag) _CUPS_API_1_4;
 extern ipp_tag_t	ippTagValue(const char *name) _CUPS_API_1_4;

-/**** New in CUPS 1.6 ****/
+/**** New in CUPS 1.6/OS X 10.8 ****/
 extern ipp_attribute_t	*ippAddOutOfBand(ipp_t *ipp, ipp_tag_t group,
 			                 ipp_tag_t value_tag, const char *name)
 			                 _CUPS_API_1_6;
@@ -531,6 +921,37 @@ extern int		ippSetValueTag(ipp_t *ipp, ipp_attribute_t **attr,
 extern int		ippSetVersion(ipp_t *ipp, int major, int minor)
 			              _CUPS_API_1_6;

+/**** New in CUPS 1.7 ****/
+extern ipp_attribute_t	*ippAddStringf(ipp_t *ipp, ipp_tag_t group,
+			               ipp_tag_t value_tag, const char *name,
+			               const char *language, const char *format,
+			               ...) _CUPS_API_1_7;
+extern ipp_attribute_t	*ippAddStringfv(ipp_t *ipp, ipp_tag_t group,
+					ipp_tag_t value_tag, const char *name,
+					const char *language,
+					const char *format, va_list ap)
+					_CUPS_API_1_7;
+extern int		ippContainsInteger(ipp_attribute_t *attr, int value)
+			                   _CUPS_API_1_7;
+extern int		ippContainsString(ipp_attribute_t *attr,
+			                  const char *value) _CUPS_API_1_7;
+extern cups_array_t	*ippCreateRequestedArray(ipp_t *request) _CUPS_API_1_7;
+extern void		*ippGetOctetString(ipp_attribute_t *attr, int element,
+			                   int *datalen) _CUPS_API_1_7;
+extern ipp_t		*ippNewResponse(ipp_t *request) _CUPS_API_1_7;
+extern int		ippSetOctetString(ipp_t *ipp, ipp_attribute_t **attr,
+			                  int element, const void *data,
+					  int datalen) _CUPS_API_1_7;
+extern int		ippSetStringf(ipp_t *ipp, ipp_attribute_t **attr,
+			              int element, const char *format,
+				      ...) _CUPS_API_1_7;
+extern int		ippSetStringfv(ipp_t *ipp, ipp_attribute_t **attr,
+			               int element, const char *format,
+				       va_list ap) _CUPS_API_1_7;
+extern int		ippValidateAttribute(ipp_attribute_t *attr)
+			                     _CUPS_API_1_7;
+extern int		ippValidateAttributes(ipp_t *ipp) _CUPS_API_1_7;
+

 /*
 * C++ magic...
@@ -3,7 +3,7 @@
 *
 *   Localized printf/puts functions for CUPS.
 *
- *   Copyright 2007-2011 by Apple Inc.
+ *   Copyright 2007-2012 by Apple Inc.
 *   Copyright 2002-2007 by Easy Software Products.
 *
 *   These coded instructions, statements, and computer programs are the
@@ -304,7 +304,7 @@ _cupsSetLocale(char *argv[])		/* IO - Command-line arguments */
    strlcpy(charset, ".UTF-8", sizeof(new_lc_time) - (charset - new_lc_time));
  }
  else
-    strcpy(new_lc_time, "C");
+    strlcpy(new_lc_time, "C", sizeof(new_lc_time));

  setlocale(LC_TIME, new_lc_time);
 #endif /* LC_TIME */
--- a/Mostrar Mais
+++ b/Mostrar Mais