Tag 1.6.3

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

CHANGES-1.5.txt

@@ -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)

CHANGES-IPPTOOL.txt

@@ -1,107 +0,0 @@
-CHANGES-IPPTOOL.txt - 2012-01-10
---------------------------------
-
-This file provides a list of changes to the ipptool binary distribution posted
-on cups.org.
-
-
-2012-01-10
-
-	- Fixed an issue with the IPP/1.1 test file where the "waiting for job
-	  completion" test did not work.
-	- The attribute groups out of order error was not shown for the
-	  operation-attributes-tag group.
-
-
-2011-12-02
-
-	- Fixed a truncated XML output bug that would happen for certain errors.
-	- Fixed the order-of-groups tests.
-	- Fixed "WITH-VALUE >N" for rangeOfInteger attributes.
-	- The Windows installer was missing the get-printer-attributes.test
-	  file.
-	- The Linux binaries are now compiled for all LSB 4.x-compliant Linux
-	  distributions.
-	- The Linux binaries no longer support SSL or TLS.
-
-
-2011-10-05
-
-	- Fixed a crasher bug that showed up on Windows.
-	- The IPP/1.1 test would hang if the initial Print-Job test failed.
-	- Fixed a typo in the IPP/2.0 test.
-
-
-2011-10-03
-
-	- Using OF-TYPE with the "no-value" or "unknown" out-of-band value tags
-	  now works without special WITH-VALUE strings.
-	- ipptool now shows an error when an attribute appears more than once
-	  within the same attribute group.
-	- ipptool did not display attributes as specified by the DISPLAY
-	  directive when a test error failed.
-	- Fixed one spot where DEFINE-VALUE was still treated as an error when
-	  the EXPECT test failed.
-	- uriScheme values were not displayed properly.
-	- Updated the IPP/1.1 tests to properly validate support for
-	  job-hold-until-default and job-hold-until-supported when the Hold-Job
-	  operation is supported.
-	- Updated the IPP/1.1 tests to properly check for the various standard
-	  media sizes for the printing tests.
-	- Updated the IPP/1.1 tests to accept "no-value" for media-default an
-	  orientation-requested-default.
-	- Updated the IPP/1.1 tests to accept "unknown" for job-state.
-	- Updated the IPP/1.1 tests to not perform the bogus URI printing tests
-	  unless the "document-uri" variable is defined.
-	- Updated the IPP/2.0 tests to properly validate media-col
-	  "media-xxx-supported" attributes.
-	- Updated the IPP/2.2 tests to properly validate media-ready and
-	  media-col-ready.
-
-
-2011-09-28
-
-	- Test output now includes a summary and overall score at the end.
-	- The MATCH-VALUE predicate now correctly deals with a failed EXPECT
-	  condition.
-	- The IPP/1.1 test suite now looks for legacy media names and uses them
-	  if the corresponding PWG standard names are not present.
-	- The IPP/1.1 test suite now tests the Print-Job+Release-Job when the
-	  printer supports the job-hold-until attribute, Hold-Job operation, and
-	  Release-Job operation.
-
-
-2011-09-21
-
-	- Fixes for HTTP chunking, timeout, and encryption issues reported by
-	  various users.
-	- Greatly improved IPP tests with added IPP/2.2 tests.
-	- New test documents - 1-page and 4-page mixed A4/Letter PDF/PS and a
-	  couple JPEGs.
-	- New REPEAT directives to programmatically repeat tests as needed.
-
-
-2011-08-16
-
-	- The Windows version no longer requires Visual Studio to be installed.
-	- The Windows version now supports SSL.
-	- Added "ipps" URI support.
-	- Added a new "-T" option.
-	- Added support for fractional seconds for the -i option and DELAY
-	  directive.
-	- Added support for authentication.
-	- Added DEFINE-MATCH, DEFINE-NO-MATCH, DEFINE-VALUE, IF-NOT-DEFINED,
-	  IGNORE-ERRORS, SKIP-IF-DEFINED, SKIP-IF-NOT-DEFINED,
-	  SKIP-PREVIOUS-ERROR directives.
-	- WITH-VALUE now supports variable expansion.
-	- Updated the IPP/1.1 conformance test to skip the "my-jobs different
-	  user" test if the printer URI contains a username.
-	- Updated the IPP conformance tests to validate media, media-default,
-	  and media-supported values.
-	- No longer error out if a Printer returns a different version number in
-	  the response when the request contains the version 0.0.
-
-
-2010-10-16
-
-	- Initial release of standalone binary.

CHANGES.txt

@@ -1,8 +1,193 @@
-CHANGES.txt - 1.6b1 - 2012-01-30
+CHANGES.txt - 1.6.3 - 2013-07-11
 --------------------------------
 
+CHANGES IN CUPS V1.6.3
+
+	- The configure script now prefers Clang over GCC.
+	- Fixed a compile problem on AIX (STR #4307)
+	- The default IPP version did not always get set before creating a new
+	  IPP request message (<rdar://problem/14401718>)
+	- The lp, lpq, lpr, and lpstat now display an error message advising the
+	  use of the /version=1.1 ServerName option (<rdar://problem/14290628>)
+	- Added documentation about the /version=1.1 option to ServerName in
+	  client.conf (<rdar://problem/14216262>)
+	- httpStatus(HTTP_ERROR) did not return a useful error message
+	  (<rdar://problem/14217326>)
+	- The lp, lpq, lpr, and lpstat commands incorrectly ignored the default
+	  printer set in the lpoptions file (<rdar://problem/14216472>)
+	- Fixed a URI encoding issue for hostnames containing the ` (backquote)
+	  character (<rdar://problem/14243133>)
+	- Added support for RFC 6874's IPv6 link local address format in URIs
+	  (<rdar://problem/13979453>)
+	- The USB backend could crash on libusb-based systems if USB was
+	  disabled in the BIOS (<rdar://problem/13875729>)
+	- Fixed a rounding error in the PWG media size mapping code
+	  (<rdar://problem/13493241>)
+	- Fixed several ipptool test files that used old STATUS names.
+	- Kerberos credentials could get truncated when printing to a shared
+	  printer.
+	- Printing using "ipps" URIs was not encrypted.
+	- 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,
+	  <rdar://problem/13736470>)
+	- 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",

CREDITS.txt

@@ -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.

INSTALL.txt

@@ -1,14 +1,20 @@
-INSTALL - CUPS v1.5.0 - 2011-07-25
+INSTALL - CUPS v1.6.3 - 2013-07-11
 ----------------------------------
 
 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
@@ -34,7 +40,7 @@ BEFORE YOU BEGIN
     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.
+    OS X.
 
 
 COMPILING THE SUBVERSION REPOSITORY CODE

IPPTOOL.txt

@@ -1,4 +1,4 @@
-IPPTOOL.txt - 2011-12-02
+IPPTOOL.txt - 2012-02-06
 ------------------------
 
 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,6 +46,22 @@ 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-printer-attributes.test         Shows printer attributes
+        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
+        print-job.test                      Prints a file
+
+
 CONFORMANCE TESTS
 
     We provide basic IPP conformance tests for IPP/1.1, IPP/2.0, IPP/2.1, and
@@ -71,6 +87,29 @@ 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
+
+    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:
@@ -80,7 +119,9 @@ CONFORMANCE TESTS
     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
@@ -90,7 +131,8 @@ CONFORMANCE TESTS
 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 +160,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 +174,7 @@ REPORTING BUGS
 
 LEGAL STUFF
 
-    CUPS is Copyright 2007-2011 by Apple Inc.  CUPS and the CUPS logo are
+    CUPS is Copyright 2007-2012 by Apple Inc.  CUPS and the CUPS logo are
     trademarks of Apple Inc.
 
     The MD5 Digest code is Copyright 1999 Aladdin Enterprises.

LICENSE.txt

@@ -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

Makedefs.in

@@ -1,5 +1,5 @@
 #
-# "$Id$"
+# "$Id: Makedefs.in 7900 2008-09-03 13:47:57Z mike $"
 #
 #   Common makefile definitions for CUPS.
 #
@@ -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@
 
 #
@@ -256,5 +258,5 @@ DBUSDIR		=	@DBUSDIR@
 
 
 #
-# End of "$Id$"
+# End of "$Id: Makedefs.in 7900 2008-09-03 13:47:57Z mike $"
 #

Makefile

@@ -1,9 +1,9 @@
 #
-# "$Id$"
+# "$Id: Makefile 9391 2010-11-30 21:53:04Z mike $"
 #
 #   Top-level Makefile 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
@@ -99,8 +99,10 @@ clean:
 distclean:	clean
 	$(RM) Makedefs config.h config.log config.status
 	$(RM) cups-config
-	$(RM) conf/cupsd.conf conf/mime.convs conf/pam.std conf/snmp.conf
-	$(RM) doc/help/ref-cupsd-conf.html doc/help/standard.html doc/index.html
+	$(RM) conf/cups-files.conf conf/cupsd.conf
+	$(RM) conf/mime.convs conf/pam.std conf/snmp.conf
+	$(RM) doc/help/ref-cups-files-conf.html doc/help/ref-cupsd-conf.html
+	$(RM) doc/help/standard.html doc/index.html
 	$(RM) man/client.conf.man
 	$(RM) man/cups-deviced.man man/cups-driverd.man
 	$(RM) man/cups-lpd.man man/cupsaddsmb.man man/cupsd.man
@@ -275,10 +277,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
@@ -330,5 +332,5 @@ dist:	all
 
 
 #
-# End of "$Id$".
+# End of "$Id: Makefile 9391 2010-11-30 21:53:04Z mike $".
 #

README.txt

@@ -1,14 +1,13 @@
-README - CUPS v1.5.0 - 2011-07-25
-----------------------------------
+README - CUPS v1.6.3 - 2013-07-11
+---------------------------------
 
-Looking for compile instructions?  Read the file "INSTALL.txt"
-instead...
+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 +149,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.

backend/Dependencies

@@ -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

backend/Makefile

@@ -1,5 +1,5 @@
 #
-# "$Id$"
+# "$Id: Makefile 7924 2008-09-10 17:36:13Z mike $"
 #
 #   Backend makefile for CUPS.
 #
@@ -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,7 +128,7 @@ 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
@@ -226,8 +232,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 +282,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
 
@@ -287,5 +295,5 @@ include Dependencies
 
 
 #
-# End of "$Id$".
+# End of "$Id: Makefile 7924 2008-09-10 17:36:13Z mike $".
 #

backend/backend-private.h

@@ -1,9 +1,9 @@
 /*
- * "$Id$"
+ * "$Id: backend-private.h 7810 2008-07-29 01:11:15Z mike $"
  *
  *   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
@@ -320,5 +334,5 @@ extern int		backendWaitLoop(int snmp_fd, http_addr_t *addr,
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: backend-private.h 7810 2008-07-29 01:11:15Z mike $".
  */

backend/ieee1284.c

@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: ieee1284.c 7687 2008-06-24 01:28:36Z mike $"
  *
  *   IEEE-1284 support functions for CUPS.
  *
@@ -487,5 +487,5 @@ backendGetMakeModel(
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: ieee1284.c 7687 2008-06-24 01:28:36Z mike $".
  */

backend/ipp.c

@@ -1,9 +1,9 @@
 /*
- * "$Id$"
+ * "$Id: ipp.c 9759 2011-05-11 03:24:33Z mike $"
  *
  *   IPP backend 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
@@ -45,8 +45,12 @@
 #  define kPMPrintUIToolAgent	"com.apple.printuitool.agent"
 #  define kPMStartJob		100
 #  define kPMWaitForJob		101
+#  ifdef HAVE_XPC_PRIVATE_H
+#    include <xpc/private.h>
+#  else
 extern void	xpc_connection_set_target_uid(xpc_connection_t connection,
 		                              uid_t uid);
+#  endif /* HAVE_XPC_PRIVATE_H */
 #endif /* HAVE_GSSAPI && HAVE_XPC */
 
 
@@ -62,7 +66,8 @@ typedef struct _cups_monitor_s		/**** Monitoring data ****/
 			*resource;	/* Resource path */
   int			port,		/* Port number */
 			version,	/* IPP version */
-			job_id;		/* Job ID for submitted job */
+			job_id,		/* Job ID for submitted job */
+			get_job_attrs;	/* Support Get-Job-Attributes? */
   const char		*job_name;	/* Job name for submitted job */
   http_encryption_t	encryption;	/* Use encryption? */
   ipp_jstate_t		job_state;	/* Current job state */
@@ -81,6 +86,7 @@ static int		child_pid = 0;	/* Child process ID */
 #endif /* HAVE_GSSAPI && HAVE_XPC */
 static const char * const jattrs[] =	/* Job attributes we want */
 {
+  "job-id",
   "job-impressions-completed",
   "job-media-sheets-completed",
   "job-name",
@@ -90,10 +96,10 @@ static const char * const jattrs[] =	/* Job attributes we want */
 };
 static int		job_canceled = 0;
 					/* Job cancelled? */
-static char		*password = NULL;
+static char		username[256] = "",
+					/* Username for device URI */
+			*password = NULL;
 					/* Password for device URI */
-static int		password_tries = 0;
-					/* Password tries */
 static const char * const pattrs[] =	/* Printer attributes we want */
 {
   "copies-supported",
@@ -158,11 +164,13 @@ static ipp_t		*new_request(ipp_op_t op, int version, const char *uri,
 				     const char *format, _ppd_cache_t *pc,
 				     ipp_attribute_t *media_col_sup,
 				     ipp_attribute_t *doc_handling_sup);
-static const char	*password_cb(const char *);
+static const char	*password_cb(const char *prompt, http_t *http,
+			             const char *method, const char *resource,
+			             int *user_data);
 static void		report_attr(ipp_attribute_t *attr);
 static void		report_printer_state(ipp_t *ipp);
 #if defined(HAVE_GSSAPI) && defined(HAVE_XPC)
-static int		run_as_user(int argc, char *argv[], uid_t uid,
+static int		run_as_user(char *argv[], uid_t uid,
 			            const char *device_uri, int fd);
 #endif /* HAVE_GSSAPI && HAVE_XPC */
 static void		sigterm_handler(int sig);
@@ -189,14 +197,15 @@ main(int  argc,				/* I - Number of command-line args */
   const char	*device_uri;		/* Device URI */
   char		scheme[255],		/* Scheme in URI */
 		hostname[1024],		/* Hostname */
-		username[255],		/* Username info */
 		resource[1024],		/* Resource info (printer name) */
 		addrname[256],		/* Address name */
 		*optptr,		/* Pointer to URI options */
 		*name,			/* Name of option */
 		*value,			/* Value of option */
 		sep;			/* Separator character */
+  int		password_tries = 0;	/* Password tries */
   http_addrlist_t *addrlist;		/* Address of printer */
+  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 */
@@ -236,6 +245,7 @@ main(int  argc,				/* I - Number of command-line args */
   ipp_attribute_t *printer_state;	/* printer-state attribute */
   ipp_attribute_t *printer_accepting;	/* printer-is-accepting-jobs */
   int		create_job = 0,		/* Does printer support Create-Job? */
+		get_job_attrs = 0,	/* Does printer support Get-Job-Attributes? */
 		send_document = 0,	/* Does printer support Send-Document? */
 		validate_job = 0;	/* Does printer support Validate-Job? */
   int		copies,			/* Number of copies for job */
@@ -341,7 +351,7 @@ main(int  argc,				/* I - Number of command-line args */
     if (uid > 0)
     {
       if (argc == 6)
-        return (run_as_user(argc, argv, uid, device_uri, 0));
+        return (run_as_user(argv, uid, device_uri, 0));
       else
       {
         int status = 0;			/* Exit status */
@@ -350,7 +360,7 @@ main(int  argc,				/* I - Number of command-line args */
 	{
 	  if ((fd = open(argv[i], O_RDONLY)) >= 0)
 	  {
-	    status = run_as_user(argc, argv, uid, device_uri, fd);
+	    status = run_as_user(argv, uid, device_uri, fd);
 	    close(fd);
 	  }
 	  else
@@ -397,7 +407,7 @@ main(int  argc,				/* I - Number of command-line args */
   if (!port)
     port = IPP_PORT;			/* Default to port 631 */
 
-  if (!strcmp(scheme, "https"))
+  if (!strcmp(scheme, "https") || !strcmp(scheme, "ipps"))
     cupsSetEncryption(HTTP_ENCRYPT_ALWAYS);
   else
     cupsSetEncryption(HTTP_ENCRYPT_IF_REQUESTED);
@@ -501,6 +511,16 @@ main(int  argc,				/* I - Number of command-line args */
 			       value);
         }
       }
+      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, "version"))
       {
         if (!strcmp(value, "1.0"))
@@ -588,7 +608,7 @@ main(int  argc,				/* I - Number of command-line args */
   * Set the authentication info, if any...
   */
 
-  cupsSetPasswordCB(password_cb);
+  cupsSetPasswordCB2((cups_password_cb2_t)password_cb, &password_tries);
 
   if (username[0])
   {
@@ -610,7 +630,10 @@ main(int  argc,				/* I - Number of command-line args */
     const char *ptr = getenv("AUTH_USERNAME");
 
     if (ptr)
+    {
+      strlcpy(username, ptr, sizeof(username));
       cupsSetUser(ptr);
+    }
 
     password = getenv("AUTH_PASSWORD");
   }
@@ -637,6 +660,9 @@ main(int  argc,				/* I - Number of command-line args */
       update_reasons(NULL, "-connecting-to-device");
       return (CUPS_BACKEND_STOP);
     }
+
+    if (job_canceled)
+      return (CUPS_BACKEND_OK);
   }
 
   http = _httpCreate(hostname, port, addrlist, cupsEncryption(), AF_UNSPEC);
@@ -646,11 +672,14 @@ main(int  argc,				/* I - Number of command-line args */
   * 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;
 
@@ -741,7 +770,7 @@ main(int  argc,				/* I - Number of command-line args */
 	  case ECONNREFUSED :
 	  default :
 	      _cupsLangPrintFilter(stderr, "WARNING",
-	                           _("The printer is busy."));
+	                           _("The printer is in use."));
 	      break;
         }
 
@@ -764,7 +793,9 @@ main(int  argc,				/* I - Number of command-line args */
   }
   while (http->fd < 0);
 
-  if (job_canceled || !http)
+  if (job_canceled)
+    return (CUPS_BACKEND_OK);
+  else if (!http)
     return (CUPS_BACKEND_FAILED);
 
   update_reasons(NULL, "-connecting-to-device");
@@ -839,7 +870,9 @@ main(int  argc,				/* I - Number of command-line args */
     fprintf(stderr, "DEBUG: Get-Printer-Attributes: %s (%s)\n",
             ippErrorString(ipp_status), cupsLastErrorString());
 
-    if (ipp_status > IPP_OK_CONFLICT)
+    if (ipp_status <= IPP_OK_CONFLICT)
+      password_tries = 0;
+    else
     {
       fprintf(stderr, "DEBUG: Get-Printer-Attributes returned %s.\n",
               ippErrorString(ipp_status));
@@ -854,7 +887,7 @@ main(int  argc,				/* I - Number of command-line args */
 	  return (CUPS_BACKEND_FAILED);
 	}
 
-	_cupsLangPrintFilter(stderr, "INFO", _("The printer is busy."));
+	_cupsLangPrintFilter(stderr, "INFO", _("The printer is in use."));
 
         report_printer_state(supported);
 
@@ -872,14 +905,14 @@ main(int  argc,				/* I - Number of command-line args */
         if (version >= 20)
 	{
 	  _cupsLangPrintFilter(stderr, "INFO",
-			       _("Printer does not support IPP/%d.%d, trying "
+			       _("The printer does not support IPP/%d.%d, trying "
 			         "IPP/%s."), version / 10, version % 10, "1.1");
 	  version = 11;
 	}
 	else
 	{
 	  _cupsLangPrintFilter(stderr, "INFO",
-			       _("Printer does not support IPP/%d.%d, trying "
+			       _("The printer does not support IPP/%d.%d, trying "
 			         "IPP/%s."), version / 10, version % 10, "1.0");
 	  version = 10;
         }
@@ -896,20 +929,27 @@ main(int  argc,				/* I - Number of command-line args */
 
 	return (CUPS_BACKEND_STOP);
       }
-      else if (ipp_status == IPP_NOT_AUTHORIZED || ipp_status == IPP_FORBIDDEN)
+      else if (ipp_status == IPP_FORBIDDEN ||
+               ipp_status == IPP_AUTHENTICATION_CANCELED)
       {
-	if (!strncmp(httpGetField(http, HTTP_FIELD_WWW_AUTHENTICATE),
-		     "Negotiate", 9))
+        const char *www_auth = httpGetField(http, HTTP_FIELD_WWW_AUTHENTICATE);
+        				/* WWW-Authenticate field value */
+
+	if (!strncmp(www_auth, "Negotiate", 9))
 	  auth_info_required = "negotiate";
+        else if (www_auth[0])
+          auth_info_required = "username,password";
 
 	fprintf(stderr, "ATTR: auth-info-required=%s\n", auth_info_required);
 	return (CUPS_BACKEND_AUTH_REQUIRED);
       }
-      else
+      else if (ipp_status != IPP_NOT_AUTHORIZED)
       {
 	_cupsLangPrintFilter(stderr, "ERROR",
 	                     _("Unable to get printer status."));
         sleep(10);
+
+	httpReconnect(http);
       }
 
       ippDelete(supported);
@@ -937,9 +977,15 @@ main(int  argc,				/* I - Number of command-line args */
 
       if ((printer_state = ippFindAttribute(supported,
 					    "printer-state-reasons",
-					    IPP_TAG_KEYWORD)) != NULL && !busy)
+					    IPP_TAG_KEYWORD)) == NULL)
+      {
+        update_reasons(NULL, "+cups-ipp-conformance-failure-report,"
+			     "cups-ipp-missing-printer-state-reasons");
+      }
+      else if (!busy)
       {
 	for (i = 0; i < printer_state->num_values; i ++)
+	{
 	  if (!strcmp(printer_state->values[0].string.text,
 	              "spool-area-full") ||
 	      !strncmp(printer_state->values[0].string.text, "spool-area-full-",
@@ -948,14 +994,12 @@ main(int  argc,				/* I - Number of command-line args */
 	    busy = 1;
 	    break;
 	  }
+	}
       }
-      else
-        update_reasons(NULL, "+cups-ipp-conformance-failure-report,"
-			     "cups-ipp-missing-printer-state-reasons");
 
       if (busy)
       {
-	_cupsLangPrintFilter(stderr, "INFO", _("The printer is busy."));
+	_cupsLangPrintFilter(stderr, "INFO", _("The printer is in use."));
 
 	report_printer_state(supported);
 
@@ -1014,6 +1058,12 @@ main(int  argc,				/* I - Number of command-line args */
     if ((operations_sup = ippFindAttribute(supported, "operations-supported",
 					   IPP_TAG_ENUM)) != NULL)
     {
+      fprintf(stderr, "DEBUG: operations-supported (%d values)\n",
+              operations_sup->num_values);
+      for (i = 0; i < operations_sup->num_values; i ++)
+        fprintf(stderr, "DEBUG: [%d] = %s\n", i,
+                ippOpString(operations_sup->values[i].integer));
+
       for (i = 0; i < operations_sup->num_values; i ++)
         if (operations_sup->values[i].integer == IPP_PRINT_JOB)
 	  break;
@@ -1054,13 +1104,18 @@ main(int  argc,				/* I - Number of command-line args */
 	  create_job = 1;
         else if (operations_sup->values[i].integer == IPP_SEND_DOCUMENT)
 	  send_document = 1;
+        else if (operations_sup->values[i].integer == IPP_GET_JOB_ATTRIBUTES)
+	  get_job_attrs = 1;
       }
 
-      if (!send_document)
+      if (create_job && !send_document)
       {
         fputs("DEBUG: Printer supports Create-Job but not Send-Document.\n",
               stderr);
         create_job = 0;
+
+	update_reasons(NULL, "+cups-ipp-conformance-failure-report,"
+                             "cups-ipp-missing-send-document");
       }
 
       if (!validate_job)
@@ -1077,7 +1132,10 @@ main(int  argc,				/* I - Number of command-line args */
 
     report_printer_state(supported);
   }
-  while (ipp_status > IPP_OK_CONFLICT);
+  while (!job_canceled && ipp_status > IPP_OK_CONFLICT);
+
+  if (job_canceled)
+    return (CUPS_BACKEND_OK);
 
  /*
   * See if the printer is accepting jobs and is not stopped; if either
@@ -1128,12 +1186,7 @@ main(int  argc,				/* I - Number of command-line args */
   copies = atoi(argv[4]);
 
   if (copies_sup || argc < 7)
-  {
     copies_remaining = 1;
-
-    if (argc < 7 && !_cups_strncasecmp(final_content_type, "image/", 6))
-      copies = 1;
-  }
   else
     copies_remaining = copies;
 
@@ -1168,7 +1221,8 @@ main(int  argc,				/* I - Number of command-line args */
   if (format_sup != NULL)
   {
     for (i = 0; i < format_sup->num_values; i ++)
-      if (!_cups_strcasecmp(final_content_type, format_sup->values[i].string.text))
+      if (!_cups_strcasecmp(final_content_type,
+                            format_sup->values[i].string.text))
       {
         document_format = final_content_type;
 	break;
@@ -1178,7 +1232,7 @@ main(int  argc,				/* I - Number of command-line args */
     {
       for (i = 0; i < format_sup->num_values; i ++)
 	if (!_cups_strcasecmp("application/octet-stream",
-	                format_sup->values[i].string.text))
+	                      format_sup->values[i].string.text))
 	{
 	  document_format = "application/octet-stream";
 	  break;
@@ -1186,6 +1240,9 @@ main(int  argc,				/* I - Number of command-line args */
     }
   }
 
+  fprintf(stderr, "DEBUG: final_content_type=\"%s\", document_format=\"%s\"\n",
+          final_content_type, document_format ? document_format : "(null)");
+
  /*
   * If the printer does not support HTTP/1.1 (which IPP requires), copy stdin
   * to a temporary file so that we can do a HTTP/1.0 submission...
@@ -1203,8 +1260,17 @@ main(int  argc,				/* I - Number of command-line args */
 
     _cupsLangPrintFilter(stderr, "INFO", _("Copying print data."));
 
-    compatsize = backendRunLoop(-1, fd, snmp_fd, &(addrlist->addr), 0, 0,
-		                backendNetworkSideCB);
+    if ((compatsize = write(fd, buffer, bytes)) < 0)
+    {
+      perror("DEBUG: Unable to write temporary file");
+      return (CUPS_BACKEND_FAILED);
+    }
+
+    if ((bytes = backendRunLoop(-1, fd, snmp_fd, &(addrlist->addr), 0, 0,
+		                backendNetworkSideCB)) < 0)
+      return (CUPS_BACKEND_FAILED);
+
+    compatsize += bytes;
 
     close(fd);
 
@@ -1220,6 +1286,17 @@ main(int  argc,				/* I - Number of command-line args */
       compatsize = fileinfo.st_size;
   }
 
+ /*
+  * If the printer only claims to support IPP/1.0, or if the user specifically
+  * included version=1.0 in the URI, then do not try to use Create-Job or
+  * Send-Document.  This is another dreaded compatibility hack, but
+  * unfortunately there are enough broken printers out there that we need
+  * this for now...
+  */
+
+  if (version == 10)
+    create_job = send_document = 0;
+
  /*
   * Start monitoring the printer in the background...
   */
@@ -1231,6 +1308,7 @@ main(int  argc,				/* I - Number of command-line args */
   monitor.port          = port;
   monitor.version       = version;
   monitor.job_id        = 0;
+  monitor.get_job_attrs = get_job_attrs;
   monitor.encryption    = cupsEncryption();
   monitor.job_state     = IPP_JOB_PENDING;
   monitor.printer_state = IPP_PRINTER_IDLE;
@@ -1271,29 +1349,21 @@ main(int  argc,				/* I - Number of command-line args */
 
     if (ipp_status == IPP_SERVICE_UNAVAILABLE || ipp_status == IPP_PRINTER_BUSY)
     {
-      _cupsLangPrintFilter(stderr, "INFO", _("The printer is busy."));
+      _cupsLangPrintFilter(stderr, "INFO", _("The printer is in use."));
       sleep(10);
     }
-    else if (ipp_status == IPP_NOT_AUTHORIZED || ipp_status == IPP_FORBIDDEN ||
+    else if (ipp_status == IPP_DOCUMENT_FORMAT)
+      goto cleanup;
+    else if (ipp_status == IPP_FORBIDDEN ||
 	     ipp_status == IPP_AUTHENTICATION_CANCELED)
     {
-     /*
-      * Update auth-info-required as needed...
-      */
+      const char *www_auth = httpGetField(http, HTTP_FIELD_WWW_AUTHENTICATE);
+					/* WWW-Authenticate field value */
 
-      fprintf(stderr, "DEBUG: WWW-Authenticate=\"%s\"\n",
-	      httpGetField(http, HTTP_FIELD_WWW_AUTHENTICATE));
-
-     /*
-      * Normal authentication goes through the password callback, which sets
-      * auth_info_required to "username,password".  Kerberos goes directly
-      * through GSSAPI, so look for Negotiate in the WWW-Authenticate header
-      * here and set auth_info_required as needed...
-      */
-
-      if (!strncmp(httpGetField(http, HTTP_FIELD_WWW_AUTHENTICATE),
-		   "Negotiate", 9))
+      if (!strncmp(www_auth, "Negotiate", 9))
 	auth_info_required = "negotiate";
+      else if (www_auth[0])
+	auth_info_required = "username,password";
 
       goto cleanup;
     }
@@ -1307,7 +1377,8 @@ main(int  argc,				/* I - Number of command-line args */
 			   "cups-ipp-missing-validate-job");
       break;
     }
-    else if (ipp_status < IPP_REDIRECTION_OTHER_SITE)
+    else if (ipp_status < IPP_REDIRECTION_OTHER_SITE ||
+             ipp_status == IPP_BAD_REQUEST)
       break;
   }
 
@@ -1429,7 +1500,7 @@ main(int  argc,				/* I - Number of command-line args */
           ipp_status == IPP_NOT_POSSIBLE ||
 	  ipp_status == IPP_PRINTER_BUSY)
       {
-	_cupsLangPrintFilter(stderr, "INFO", _("The printer is busy."));
+	_cupsLangPrintFilter(stderr, "INFO", _("The printer is in use."));
 	sleep(10);
 
 	if (num_files == 0)
@@ -1442,7 +1513,8 @@ main(int  argc,				/* I - Number of command-line args */
 	  goto cleanup;
 	}
       }
-      else if (ipp_status == IPP_ERROR_JOB_CANCELED)
+      else if (ipp_status == IPP_ERROR_JOB_CANCELED ||
+               ipp_status == IPP_NOT_AUTHORIZED)
         goto cleanup;
       else
       {
@@ -1453,21 +1525,24 @@ main(int  argc,				/* I - Number of command-line args */
         _cupsLangPrintFilter(stderr, "ERROR",
 	                     _("Print file was not accepted."));
 
-	if (ipp_status == IPP_NOT_AUTHORIZED || ipp_status == IPP_FORBIDDEN)
+        if (ipp_status == IPP_FORBIDDEN ||
+            ipp_status == IPP_AUTHENTICATION_CANCELED)
 	{
-	  fprintf(stderr, "DEBUG: WWW-Authenticate=\"%s\"\n",
-		  httpGetField(http, HTTP_FIELD_WWW_AUTHENTICATE));
+	  const char *www_auth = httpGetField(http, HTTP_FIELD_WWW_AUTHENTICATE);
+					/* WWW-Authenticate field value */
 
-         /*
-	  * Normal authentication goes through the password callback, which sets
-	  * auth_info_required to "username,password".  Kerberos goes directly
-	  * through GSSAPI, so look for Negotiate in the WWW-Authenticate header
-	  * here and set auth_info_required as needed...
+	  if (!strncmp(www_auth, "Negotiate", 9))
+	    auth_info_required = "negotiate";
+	  else if (www_auth[0])
+	    auth_info_required = "username,password";
+	}
+	else if (ipp_status == IPP_REQUEST_VALUE)
+	{
+	 /*
+	  * Print file is too large, abort this job...
 	  */
 
-	  if (!strncmp(httpGetField(http, HTTP_FIELD_WWW_AUTHENTICATE),
-		       "Negotiate", 9))
-	    auth_info_required = "negotiate";
+	  goto cleanup;
 	}
 	else
 	  sleep(10);
@@ -1494,6 +1569,7 @@ main(int  argc,				/* I - Number of command-line args */
     }
     else
     {
+      password_tries = 0;
       monitor.job_id = job_id = job_id_attr->values[0].integer;
       _cupsLangPrintFilter(stderr, "INFO",
                            _("Print file accepted - job ID %d."), job_id);
@@ -1536,8 +1612,13 @@ main(int  argc,				/* I - Number of command-line args */
         if ((i + 1) >= num_files)
 	  ippAddBoolean(request, IPP_TAG_OPERATION, "last-document", 1);
 
-        ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_MIMETYPE,
-	             "document-format", NULL, document_format);
+	if (document_format)
+	  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_MIMETYPE,
+		       "document-format", NULL, document_format);
+
+        if (compression)
+	  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_KEYWORD,
+		       "compression", NULL, compression);
 
 	fprintf(stderr, "DEBUG: Sending file %d using chunking...\n", i + 1);
 	http_status = cupsSendRequest(http, request, resource, 0);
@@ -1562,10 +1643,11 @@ main(int  argc,				/* I - Number of command-line args */
 
 	if (fd >= 0)
 	{
-	  while (!job_canceled &&
+	  while (!job_canceled && http_status == HTTP_CONTINUE &&
 	         (bytes = read(fd, buffer, sizeof(buffer))) > 0)
 	  {
-	    if (cupsWriteRequestData(http, buffer, bytes) != HTTP_CONTINUE)
+	    if ((http_status = cupsWriteRequestData(http, buffer, bytes))
+	            != HTTP_CONTINUE)
 	      break;
 	    else
 	    {
@@ -1595,8 +1677,13 @@ main(int  argc,				/* I - Number of command-line args */
 			       _("Unable to add document to print job."));
 	  break;
 	}
-	else if (num_files == 0 || fd < 0)
-	  break;
+	else
+	{
+	  password_tries = 0;
+
+	  if (num_files == 0 || fd < 0)
+	    break;
+	}
       }
     }
 
@@ -1608,7 +1695,72 @@ main(int  argc,				/* I - Number of command-line args */
     else if (ipp_status == IPP_SERVICE_UNAVAILABLE ||
              ipp_status == IPP_NOT_POSSIBLE ||
 	     ipp_status == IPP_PRINTER_BUSY)
+    {
+      if (argc == 6)
+      {
+       /*
+        * Need to reprocess the entire job; if we have a job ID, cancel the
+        * job first...
+        */
+
+	if (job_id > 0)
+	  cancel_job(http, uri, job_id, resource, argv[2], version);
+
+        goto cleanup;
+      }
       continue;
+    }
+    else if (ipp_status == IPP_REQUEST_VALUE ||
+             ipp_status == IPP_ERROR_JOB_CANCELED ||
+             ipp_status == IPP_NOT_AUTHORIZED ||
+             ipp_status == IPP_INTERNAL_ERROR)
+    {
+     /*
+      * Print file is too large, job was canceled, we need new
+      * authentication data, or we had some sort of error...
+      */
+
+      goto cleanup;
+    }
+    else if (ipp_status == IPP_UPGRADE_REQUIRED)
+    {
+     /*
+      * Server is configured incorrectly; the policy for Create-Job and
+      * Send-Document has to be the same (auth or no auth, encryption or
+      * no encryption).  Force the queue to stop since printing will never
+      * work.
+      */
+
+      fputs("DEBUG: The server or printer is configured incorrectly.\n",
+            stderr);
+      fputs("DEBUG: The policy for Create-Job and Send-Document must have the "
+            "same authentication and encryption requirements.\n", stderr);
+
+      ipp_status = IPP_INTERNAL_ERROR;
+
+      if (job_id > 0)
+	cancel_job(http, uri, job_id, resource, argv[2], version);
+
+      goto cleanup;
+    }
+    else if (ipp_status == IPP_NOT_FOUND)
+    {
+     /*
+      * Printer does not actually implement support for Create-Job/
+      * Send-Document, so log the conformance issue and stop the printer.
+      */
+
+      fputs("DEBUG: This printer claims to support Create-Job and "
+            "Send-Document, but those operations failed.\n", stderr);
+      fputs("DEBUG: Add '?version=1.0' to the device URI to use legacy "
+            "compatibility mode.\n", stderr);
+      update_reasons(NULL, "+cups-ipp-conformance-failure-report,"
+			   "cups-ipp-missing-send-document");
+
+      ipp_status = IPP_INTERNAL_ERROR;	/* Force queue to stop */
+
+      goto cleanup;
+    }
     else
       copies_remaining --;
 
@@ -1616,7 +1768,7 @@ main(int  argc,				/* I - Number of command-line args */
     * Wait for the job to complete...
     */
 
-    if (!job_id || !waitjob)
+    if (!job_id || !waitjob || !get_job_attrs)
       continue;
 
     _cupsLangPrintFilter(stderr, "INFO", _("Waiting for job to complete."));
@@ -1659,7 +1811,7 @@ main(int  argc,				/* I - Number of command-line args */
       response   = cupsDoRequest(http, request, resource);
       ipp_status = cupsLastError();
 
-      if (ipp_status == IPP_NOT_FOUND)
+      if (ipp_status == IPP_NOT_FOUND || ipp_status == IPP_NOT_POSSIBLE)
       {
        /*
         * Job has gone away and/or the server has no job history...
@@ -1676,16 +1828,14 @@ main(int  argc,				/* I - Number of command-line args */
       fprintf(stderr, "DEBUG: Get-Job-Attributes: %s (%s)\n",
 	      ippErrorString(ipp_status), cupsLastErrorString());
 
-      if (ipp_status > IPP_OK_CONFLICT)
+      if (ipp_status <= IPP_OK_CONFLICT)
+	password_tries = 0;
+      else
       {
 	if (ipp_status != IPP_SERVICE_UNAVAILABLE &&
-	    ipp_status != IPP_NOT_POSSIBLE &&
 	    ipp_status != IPP_PRINTER_BUSY)
 	{
 	  ippDelete(response);
-
-          _cupsLangPrintFilter(stderr, "ERROR",
-			       _("Unable to get print job status."));
           ipp_status = IPP_OK;
           break;
 	}
@@ -1747,6 +1897,9 @@ main(int  argc,				/* I - Number of command-line args */
 
       ippDelete(response);
 
+      if (cupsLastError() <= IPP_OK_CONFLICT)
+        password_tries = 0;
+
      /*
       * Wait before polling again...
       */
@@ -1761,7 +1914,7 @@ main(int  argc,				/* I - Number of command-line args */
   * Cancel the job as needed...
   */
 
-  if (job_canceled && job_id)
+  if (job_canceled > 0 && job_id > 0)
     cancel_job(http, uri, job_id, resource, argv[2], version);
 
  /*
@@ -1770,12 +1923,16 @@ main(int  argc,				/* I - Number of command-line args */
 
   check_printer_state(http, uri, resource, argv[2], version);
 
+  if (cupsLastError() <= IPP_OK_CONFLICT)
+    password_tries = 0;
+
  /*
   * Collect the final page count as needed...
   */
 
   if (have_supplies &&
-      !backendSNMPSupplies(snmp_fd, http->hostaddr, &page_count, NULL) &&
+      !backendSNMPSupplies(snmp_fd, &(http->addrlist->addr), &page_count,
+                           NULL) &&
       page_count > start_count)
     fprintf(stderr, "PAGE: total %d\n", page_count - start_count);
 
@@ -1830,16 +1987,25 @@ main(int  argc,				/* I - Number of command-line args */
     return (CUPS_BACKEND_AUTH_REQUIRED);
   else if (ipp_status == IPP_INTERNAL_ERROR)
     return (CUPS_BACKEND_STOP);
-  else if (ipp_status == IPP_DOCUMENT_FORMAT ||
-           ipp_status == IPP_CONFLICT)
+  else if (ipp_status == IPP_CONFLICT)
     return (CUPS_BACKEND_FAILED);
+  else if (ipp_status == IPP_REQUEST_VALUE ||
+           ipp_status == IPP_DOCUMENT_FORMAT || job_canceled < 0)
+  {
+    if (ipp_status == IPP_REQUEST_VALUE)
+      _cupsLangPrintFilter(stderr, "ERROR", _("Print job too large."));
+    else if (ipp_status == IPP_DOCUMENT_FORMAT)
+      _cupsLangPrintFilter(stderr, "ERROR",
+                           _("Printer cannot print supplied content."));
+    else
+      _cupsLangPrintFilter(stderr, "ERROR", _("Print job canceled at printer."));
+
+    return (CUPS_BACKEND_CANCEL);
+  }
   else if (ipp_status > IPP_OK_CONFLICT && ipp_status != IPP_ERROR_JOB_CANCELED)
     return (CUPS_BACKEND_RETRY_CURRENT);
   else
-  {
-    _cupsLangPrintFilter(stderr, "INFO", _("Ready to print."));
     return (CUPS_BACKEND_OK);
-  }
 }
 
 
@@ -2033,6 +2199,7 @@ monitor_printer(
   const char	*job_name;		/* Job name */
   ipp_jstate_t	job_state;		/* Job state */
   const char	*job_user;		/* Job originating user name */
+  int		password_tries = 0;	/* Password tries */
 
 
  /*
@@ -2042,7 +2209,9 @@ monitor_printer(
   http = _httpCreate(monitor->hostname, monitor->port, NULL, monitor->encryption,
                      AF_UNSPEC);
   httpSetTimeout(http, 30.0, timeout_cb, NULL);
-  cupsSetPasswordCB(password_cb);
+  if (username[0])
+    cupsSetUser(username);
+  cupsSetPasswordCB2((cups_password_cb2_t)password_cb, &password_tries);
 
  /*
   * Loop until the job is canceled, aborted, or completed.
@@ -2066,12 +2235,15 @@ monitor_printer(
                                                    monitor->resource,
 						   monitor->user,
 						   monitor->version);
+      if (cupsLastError() <= IPP_OK_CONFLICT)
+        password_tries = 0;
 
      /*
       * Check the status of the job itself...
       */
 
-      job_op  = monitor->job_id > 0 ? IPP_GET_JOB_ATTRIBUTES : IPP_GET_JOBS;
+      job_op  = (monitor->job_id > 0 && monitor->get_job_attrs) ?
+                    IPP_GET_JOB_ATTRIBUTES : IPP_GET_JOBS;
       request = ippNewRequest(job_op);
       request->request.op.version[0] = monitor->version / 10;
       request->request.op.version[1] = monitor->version % 10;
@@ -2096,9 +2268,12 @@ monitor_printer(
 
       response = cupsDoRequest(http, request, monitor->resource);
 
-      fprintf(stderr, "DEBUG: %s: %s (%s)\n", ippOpString(job_op),
+      fprintf(stderr, "DEBUG: (monitor) %s: %s (%s)\n", ippOpString(job_op),
 	      ippErrorString(cupsLastError()), cupsLastErrorString());
 
+      if (cupsLastError() <= IPP_OK_CONFLICT)
+        password_tries = 0;
+
       if (job_op == IPP_GET_JOB_ATTRIBUTES)
       {
 	if ((attr = ippFindAttribute(response, "job-state",
@@ -2157,6 +2332,14 @@ monitor_printer(
 
       ippDelete(response);
 
+      fprintf(stderr, "DEBUG: (monitor) job-state=%s\n",
+              ippEnumString("job-state", monitor->job_state));
+
+      if (!job_canceled &&
+          (monitor->job_state == IPP_JOB_CANCELED ||
+	   monitor->job_state == IPP_JOB_ABORTED))
+	job_canceled = -1;
+
      /*
       * Disconnect from the printer - we'll reconnect on the next poll...
       */
@@ -2177,7 +2360,7 @@ monitor_printer(
   * Cancel the job if necessary...
   */
 
-  if (job_canceled && monitor->job_id > 0)
+  if (job_canceled > 0 && monitor->job_id > 0)
     if (!httpReconnect(http))
       cancel_job(http, monitor->uri, monitor->job_id, monitor->resource,
                  monitor->user, monitor->version);
@@ -2258,7 +2441,7 @@ new_request(
     fprintf(stderr, "DEBUG: job-name=\"%s\"\n", title);
   }
 
-  if (format)
+  if (format && op != IPP_CREATE_JOB)
   {
     ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_MIMETYPE,
 		 "document-format", NULL, format);
@@ -2266,7 +2449,7 @@ new_request(
   }
 
 #ifdef HAVE_LIBZ
-  if (compression)
+  if (compression && op != IPP_CREATE_JOB)
   {
     ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_KEYWORD,
 		 "compression", NULL, compression);
@@ -2405,9 +2588,46 @@ new_request(
 		       NULL, "two-sided-short-edge");
       }
 
-      if (doc_handling_sup &&
-          (!format || _cups_strncasecmp(format, "image/", 6)) &&
- 	  (keyword = cupsGetOption("collate", num_options, options)) != NULL)
+      if ((keyword = cupsGetOption("multiple-document-handling",
+				   num_options, options)) != NULL)
+      {
+        if (strstr(keyword, "uncollated"))
+          keyword = "false";
+        else
+          keyword = "true";
+      }
+      else if ((keyword = cupsGetOption("collate", num_options,
+                                        options)) == NULL)
+        keyword = "true";
+
+      if (format)
+      {
+        if (!_cups_strcasecmp(format, "image/gif") ||
+	    !_cups_strcasecmp(format, "image/jp2") ||
+	    !_cups_strcasecmp(format, "image/jpeg") ||
+	    !_cups_strcasecmp(format, "image/png") ||
+	    !_cups_strcasecmp(format, "image/tiff") ||
+	    !_cups_strncasecmp(format, "image/x-", 8))
+	{
+	 /*
+	  * Collation makes no sense for single page image formats...
+	  */
+
+	  keyword = "false";
+	}
+	else if (!_cups_strncasecmp(format, "image/", 6) ||
+	         !_cups_strcasecmp(format, "application/vnd.cups-raster"))
+	{
+	 /*
+	  * Multi-page image formats will have copies applied by the upstream
+	  * filters...
+	  */
+
+	  copies = 1;
+	}
+      }
+
+      if (doc_handling_sup)
       {
         if (!_cups_strcasecmp(keyword, "true"))
 	  collate_str = "separate-documents-collated-copies";
@@ -2421,6 +2641,9 @@ new_request(
 			 "multiple-document-handling", NULL, collate_str);
 	    break;
           }
+
+        if (i >= doc_handling_sup->num_values)
+          copies = 1;
       }
 
      /*
@@ -2466,10 +2689,10 @@ new_request(
       * When talking to another CUPS server, send all options...
       */
 
-      cupsEncodeOptions(request, num_options, options);
+      cupsEncodeOptions2(request, num_options, options, IPP_TAG_JOB);
     }
 
-    if (copies > 1)
+    if (copies > 1 && (!pc || copies <= pc->max_copies))
       ippAddInteger(request, IPP_TAG_JOB, IPP_TAG_INTEGER, "copies", copies);
   }
 
@@ -2482,9 +2705,20 @@ new_request(
  */
 
 static const char *			/* O - Password  */
-password_cb(const char *prompt)		/* I - Prompt (not used) */
+password_cb(const char *prompt,		/* I - Prompt (not used) */
+            http_t     *http,		/* I - Connection */
+            const char *method,		/* I - Request method (not used) */
+            const char *resource,	/* I - Resource path (not used) */
+            int        *password_tries)	/* I - Password tries */
 {
+  fprintf(stderr, "DEBUG: password_cb(prompt=\"%s\", http=%p, method=\"%s\", "
+                  "resource=\"%s\", password_tries=%p(%d)), password=%p\n",
+          prompt, http, method, resource, password_tries, *password_tries,
+          password);
+
   (void)prompt;
+  (void)method;
+  (void)resource;
 
  /*
   * Remember that we need to authenticate...
@@ -2492,9 +2726,9 @@ password_cb(const char *prompt)		/* I - Prompt (not used) */
 
   auth_info_required = "username,password";
 
-  if (password && *password && password_tries < 3)
+  if (password && *password && *password_tries < 3)
   {
-    password_tries ++;
+    (*password_tries) ++;
 
     return (password);
   }
@@ -2546,17 +2780,23 @@ report_attr(ipp_attribute_t *attr)	/* I - Attribute */
       case IPP_TAG_TEXT :
       case IPP_TAG_NAME :
       case IPP_TAG_KEYWORD :
+          *valptr++ = '\'';
           *valptr++ = '\"';
 	  for (attrptr = attr->values[i].string.text;
 	       *attrptr && valptr < (value + sizeof(value) - 10);
 	       attrptr ++)
 	  {
-	    if (*attrptr == '\\' || *attrptr == '\"')
+	    if (*attrptr == '\\' || *attrptr == '\"' || *attrptr == '\'')
+	    {
 	      *valptr++ = '\\';
+	      *valptr++ = '\\';
+	      *valptr++ = '\\';
+	    }
 
 	    *valptr++ = *attrptr;
 	  }
           *valptr++ = '\"';
+          *valptr++ = '\'';
           break;
 
       default :
@@ -2713,8 +2953,7 @@ report_printer_state(ipp_t *ipp)	/* I - IPP response */
  */
 
 static int				/* O - Exit status */
-run_as_user(int        argc,		/* I - Number of command-line args */
-	    char       *argv[],		/* I - Command-line arguments */
+run_as_user(char       *argv[],		/* I - Command-line arguments */
 	    uid_t      uid,		/* I - User ID */
 	    const char *device_uri,	/* I - Device URI */
 	    int        fd)		/* I - File to print */
@@ -2905,6 +3144,8 @@ sigterm_handler(int sig)		/* I - Signal */
 {
   (void)sig;	/* remove compiler warnings... */
 
+  write(2, "DEBUG: Got SIGTERM.\n", 20);
+
 #if defined(HAVE_GSSAPI) && defined(HAVE_XPC)
   if (child_pid)
   {
@@ -2919,6 +3160,8 @@ sigterm_handler(int sig)		/* I - Signal */
     * Flag that the job should be canceled...
     */
 
+    write(2, "DEBUG: job_canceled = 1.\n", 25);
+
     job_canceled = 1;
     return;
   }
@@ -3148,5 +3391,5 @@ update_reasons(ipp_attribute_t *attr,	/* I - printer-state-reasons or NULL */
 }
 
 /*
- * End of "$Id$".
+ * End of "$Id: ipp.c 9759 2011-05-11 03:24:33Z mike $".
  */

backend/lpd.c

@@ -1,9 +1,9 @@
 /*
- * "$Id$"
+ * "$Id: lpd.c 7740 2008-07-14 23:58:05Z mike $"
  *
  *   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...
@@ -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,6 +867,23 @@ 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."));
 
@@ -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.
  */
@@ -1338,5 +1331,5 @@ sigterm_handler(int sig)		/* I - Signal */
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: lpd.c 7740 2008-07-14 23:58:05Z mike $".
  */

backend/network.c

@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: network.c 3755 2012-03-30 05:59:14Z msweet $"
  *
  *   Common backend network APIs for CUPS.
  *
@@ -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
@@ -296,5 +322,5 @@ backendNetworkSideCB(
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: network.c 3755 2012-03-30 05:59:14Z msweet $".
  */

backend/runloop.c

@@ -1,9 +1,9 @@
 /*
- * "$Id$"
+ * "$Id: runloop.c 9565 2011-02-23 00:08:08Z mike $"
  *
  *   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;
     }
@@ -519,5 +539,5 @@ backendWaitLoop(
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: runloop.c 9565 2011-02-23 00:08:08Z mike $".
  */

backend/snmp-supplies.c

@@ -1,9 +1,9 @@
 /*
- * "$Id$"
+ * "$Id: snmp-supplies.c 4298 2013-05-10 16:52:10Z msweet $"
  *
  *   SNMP supplies functions 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
@@ -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,13 +293,31 @@ 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)
+      if ((supplies[i].max_capacity > 0 || (quirks & CUPS_SNMP_CAPACITY)) &&
+          supplies[i].level >= 0)
         sprintf(ptr, "%d", percent);
       else
         strcpy(ptr, "-1");
@@ -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 */
@@ -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);
 
  /*
@@ -659,7 +703,8 @@ backend_init_supplies(
   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';
@@ -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,7 +811,8 @@ 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]);
 	    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;
+  }
 }
 
 
@@ -982,5 +1073,5 @@ utf16_to_utf8(
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: snmp-supplies.c 4298 2013-05-10 16:52:10Z msweet $".
  */

backend/snmp.c

@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: snmp.c 7810 2008-07-29 01:11:15Z mike $"
  *
  *   SNMP discovery backend for CUPS.
  *
@@ -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);
 
@@ -1383,5 +1391,5 @@ update_cache(snmp_cache_t *device,	/* I - Device */
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: snmp.c 7810 2008-07-29 01:11:15Z mike $".
  */

backend/socket.c

@@ -1,9 +1,9 @@
 /*
- * "$Id$"
+ * "$Id: socket.c 7881 2008-08-28 20:21:56Z mike $"
  *
  *   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
@@ -87,6 +87,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 +247,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 +297,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 +385,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;
         }
 
@@ -472,8 +486,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);
 }
 
@@ -523,5 +535,5 @@ wait_bc(int device_fd,			/* I - Socket */
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: socket.c 7881 2008-08-28 20:21:56Z mike $".
  */

backend/test1284.c

@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: test1284.c 7465 2008-04-18 16:20:11Z mike $"
  *
  *   IEEE-1284 support functions test program for CUPS.
  *
@@ -80,5 +80,5 @@ main(int  argc,				/* I - Number of command-line args */
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: test1284.c 7465 2008-04-18 16:20:11Z mike $".
  */

backend/testbackend.c

@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: testbackend.c 3755 2012-03-30 05:59:14Z msweet $"
  *
  *   Backend test program for CUPS.
  *
@@ -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,10 +667,10 @@ 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);
 }
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: testbackend.c 3755 2012-03-30 05:59:14Z msweet $".
  */

backend/testsupplies.c

@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: testsupplies.c 3247 2011-05-12 06:22:31Z msweet $"
  *
  *   SNMP supplies test program for CUPS.
  *
@@ -79,5 +79,5 @@ main(int  argc,				/* I - Number of command-line args */
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: testsupplies.c 3247 2011-05-12 06:22:31Z msweet $".
  */

backend/usb-darwin.c

@@ -1,7 +1,7 @@
 /*
-* "$Id$"
+* "$Id: usb-darwin.c 7953 2008-09-17 01:43:19Z mike $"
 *
-* Copyright 2005-2011 Apple Inc. All rights reserved.
+* Copyright 2005-2012 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
@@ -820,10 +820,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 +833,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,
@@ -1283,7 +1283,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 +1304,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)
   {
@@ -2265,5 +2265,5 @@ static void get_device_id(cups_sc_status_t *status,
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: usb-darwin.c 7953 2008-09-17 01:43:19Z mike $".
  */

backend/usb-unix.c

@@ -1,11 +1,11 @@
 /*
- * "$Id$"
+ * "$Id: usb-unix.c 7810 2008-07-29 01:11:15Z mike $"
  *
  *   USB port backend for CUPS.
  *
  *   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
@@ -425,8 +421,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 +504,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);
       }
     }
@@ -619,5 +613,5 @@ side_cb(int         print_fd,		/* I - Print file */
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: usb-unix.c 7810 2008-07-29 01:11:15Z mike $".
  */

backend/usb.c

@@ -1,9 +1,9 @@
 /*
- * "$Id$"
+ * "$Id: usb.c 7687 2008-06-24 01:28:36Z mike $"
  *
  *   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 */
 
 
 /*
@@ -260,5 +260,5 @@ main(int  argc,				/* I - Number of command-line arguments (6 or 7) */
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: usb.c 7687 2008-06-24 01:28:36Z mike $".
  */

berkeley/Dependencies

@@ -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

berkeley/Makefile

@@ -1,5 +1,5 @@
 #
-# "$Id$"
+# "$Id: Makefile 7871 2008-08-27 21:12:43Z mike $"
 #
 #   Berkeley commands makefile for CUPS.
 #
@@ -163,5 +163,5 @@ include Dependencies
 
 
 #
-# End of "$Id$".
+# End of "$Id: Makefile 7871 2008-08-27 21:12:43Z mike $".
 #

berkeley/lpc.c

@@ -1,9 +1,9 @@
 /*
- * "$Id$"
+ * "$Id: lpc.c 7079 2007-11-30 01:58:31Z mike $"
  *
  *   "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)))
@@ -445,5 +446,5 @@ show_status(http_t     *http,		/* I - HTTP connection to server */
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: lpc.c 7079 2007-11-30 01:58:31Z mike $".
  */

berkeley/lpq.c

@@ -1,9 +1,9 @@
 /*
- * "$Id$"
+ * "$Id: lpq.c 7460 2008-04-16 02:19:54Z mike $"
  *
  *   "lpq" command 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
@@ -60,8 +60,7 @@ main(int  argc,				/* I - Number of command-line arguments */
 		all,			/* All printers */
 		interval,		/* Reporting interval */
 		longstatus;		/* Show file details */
-  int		num_dests;		/* Number of destinations */
-  cups_dest_t	*dests;			/* Destinations */
+  cups_dest_t	*named_dest;		/* Named destination */
 
 
   _cupsSetLocale(argv);
@@ -77,8 +76,6 @@ main(int  argc,				/* I - Number of command-line arguments */
   interval   = 0;
   longstatus = 0;
   all        = 0;
-  num_dests  = 0;
-  dests      = NULL;
 
   for (i = 1; i < argc; i ++)
     if (argv[i][0] == '+')
@@ -127,7 +124,6 @@ main(int  argc,				/* I - Number of command-line arguments */
 	      if (i >= argc)
 	      {
 		httpClose(http);
-		cupsFreeDests(num_dests, dests);
 
 	        usage();
 	      }
@@ -140,12 +136,14 @@ main(int  argc,				/* I - Number of command-line arguments */
 
             http = connect_server(argv[0], http);
 
-            if (num_dests == 0)
-              num_dests = cupsGetDests2(http, &dests);
-
-            if (cupsGetDest(dest, instance, num_dests, dests) == NULL)
+            if ((named_dest = cupsGetNamedDest(http, dest, instance)) == NULL)
 	    {
-	      if (instance)
+	      if (cupsLastError() == IPP_BAD_REQUEST ||
+		  cupsLastError() == IPP_VERSION_NOT_SUPPORTED)
+		_cupsLangPrintf(stderr,
+				_("%s: Error - add '/version=1.1' to server "
+				  "name."), argv[0]);
+	      else if (instance)
 		_cupsLangPrintf(stderr,
 		                _("%s: Error - unknown destination \"%s/%s\"."),
 		        	argv[0], dest, instance);
@@ -155,6 +153,8 @@ main(int  argc,				/* I - Number of command-line arguments */
 
 	      return (1);
 	    }
+
+	    cupsFreeDests(1, named_dest);
 	    break;
 
 	case 'a' : /* All printers */
@@ -192,7 +192,6 @@ main(int  argc,				/* I - Number of command-line arguments */
 
 	default :
 	    httpClose(http);
-	    cupsFreeDests(num_dests, dests);
 
 	    usage();
 	    break;
@@ -207,15 +206,17 @@ main(int  argc,				/* I - Number of command-line arguments */
 
   if (dest == NULL && !all)
   {
-    if (num_dests == 0)
-      num_dests = cupsGetDests2(http, &dests);
-
-    for (i = 0; i < num_dests; i ++)
-      if (dests[i].is_default)
-	dest = dests[i].name;
-
-    if (dest == NULL)
+    if ((named_dest = cupsGetNamedDest(http, NULL, NULL)) == NULL)
     {
+      if (cupsLastError() == IPP_BAD_REQUEST ||
+          cupsLastError() == IPP_VERSION_NOT_SUPPORTED)
+      {
+	_cupsLangPrintf(stderr,
+	                _("%s: Error - add '/version=1.1' to server name."),
+			argv[0]);
+        return (1);
+      }
+
       val = NULL;
 
       if ((dest = getenv("LPDEST")) == NULL)
@@ -231,7 +232,7 @@ main(int  argc,				/* I - Number of command-line arguments */
       else
 	val = "LPDEST";
 
-      if (dest && !cupsGetDest(dest, NULL, num_dests, dests))
+      if (dest && val)
 	_cupsLangPrintf(stderr,
 	                _("%s: Error - %s environment variable names "
 			  "non-existent destination \"%s\"."), argv[0], val,
@@ -241,9 +242,10 @@ main(int  argc,				/* I - Number of command-line arguments */
 	                _("%s: Error - no default destination available."),
 			argv[0]);
       httpClose(http);
-      cupsFreeDests(num_dests, dests);
       return (1);
     }
+
+    dest = named_dest->name;
   }
 
  /*
@@ -270,7 +272,6 @@ main(int  argc,				/* I - Number of command-line arguments */
   * Close the connection to the server and return...
   */
 
-  cupsFreeDests(num_dests, dests);
   httpClose(http);
 
   return (0);
@@ -371,6 +372,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 +401,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 +452,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;
 
@@ -674,5 +679,5 @@ usage(void)
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: lpq.c 7460 2008-04-16 02:19:54Z mike $".
  */

berkeley/lpr.c

@@ -1,9 +1,9 @@
 /*
- * "$Id$"
+ * "$Id: lpr.c 7720 2008-07-11 22:46:21Z mike $"
  *
  *   "lpr" command 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
@@ -61,6 +61,7 @@ main(int  argc,				/* I - Number of command-line arguments */
 
   for (i = 1; i < argc; i ++)
     if (argv[i][0] == '-')
+    {
       switch (ch = argv[i][1])
       {
         case 'E' : /* Encrypt */
@@ -89,7 +90,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);
@@ -226,6 +227,14 @@ main(int  argc,				/* I - Number of command-line arguments */
 		                              dest->options[j].value,
 					      num_options, &options);
 	    }
+	    else if (cupsLastError() == IPP_BAD_REQUEST ||
+		     cupsLastError() == IPP_VERSION_NOT_SUPPORTED)
+	    {
+	      _cupsLangPrintf(stderr,
+			      _("%s: Error - add '/version=1.1' to server "
+				"name."), argv[0]);
+	      return (1);
+	    }
 	    break;
 
 	case '#' : /* Number of copies */
@@ -275,6 +284,7 @@ main(int  argc,				/* I - Number of command-line arguments */
 			    argv[i][1]);
 	    return (1);
       }
+    }
     else if (num_files < 1000)
     {
      /*
@@ -320,6 +330,14 @@ main(int  argc,				/* I - Number of command-line arguments */
 		                      dest->options[j].value,
 				      num_options, &options);
     }
+    else if (cupsLastError() == IPP_BAD_REQUEST ||
+	     cupsLastError() == IPP_VERSION_NOT_SUPPORTED)
+    {
+      _cupsLangPrintf(stderr,
+		      _("%s: Error - add '/version=1.1' to server "
+			"name."), argv[0]);
+      return (1);
+    }
   }
 
   if (printer == NULL)
@@ -377,7 +395,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 +412,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)
@@ -413,5 +436,5 @@ main(int  argc,				/* I - Number of command-line arguments */
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: lpr.c 7720 2008-07-11 22:46:21Z mike $".
  */

berkeley/lprm.c

@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: lprm.c 7261 2008-01-28 23:09:31Z mike $"
  *
  *   "lprm" command for CUPS.
  *
@@ -213,5 +213,5 @@ main(int  argc,			/* I - Number of command-line arguments */
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: lprm.c 7261 2008-01-28 23:09:31Z mike $".
  */

cgi-bin/Makefile

@@ -1,5 +1,5 @@
 #
-# "$Id$"
+# "$Id: Makefile 7871 2008-08-27 21:12:43Z mike $"
 #
 #   CGI makefile for CUPS.
 #
@@ -378,5 +378,5 @@ include Dependencies
 
 
 #
-# End of "$Id$".
+# End of "$Id: Makefile 7871 2008-08-27 21:12:43Z mike $".
 #

cgi-bin/admin.c

@@ -1,9 +1,9 @@
 /*
- * "$Id$"
+ * "$Id: admin.c 8029 2008-10-08 21:07:45Z mike $"
  *
  *   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
   {
@@ -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
   {
@@ -4196,5 +4218,5 @@ get_points(double     number,		/* I - Original number */
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: admin.c 8029 2008-10-08 21:07:45Z mike $".
  */

cgi-bin/cgi-private.h

@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: cgi-private.h 7940 2008-09-16 00:45:16Z mike $"
  *
  *   Private CGI definitions for CUPS.
  *
@@ -32,5 +32,5 @@
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: cgi-private.h 7940 2008-09-16 00:45:16Z mike $".
  */

cgi-bin/cgi.h

@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: cgi.h 6649 2007-07-11 21:46:42Z mike $"
  *
  *   CGI support library definitions for CUPS.
  *
@@ -115,5 +115,5 @@ extern const char	*cgiText(const char *message);
 #endif /* !_CUPS_CGI_H_ */
 
 /*
- * End of "$Id$".
+ * End of "$Id: cgi.h 6649 2007-07-11 21:46:42Z mike $".
  */

cgi-bin/classes.c

@@ -1,9 +1,9 @@
 /*
- * "$Id$"
+ * "$Id: classes.c 7940 2008-09-16 00:45:16Z mike $"
  *
  *   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();
@@ -554,5 +554,5 @@ show_class(http_t     *http,		/* I - Connection to server */
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: classes.c 7940 2008-09-16 00:45:16Z mike $".
  */

cgi-bin/help-index.c

@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: help-index.c 7717 2008-07-04 02:35:33Z mike $"
  *
  *   Online help index routines for CUPS.
  *
@@ -1324,5 +1324,5 @@ help_sort_words(help_word_t *w1,	/* I - Second word */
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: help-index.c 7717 2008-07-04 02:35:33Z mike $".
  */

cgi-bin/help-index.h

@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: help-index.h 7615 2008-05-25 07:17:07Z mike $"
  *
  *   Online help index definitions for CUPS.
  *
@@ -83,5 +83,5 @@ extern help_index_t	*helpSearchIndex(help_index_t *hi, const char *query,
 #endif /* !_CUPS_HELP_INDEX_H_ */
 
 /*
- * End of "$Id$".
+ * End of "$Id: help-index.h 7615 2008-05-25 07:17:07Z mike $".
  */

cgi-bin/help.c

@@ -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");
     }
   }

cgi-bin/html.c

@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: html.c 6649 2007-07-11 21:46:42Z mike $"
  *
  *   HTML support functions for CUPS.
  *
@@ -235,5 +235,5 @@ cgi_null_passwd(const char *prompt)	/* I - Prompt string (unused) */
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: html.c 6649 2007-07-11 21:46:42Z mike $".
  */

cgi-bin/ipp-var.c

@@ -1,9 +1,9 @@
 /*
- * "$Id$"
+ * "$Id: ipp-var.c 7940 2008-09-16 00:45:16Z mike $"
  *
  *   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
@@ -554,8 +554,8 @@ 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");
 
@@ -1588,5 +1589,5 @@ cgiText(const char *message)		/* I - Message */
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: ipp-var.c 7940 2008-09-16 00:45:16Z mike $".
  */

cgi-bin/jobs.c

@@ -1,9 +1,9 @@
 /*
- * "$Id$"
+ * "$Id: jobs.c 7237 2008-01-22 01:38:39Z mike $"
  *
  *   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
@@ -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)
@@ -210,5 +210,5 @@ do_job_op(http_t      *http,		/* I - HTTP connection */
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: jobs.c 7237 2008-01-22 01:38:39Z mike $".
  */

cgi-bin/makedocset.c

@@ -1,9 +1,9 @@
 /*
- * "$Id$"
+ * "$Id: makedocset.c 3833 2012-05-23 22:51:18Z msweet $"
  *
  *   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>
 
 
@@ -482,5 +482,5 @@ write_nodes(const char   *path,		/* I - File to write */
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: makedocset.c 3833 2012-05-23 22:51:18Z msweet $".
  */

cgi-bin/printers.c

@@ -1,9 +1,9 @@
 /*
- * "$Id$"
+ * "$Id: printers.c 7940 2008-09-16 00:45:16Z mike $"
  *
  *   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();
@@ -574,5 +574,5 @@ show_printer(http_t     *http,		/* I - Connection to server */
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: printers.c 7940 2008-09-16 00:45:16Z mike $".
  */

cgi-bin/search.c

@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: search.c 7720 2008-07-11 22:46:21Z mike $"
  *
  *   Search routines for CUPS.
  *
@@ -377,5 +377,5 @@ cgiFreeSearch(void *search)		/* I - Search context */
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: search.c 7720 2008-07-11 22:46:21Z mike $".
  */

cgi-bin/template.c

@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: template.c 7219 2008-01-14 22:00:02Z mike $"
  *
  *   CGI template function.
  *
@@ -729,5 +729,5 @@ cgi_puturi(const char *s,		/* I - String to output */
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: template.c 7219 2008-01-14 22:00:02Z mike $".
  */

cgi-bin/testcgi.c

@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: testcgi.c 6649 2007-07-11 21:46:42Z mike $"
  *
  *   CGI test program for CUPS.
  *
@@ -71,5 +71,5 @@ main(int  argc,				/* I - Number of command-line arguments */
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: testcgi.c 6649 2007-07-11 21:46:42Z mike $".
  */

cgi-bin/testhi.c

@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: testhi.c 6649 2007-07-11 21:46:42Z mike $"
  *
  *   Help index test program for CUPS.
  *
@@ -109,5 +109,5 @@ list_nodes(const char   *title,		/* I - Title string */
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: testhi.c 6649 2007-07-11 21:46:42Z mike $".
  */

cgi-bin/testtemplate.c

@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: testtemplate.c 6649 2007-07-11 21:46:42Z mike $"
  *
  *   CGI template test program for CUPS.
  *
@@ -99,5 +99,5 @@ main(int  argc,				/* I - Number of command-line arguments */
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: testtemplate.c 6649 2007-07-11 21:46:42Z mike $".
  */

cgi-bin/var.c

@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: var.c 7460 2008-04-16 02:19:54Z mike $"
  *
  *   CGI form variable and array functions for CUPS.
  *
@@ -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);
@@ -1301,5 +1307,5 @@ cgi_unlink_file(void)
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: var.c 7460 2008-04-16 02:19:54Z mike $".
  */

cgi-bin/websearch.c

@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: websearch.c 1531 2009-05-22 21:50:50Z msweet $"
  *
  *   Web search program for www.cups.org.
  *
@@ -112,5 +112,5 @@ list_nodes(help_index_t *hi,		/* I - Help index */
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: websearch.c 1531 2009-05-22 21:50:50Z msweet $".
  */

conf/Makefile

@@ -1,5 +1,5 @@
 #
-# "$Id$"
+# "$Id: Makefile 7938 2008-09-11 23:53:59Z mike $"
 #
 #   Configuration file makefile for CUPS.
 #
@@ -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
 
 
@@ -139,5 +139,5 @@ uninstall:
 
 
 #
-# End of "$Id$".
+# End of "$Id: Makefile 7938 2008-09-11 23:53:59Z mike $".
 #

conf/cups-files.conf.in

@@ -0,0 +1,98 @@
+#
+# "$Id: cups-files.conf.in 4185 2013-02-20 02:19:13Z msweet $"
+#
+# 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: cups-files.conf.in 4185 2013-02-20 02:19:13Z msweet $".
+#

conf/cupsd.conf.in

@@ -1,5 +1,5 @@
 #
-# "$Id$"
+# "$Id: cupsd.conf.in 7888 2008-08-29 21:16:56Z mike $"
 #
 # Sample configuration file for the CUPS scheduler.  See "man cupsd.conf" for a
 # complete description of this file.
@@ -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...
@@ -136,5 +130,5 @@ WebInterface @CUPS_WEBIF@
 </Policy>
 
 #
-# End of "$Id$".
+# End of "$Id: cupsd.conf.in 7888 2008-08-29 21:16:56Z mike $".
 #

conf/mime.convs.in

@@ -1,5 +1,5 @@
 #
-# "$Id$"
+# "$Id: mime.convs.in 6761 2007-08-02 17:58:59Z mike $"
 #
 #   DO NOT EDIT THIS FILE, AS IT IS OVERWRITTEN WHEN YOU INSTALL NEW
 #   VERSIONS OF CUPS.  Instead, create a "local.convs" file that
@@ -59,5 +59,5 @@ application/vnd.cups-raster	image/pwg-raster		100	rastertopwg
 @DEFAULT_RAW_PRINTING@application/octet-stream	application/vnd.cups-raw	0	-
 
 #
-# End of "$Id$".
+# End of "$Id: mime.convs.in 6761 2007-08-02 17:58:59Z mike $".
 #

conf/mime.types

@@ -1,5 +1,5 @@
 #
-# "$Id: mime.types 9871 2011-08-06 06:34:46Z mike $"
+# "$Id: mime.types 7670 2008-06-17 22:42:08Z mike $"
 #
 #   Base MIME types file for CUPS.
 #
@@ -170,5 +170,5 @@ application/vnd.cups-raw	(string(0,<1B>E) + !string(2,<1B>%0B)) \
 application/octet-stream
 
 #
-# End of "$Id: mime.types 9871 2011-08-06 06:34:46Z mike $".
+# End of "$Id: mime.types 7670 2008-06-17 22:42:08Z mike $".
 #

config-scripts/cups-common.m4

@@ -1,9 +1,9 @@
 dnl
-dnl "$Id: cups-common.m4 10192 2012-01-20 21:49:02Z mike $"
+dnl "$Id: cups-common.m4 8781 2009-08-28 17:34:54Z 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.6.3"
 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,17 @@ 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"
+	if test "x$GZIP" != z; then
+		INSTALL_GZIP="-z"
+	fi))
+AC_SUBST(INSTALL_GZIP)
 AC_SUBST(LIBZ)
 
 dnl Flags for "ar" command...
@@ -329,6 +337,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 +357,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 +385,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 +407,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 +422,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 +458,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 8781 2009-08-28 17:34:54Z mike $".
 dnl

config-scripts/cups-compiler.m4

@@ -1,5 +1,5 @@
 dnl
-dnl "$Id: cups-compiler.m4 10190 2012-01-20 16:22:58Z mike $"
+dnl "$Id: cups-compiler.m4 7871 2008-08-27 21:12:43Z mike $"
 dnl
 dnl   Compiler stuff for CUPS.
 dnl
@@ -295,5 +295,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 7871 2008-08-27 21:12:43Z mike $".
 dnl

config-scripts/cups-defaults.m4

@@ -1,9 +1,9 @@
 dnl
-dnl "$Id: cups-defaults.m4 10104 2011-11-04 06:37:03Z mike $"
+dnl "$Id: cups-defaults.m4 7959 2008-09-17 19:30: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 7959 2008-09-17 19:30:58Z mike $".
 dnl

config-scripts/cups-directories.m4

@@ -1,9 +1,9 @@
 dnl
-dnl "$Id: cups-directories.m4 9771 2011-05-12 05:21:56Z mike $"
+dnl "$Id: cups-directories.m4 7799 2008-07-25 20:06:08Z mike $"
 dnl
 dnl   Directory 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
@@ -106,7 +106,7 @@ if test "$libdir" = "\${exec_prefix}/lib"; then
 			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
 			;;
@@ -424,7 +424,7 @@ AC_SUBST(CUPS_SERVERROOT)
 # Transient run-time state
 case "$uname" in
 	Darwin*)
-		# Darwin (Mac OS X)
+		# Darwin (OS X)
 		CUPS_STATEDIR="$CUPS_SERVERROOT"
 		;;
 	*)
@@ -436,5 +436,5 @@ 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 7799 2008-07-25 20:06:08Z mike $".
 dnl

config-scripts/cups-dnssd.m4

@@ -1,9 +1,9 @@
 dnl
-dnl "$Id: cups-dnssd.m4 9771 2011-05-12 05:21:56Z mike $"
+dnl "$Id: cups-dnssd.m4 7890 2008-08-29 22:19:39Z 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 7890 2008-08-29 22:19:39Z mike $".
 dnl

config-scripts/cups-gssapi.m4

@@ -1,9 +1,9 @@
 dnl
-dnl   "$Id: cups-gssapi.m4 10137 2011-12-02 04:04:49Z mike $"
+dnl   "$Id$"
 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$".
 dnl

config-scripts/cups-largefile.m4

@@ -1,5 +1,5 @@
 dnl
-dnl "$Id: cups-largefile.m4 9771 2011-05-12 05:21:56Z mike $"
+dnl "$Id: cups-largefile.m4 6649 2007-07-11 21:46:42Z mike $"
 dnl
 dnl   Large file support stuff for CUPS.
 dnl
@@ -48,5 +48,5 @@ fi
 AC_CHECK_FUNC(strtoll, AC_DEFINE(HAVE_STRTOLL))
 
 dnl
-dnl End of "$Id: cups-largefile.m4 9771 2011-05-12 05:21:56Z mike $".
+dnl End of "$Id: cups-largefile.m4 6649 2007-07-11 21:46:42Z mike $".
 dnl

config-scripts/cups-launchd.m4

@@ -1,5 +1,5 @@
 dnl
-dnl "$Id: cups-launchd.m4 8983 2010-02-13 02:20:23Z mike $"
+dnl "$Id: cups-launchd.m4 6649 2007-07-11 21:46:42Z mike $"
 dnl
 dnl   launchd stuff for CUPS.
 dnl
@@ -39,5 +39,5 @@ AC_SUBST(DEFAULT_LAUNCHD_CONF)
 AC_SUBST(LAUNCHDLIBS)
 
 dnl
-dnl End of "$Id: cups-launchd.m4 8983 2010-02-13 02:20:23Z mike $".
+dnl End of "$Id: cups-launchd.m4 6649 2007-07-11 21:46:42Z mike $".
 dnl

config-scripts/cups-libtool.m4

@@ -1,5 +1,5 @@
 dnl
-dnl "$Id: cups-libtool.m4 9771 2011-05-12 05:21:56Z mike $"
+dnl "$Id: cups-libtool.m4 6649 2007-07-11 21:46:42Z mike $"
 dnl
 dnl   Libtool stuff for CUPS.
 dnl
@@ -35,5 +35,5 @@ if test x$LIBTOOL != x; then
 fi
 
 dnl
-dnl End of "$Id: cups-libtool.m4 9771 2011-05-12 05:21:56Z mike $".
+dnl End of "$Id: cups-libtool.m4 6649 2007-07-11 21:46:42Z mike $".
 dnl

config-scripts/cups-manpages.m4

@@ -1,9 +1,9 @@
 dnl
-dnl "$Id: cups-manpages.m4 9771 2011-05-12 05:21:56Z mike $"
+dnl "$Id: cups-manpages.m4 6649 2007-07-11 21:46:42Z 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
@@ -68,7 +68,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 +92,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 6649 2007-07-11 21:46:42Z mike $".
 dnl

config-scripts/cups-network.m4

@@ -1,5 +1,5 @@
 dnl
-dnl "$Id: cups-network.m4 9771 2011-05-12 05:21:56Z mike $"
+dnl "$Id: cups-network.m4 7918 2008-09-08 22:03:01Z mike $"
 dnl
 dnl   Networking stuff for CUPS.
 dnl
@@ -70,5 +70,5 @@ AC_CHECK_HEADERS(AppleTalk/at_proto.h,AC_DEFINE(HAVE_APPLETALK_AT_PROTO_H),,
 	[#include <netat/appletalk.h>])
 
 dnl
-dnl End of "$Id: cups-network.m4 9771 2011-05-12 05:21:56Z mike $".
+dnl End of "$Id: cups-network.m4 7918 2008-09-08 22:03:01Z mike $".
 dnl

config-scripts/cups-opsys.m4

@@ -1,5 +1,5 @@
 dnl
-dnl "$Id: cups-opsys.m4 9771 2011-05-12 05:21:56Z mike $"
+dnl "$Id: cups-opsys.m4 6649 2007-07-11 21:46:42Z mike $"
 dnl
 dnl   Operating system stuff for CUPS.
 dnl
@@ -31,5 +31,5 @@ case "$uname" in
 esac
 
 dnl
-dnl "$Id: cups-opsys.m4 9771 2011-05-12 05:21:56Z mike $"
+dnl "$Id: cups-opsys.m4 6649 2007-07-11 21:46:42Z mike $"
 dnl

config-scripts/cups-pam.m4

@@ -1,9 +1,9 @@
 dnl
-dnl "$Id: cups-pam.m4 9771 2011-05-12 05:21:56Z mike $"
+dnl "$Id: cups-pam.m4 7960 2008-09-17 19:42:02Z 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 7960 2008-09-17 19:42:02Z mike $".
 dnl

config-scripts/cups-poll.m4

@@ -1,5 +1,5 @@
 dnl
-dnl "$Id: cups-poll.m4 9771 2011-05-12 05:21:56Z mike $"
+dnl "$Id$"
 dnl
 dnl   Select/poll stuff for CUPS.
 dnl
@@ -18,5 +18,5 @@ AC_CHECK_FUNC(epoll_create, AC_DEFINE(HAVE_EPOLL))
 AC_CHECK_FUNC(kqueue, AC_DEFINE(HAVE_KQUEUE))
 
 dnl
-dnl End of "$Id: cups-poll.m4 9771 2011-05-12 05:21:56Z mike $".
+dnl End of "$Id$".
 dnl

config-scripts/cups-scripting.m4

@@ -1,5 +1,5 @@
 dnl
-dnl "$Id: cups-scripting.m4 9927 2011-08-27 09:28:30Z mike $"
+dnl "$Id: cups-scripting.m4 7915 2008-09-07 22:18:29Z mike $"
 dnl
 dnl   Scripting configuration stuff for CUPS.
 dnl
@@ -85,5 +85,5 @@ if test "x$CUPS_PYTHON" != x; then
 fi
 
 dnl
-dnl End of "$Id: cups-scripting.m4 9927 2011-08-27 09:28:30Z mike $".
+dnl End of "$Id: cups-scripting.m4 7915 2008-09-07 22:18:29Z mike $".
 dnl

config-scripts/cups-sharedlibs.m4

@@ -1,5 +1,5 @@
 dnl
-dnl "$Id: cups-sharedlibs.m4 10190 2012-01-20 16:22:58Z mike $"
+dnl "$Id: cups-sharedlibs.m4 7630 2008-06-09 22:31:44Z mike $"
 dnl
 dnl   Shared library support for CUPS.
 dnl
@@ -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 7630 2008-06-09 22:31:44Z mike $".
 dnl

config-scripts/cups-ssl.m4

@@ -1,9 +1,9 @@
 dnl
-dnl "$Id: cups-ssl.m4 9837 2011-06-16 20:12:16Z mike $"
+dnl "$Id: cups-ssl.m4 7241 2008-01-22 22:34:52Z 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,12 +59,6 @@ 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
@@ -112,6 +109,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 +124,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 +136,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 +153,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 +174,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 +183,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 7241 2008-01-22 22:34:52Z mike $".
 dnl

config-scripts/cups-threads.m4

@@ -1,5 +1,5 @@
 dnl
-dnl "$Id: cups-threads.m4 9771 2011-05-12 05:21:56Z mike $"
+dnl "$Id: cups-threads.m4 6649 2007-07-11 21:46:42Z mike $"
 dnl
 dnl   Threading stuff for CUPS.
 dnl
@@ -50,5 +50,5 @@ fi
 AC_SUBST(PTHREAD_FLAGS)
 
 dnl
-dnl End of "$Id: cups-threads.m4 9771 2011-05-12 05:21:56Z mike $".
+dnl End of "$Id: cups-threads.m4 6649 2007-07-11 21:46:42Z mike $".
 dnl

config.h.in

@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: config.h.in 7918 2008-09-08 22:03:01Z mike $"
  *
  *   Configuration file for CUPS.
  *
@@ -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"
 
 
 /*
@@ -174,6 +175,13 @@
 #undef HAVE_SCSI_SG_H
 
 
+/*
+ * Use <stdint.h>?
+ */
+
+#undef HAVE_STDINT_H
+
+
 /*
  * Use <string.h>, <strings.h>, and/or <bstring.h>?
  */
@@ -295,6 +303,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?
  */
@@ -338,13 +353,6 @@
 #undef HAVE_SECPOLICYCREATESSL
 
 
-/*
- * Do we have the SSLSetProtocolVersionMax function?
- */
-
-#undef HAVE_SSLSETPROTOCOLVERSIONMAX
-
-
 /*
  * Do we have the cssmErrorString function?
  */
@@ -352,25 +360,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 +368,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 +519,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 +543,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 +583,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 +672,7 @@
  * Do we have libusb?
  */
 
-#undef HAVE_USB_H
+#undef HAVE_LIBUSB
 
 
 /*
@@ -717,24 +702,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,8 +723,25 @@
 #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_ */
 
 /*
- * End of "$Id$".
+ * End of "$Id: config.h.in 7918 2008-09-08 22:03:01Z mike $".
  */

configure.in

@@ -1,9 +1,9 @@
 dnl
-dnl "$Id$"
+dnl "$Id: configure.in 7833 2008-08-04 20:55:13Z mike $"
 dnl
 dnl   Configuration script 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
@@ -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
@@ -89,5 +93,5 @@ AC_OUTPUT(Makedefs
 chmod +x cups-config
 
 dnl
-dnl End of "$Id$".
+dnl End of "$Id: configure.in 7833 2008-08-04 20:55:13Z mike $".
 dnl

cups-config.in

@@ -1,6 +1,6 @@
 #! /bin/sh
 #
-# "$Id$"
+# "$Id: cups-config.in 9926 2011-08-27 09:23:01Z mike $"
 #
 #   CUPS configuration utility.
 #
@@ -142,5 +142,5 @@ while test $# -gt 0; do
 done
 
 #
-# End of "$Id$".
+# End of "$Id: cups-config.in 9926 2011-08-27 09:23:01Z mike $".
 #

cups/Dependencies

@@ -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

cups/Makefile

@@ -1,5 +1,5 @@
 #
-# "$Id$"
+# "$Id: Makefile 7871 2008-08-27 21:12:43Z mike $"
 #
 #   API library Makefile for CUPS.
 #
@@ -192,6 +192,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...
 #
@@ -304,7 +312,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 +341,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,7 +526,7 @@ 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 \
+		cups.h adminutil.c dest*.c language.c notify.c \
 		options.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
@@ -573,7 +581,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 \
@@ -621,5 +629,5 @@ include Dependencies
 
 
 #
-# End of "$Id$".
+# End of "$Id: Makefile 7871 2008-08-27 21:12:43Z mike $".
 #

cups/adminutil.c

@@ -1,9 +1,9 @@
 /*
- * "$Id$"
+ * "$Id: adminutil.c 7850 2008-08-20 00:07:25Z mike $"
  *
  *   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
@@ -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 */
@@ -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 */
@@ -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 */
@@ -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 */
@@ -2337,5 +2337,5 @@ write_option(cups_file_t     *dstfp,	/* I - PPD file */
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: adminutil.c 7850 2008-08-20 00:07:25Z mike $".
  */

cups/adminutil.h

@@ -1,9 +1,9 @@
 /*
- * "$Id$"
+ * "$Id: adminutil.h 7026 2007-10-19 00:57:45Z mike $"
  *
  *   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
@@ -74,5 +77,5 @@ extern int	cupsAdminSetServerSettings(http_t *http,
 #endif /* !_CUPS_ADMINUTIL_H_ */
 
 /*
- * End of "$Id$".
+ * End of "$Id: adminutil.h 7026 2007-10-19 00:57:45Z mike $".
  */

cups/api-array.header

@@ -1,5 +1,5 @@
 <!--
-  "$Id: api-array.header 9771 2011-05-12 05:21:56Z mike $"
+  "$Id: api-array.header 7266 2008-01-29 02:15:29Z mike $"
 
   Array API header for CUPS.
 

cups/api-array.shtml

@@ -1,5 +1,5 @@
 <!--
-  "$Id: api-array.shtml 9727 2011-04-28 21:20:12Z mike $"
+  "$Id: api-array.shtml 7616 2008-05-28 00:34:13Z mike $"
 
   Array API introduction for CUPS.
 

cups/api-cups.header

@@ -1,5 +1,5 @@
 <!--
-  "$Id: api-cups.header 9771 2011-05-12 05:21:56Z mike $"
+  "$Id: api-cups.header 7279 2008-01-31 01:50:44Z mike $"
 
   CUPS API header for CUPS.
 

cups/api-cups.shtml

@@ -1,9 +1,9 @@
 <!--
-  "$Id: api-cups.shtml 9727 2011-04-28 21:20:12Z mike $"
+  "$Id: api-cups.shtml 7337 2008-02-22 04:44:04Z mike $"
 
   API introduction 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
@@ -183,7 +183,7 @@ int num_options = 0;
 <a href='#cups_option_t'>cups_option_t</a> *options = NULL;
 <a href='#cups_dest_t'>cups_dest_t</a> *dest;
 
-for (i = 0; i < dest->num_options; i ++)
+for (i = 0; i &lt; dest->num_options; i ++)
   num_options = <a href='#cupsAddOption'>cupsAddOption</a>(dest->options[i].name, dest->options[i].value,
                               num_options, &amp;options);
 </pre>
@@ -235,7 +235,7 @@ job_id = <a href='#cupsPrintFiles'>cupsPrintFiles</a>(dest->name, 3, files, "Tes
 
 <p>Finally, the <a href='#cupsCreateJob'><code>cupsCreateJob</code></a>
 function creates a new job with no files in it. Files are added using the
-<a href='#cupsStartDocument'><code>cupsStartDocument</code></a>, 
+<a href='#cupsStartDocument'><code>cupsStartDocument</code></a>,
 <a href='api-httpipp.html#cupsWriteRequestData'><code>cupsWriteRequestData</code></a>,
 and <a href='#cupsFinishDocument'><code>cupsFinishDocument</code></a> functions.
 The following example creates a job with 10 text files for printing:</p>
@@ -299,7 +299,7 @@ int num_jobs;
 <a href='#cups_job_t'>cups_job_t</a> *jobs;
 int i;
 ipp_jstate_t job_state = IPP_JOB_PENDING;
- 
+
 while (job_state &lt; IPP_JOB_STOPPED)
 {
   /* Get my jobs (1) with any state (-1) */

cups/api-filedir.header

@@ -1,5 +1,5 @@
 <!--
-  "$Id: api-filedir.header 9771 2011-05-12 05:21:56Z mike $"
+  "$Id: api-filedir.header 7279 2008-01-31 01:50:44Z mike $"
 
   File and Directory API header for CUPS.
 

cups/api-filedir.shtml

@@ -1,5 +1,5 @@
 <!--
-  "$Id: api-filedir.shtml 9727 2011-04-28 21:20:12Z mike $"
+  "$Id: api-filedir.shtml 7279 2008-01-31 01:50:44Z mike $"
 
   File and directory API introduction for CUPS.
 

cups/api-filter.header

@@ -1,5 +1,5 @@
 <!--
-  "$Id: api-filter.header 9771 2011-05-12 05:21:56Z mike $"
+  "$Id: api-filter.header 7616 2008-05-28 00:34:13Z mike $"
 
   Filter and backend programming header for CUPS.
 

cups/api-filter.shtml

@@ -1,9 +1,9 @@
 <!--
-  "$Id: api-filter.shtml 9799 2011-05-20 18:09:22Z mike $"
+  "$Id: api-filter.shtml 7677 2008-06-19 23:22:19Z mike $"
 
   Filter and backend programming introduction 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
@@ -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>
@@ -488,7 +488,7 @@ from localizing the vendor-prefixed keyword in the PPD file - otherwise both
 the generic and vendor-specific keyword will be shown in the user
 interface.</p>
 
-</blockquote></dd>
+</blockquote>
 
 <h4><a name="REPORTING_SUPPLIES">Reporting Supply Levels</a></h4>
 
@@ -613,7 +613,7 @@ datalen = sizeof(data) - 1;
 status = <a href="#cupsSideChannelDoRequest">cupsSideChannelDoRequest</a>(CUPS_SC_CMD_GET_DEVICE_ID, data, &amp;datalen, 1.0);
 
 /* Use the returned value if OK was returned and the length is non-zero */
-if (status == CUPS_SC_STATUS_OK && datalen > 0)
+if (status == CUPS_SC_STATUS_OK &amp;&amp; datalen > 0)
   data[datalen] = '\0';
 else
   data[0] = '\0';

cups/api-httpipp.header

@@ -1,5 +1,5 @@
 <!--
-  "$Id: api-httpipp.header 9771 2011-05-12 05:21:56Z mike $"
+  "$Id: api-httpipp.header 7258 2008-01-28 00:15:05Z mike $"
 
   HTTP and IPP API header for CUPS.
 

cups/api-httpipp.shtml

@@ -1,9 +1,9 @@
 <!--
-  "$Id: api-httpipp.shtml 9727 2011-04-28 21:20:12Z mike $"
+  "$Id: api-httpipp.shtml 7684 2008-06-23 16:47:38Z 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>
 

cups/api-ppd.header

@@ -1,9 +1,9 @@
 <!--
-  "$Id: api-ppd.header 10103 2011-11-03 20:44:57Z mike $"
+  "$Id: api-ppd.header 7616 2008-05-28 00:34:13Z 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>

cups/api-ppd.shtml

@@ -1,9 +1,9 @@
 <!--
-  "$Id: api-ppd.shtml 10103 2011-11-03 20:44:57Z mike $"
+  "$Id: api-ppd.shtml 7616 2008-05-28 00:34:13Z 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

cups/array-private.h

@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: array-private.h 3448 2011-10-04 06:53:26Z msweet $"
  *
  *   Private array definitions for CUPS.
  *
@@ -47,5 +47,5 @@ extern cups_array_t	*_cupsArrayNewStrings(const char *s) _CUPS_API_1_5;
 #endif /* !_CUPS_ARRAY_PRIVATE_H_ */
 
 /*
- * End of "$Id$".
+ * End of "$Id: array-private.h 3448 2011-10-04 06:53:26Z msweet $".
  */

cups/array.c

@@ -1,9 +1,9 @@
 /*
- * "$Id$"
+ * "$Id: array.c 7616 2008-05-28 00:34:13Z mike $"
  *
  *   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 */
@@ -202,7 +202,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 +244,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 +271,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 +301,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 +345,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 +430,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 +525,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 +554,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 +570,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 +586,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 +609,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 +639,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 +670,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 +692,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 +722,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 */
@@ -805,7 +805,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 +838,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 +871,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 +936,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 +967,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 +989,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 +1005,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 */
@@ -1322,5 +1322,5 @@ cups_array_find(cups_array_t *a,	/* I - Array */
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: array.c 7616 2008-05-28 00:34:13Z mike $".
  */