Import cups.org releases

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/tags/release-1.2.4@4306 a1ca3aef-8c08-0410-bb20-df032aa958be
2013-05-10 18:56:23 +00:00
@@ -1,783 +0,0 @@
-CHANGES-1.3.txt
---------------
-
-CHANGES IN CUPS V1.3.10
-
-	- Documentation fixes (STR #2994, STR #2995, STR #3008)
-	- The wrong italic fonts were listed in the UTF-8 charset file
-	  for the text filter.
-	- The backends did not return an OK status for the
-	  CUPS_SC_CMD_GET_BIDI side-channel command (STR #3029)
-	- The scheduler did not purge jobs that were missing a
-	  time-at-creation attribute, indicating a bad job control file
-	  (STR #3030)
-	- The "-o job-hold-until=week-end" option did not work properly
-	  (STR #3025)
-	- The Solaris USB printer device does not support select or poll
-	  (STR #3028)
-	- The scheduler would crash if you exceeded the MaxSubscriptions
-	  limit.
-	- The lp "-H immediate" option did not specify that the job
-	  should not be held (STR #3013)
-	- The scheduler did not support the "Connection: close"
-	  HTTP header (STR #3010)
-	- The mailto notifier didn't terminate messages properly
-	  (STR #3011)
-	- Backends could spin trying to read back-channel data
-	  (STR #3001)
-	- The HP-GL/2 filter was using the wrong default colors
-	  (STR #2966)
-	- The scheduler incorrectly allowed Get-Jobs operations without a
-	  printer-uri (STR #2996)
-	- The compression option was not being encoded properly
-	  (STR #2997)
-	- Added a missing character map for JIS-X0213/ShiftJIS.
-	- The scheduler now rejects ATTR: messages with empty values.
-	- The scheduler could consume all CPU handling closed connections
-	  (STR #2988)
-	- The scheduler now protects against DNS rebinding attacks on
-	  localhost.
-	- SECURITY: The PNG image reading code did not validate the
-	  image size properly, leading to a potential buffer overflow
-	  (STR #2974)
-	- Fixed some configure script bugs with rc/xinetd directories
-	  (STR #2970)
-	- The Epson sample driver PPDs contained errors (STR #2979)
-
-
-CHANGES IN CUPS V1.3.9
-
-	- SECURITY: The HP-GL/2 filter did not range check pen numbers
-	  (STR #2911)
-	- SECURITY: The SGI image file reader did not range check
-	  16-bit run lengths (STR #2918)
-	- SECURITY: The text filter did not range check cpi, lpi, or
-	  column values (STR #2919)
-	- Documentation updates (STR #2904, STR #2944)
-	- The French web admin page was never updated (STR #2963)
-	- The IPP backend did not retry print jobs when the printer
-	  reported itself as busy or unavailable (STR #2951)
-	- The "Set Allowed Users" web interface did not handle trailing
-	  whitespace correctly (STR #2956)
-	- The PostScript filter did not work with Adobe applications
-	  using custom page sizes (STR #2968)
-	- The Mac OS X USB backend did not work with some printers
-	  that reported a bad 1284 device ID.
-	- The scheduler incorrectly resolved the client connection
-	  address when HostNameLookups was set to Off (STR #2946)
-	- The IPP backend incorrectly stopped the local queue if
-	  the remote server reported the "paused" state.
-	- The cupsGetDests() function did not catch all types of
-	  request errors.
-	- The scheduler did not always log "job queued" messages
-	  (STR #2943)
-	- The scheduler did not support destination filtering using
-	  the printer-location attribute properly (STR #2945)
-	- The scheduler did not send the server-started,
-	  server-restarted, or server-stopped events (STR #2927)
-	- The scheduler no longer enforces configuration file
-	  permissions on symlinked files (STR #2937)
-	- CUPS now reinitializes the DNS resolver on failures
-	  (STR #2920)
-	- The CUPS desktop menu item was broken (STR #2924)
-	- The PPD parser was too strict about missing keyword
-	  values in "relaxed" mode.
-	- The PostScript filter incorrectly mirrored landscape
-	  documents.
-	- The scheduler did not correctly update the
-	  auth-info-required value(s) if the AuthType was Default.
-	- The scheduler required Kerberos authentication for
-	  all operations on remote Kerberized printers instead
-	  of just for the operations that needed it.
-	- The socket backend could wait indefinitely for back-
-	  channel data with some devices.
-	- PJL panel messages were not reset correctly on older
-	  printers (STR #2909)
-	- cupsfilter used the wrong default path (STR #2908)
-	- Fixed address matching for "BrowseAddress @IF(name)"
-	  (STR #2910)
-	- Fixed compiles on AIX.
-	- Firefox 3 did not work with the CUPS web interface in SSL
-	  mode (STR #2892)
-	- Custom options with multiple parameters were not emitted
-	  correctly.
-	- Refined the cupstestppd utility.
-	- ppdEmit*() did not support custom JCL options (STR #2889)
-	- The cupstestppd utility incorrectly reported missing
-	  "en" base translations (STR #2887)
-
-
-CHANGES IN CUPS V1.3.8
-
-	- Documentation updates (STR #2785, STR #2861, STR #2862)
-	- The scheduler did not add the ending job sheet when the
-	  job was released.
-	- The IPP backend did not relay marker-* attributes.
-	- The CUPS GNOME/KDE menu item was not localized for
-	  Chinese (STR #2880)
-	- The CUPS GNOME/KDE menu item was not localized for
-	  Japanese (STR #2876)
-	- The cupstestppd utility reported mixed line endings for
-	  Mac OS and Windows PPD files (STR #2874)
-	- The pdftops filter did not print landscape orientation PDF
-	  pages correctly on all printers (STR #2850)
-	- The scheduler did not handle expiring of implicit classes
-	  or their members properly, leading to a configuration where
-	  one of the members would have a short name (STR #2766)
-	- The scheduler and cupstestppd utilities did not support
-	  cupsFilter and cupsPreFilter programs with spaces in their
-	  names (STR #2866)
-	- Removed unused variables and assignments found by the
-	  LLVM "clang" tool.
-	- Added NULL checks recommended by the LLVM "clang" tool.
-	- The scheduler would crash if you started a printer that
-	  pointed to a backend that did not exist (STR #2865)
-	- The ppdLocalize functions incorrectly mapped all generic
-	  locales to country-specific locales.
-	- The cups-driverd program did not support Simplified Chinese
-	  or Traditional Chinese language version strings (STR #2851)
-	- Added an Indonesian translation (STR #2792)
-	- Fixed a timing issue in the backends that could cause data
-	  corruption with the CUPS_SC_CMD_DRAIN_OUTPUT side-channel
-	  command (STR #2858)
-	- The scheduler did not support "HostNameLookups" with all of
-	  the boolean names (STR #2861)
-	- Fixed a compile problem with glibc 2.8 (STR #2860)
-	- The scheduler incorrectly filtered out queues with ACLs and
-	  authentication.
-	- The PostScript filter did not support %%IncludeFeature lines
-	  in the page setup section of each page (STR #2831)
-	- The scheduler did not generate printer-state events when the
-	  default printer was changed (STR #2764)
-	- cupstestppd incorrectly reported a warning about the PPD format
-	  version in some locales (STR #2854)
-	- cupsGetPPD() and friends incorrectly returned a PPD file for
-	  a class with no printers.
-	- The member-uris values for local printers in a class returned
-	  by the scheduler did not reflect the connected hostname or
-	  port.
-	- The CUPS PHP extension was not thread-safe (STR #2828)
-	- The scheduler incorrectly added the document-format-default
-	  attribute to the list of "common" printer attributes, which
-	  over time would slow down the printing system (STR #2755,
-	  STR #2836)
-	- The cups-deviced and cups-driverd helper programs did not set
-	  the CFProcessPath environment variable on Mac OS X (STR #2837)
-	- "lpstat -p" could report the wrong job as printing (STR #2845)
-	- The scheduler would crash when some cupsd.conf directives
-	  were missing values (STR #2849)
-	- The web interface "move jobs" operation redirected users to
-	  the wrong URL (STR #2815)
-	- The Polish web interface translation contained errors
-	  (STR #2815)
-	- The scheduler did not report PostScript printer PPDs with
-	  filters as PostScript devices.
-	- The scheduler did not set the job document-format attribute
-	  for jobs submitted using Create-Job and Send-Document.
-	- cupsFileTell() did not work for log files opened in append
-	  mode (STR #2810)
-	- The scheduler did not set QUERY_STRING all of the time
-	  for CGI scripts (STR #2781, STR #2816)
-	- The scheduler now returns an error for bad job-sheets
-	  values (STR #2775)
-	- Authenticated remote printing did not work over domain
-	  sockets (STR #2750)
-	- The scheduler incorrectly logged errors for print filters
-	  when a job was canceled (STR #2806, #2808)
-	- The scheduler no longer allows multiple RSS subscriptions
-	  with the same URI (STR #2789)
-	- The scheduler now supports Kerberized printing with
-	  multiple server names (STR #2783)
-	- "Satisfy any" did not work in IPP policies (STR #2782)
-	- The CUPS imaging library would crash with very large
-	  images - more than 16Mx16M pixels (STR #2805)
-	- The PNG image loading code would crash with large images
-	  (STR #2790)
-	- The scheduler did not limit the total number of filters.
-	- The scheduler now ensures that the RSS directory has
-	  the correct permissions.
-	- The RSS notifier did not quote the feed URL in the RSS
-	  file it created (STR #2801)
-	- The web interface allowed the creation and cancellation
-	  of RSS subscriptions without a username (STR #2774)
-	- Increased the default MaxCopies value on Mac OS X to
-	  9999 to match the limit imposed by the print dialog.
-	- The scheduler did not reject requests with an empty
-	  Content-Length field (STR #2787)
-	- The scheduler did not log the current date and time and
-	  did not escape special characters in request URIs when
-	  logging bad requests to the access_log file (STR #2788)
-
-
-CHANGES IN CUPS V1.3.7
-
-	- CVE-2008-0047: cgiCompileSearch buffer overflow (STR #2729)
-	- CVE-2008-1373: CUPS GIF image filter overflow (STR #2765)
-	- Updated the "make check" tests to do a more thorough
-	  automated test.
-	- cups-driverd complained about missing directories (STR
-	  #2777)
-	- cupsaddsmb would leave the Samba username and password on
-	  disk if no Windows drivers were installed (STR #2779)
-	- The Linux USB backend used 100% CPU when a printer was
-	  disconnected (STR #2769)
-	- The sample raster drivers did not properly handle SIGTERM
-	  (STR #2770)
-	- The scheduler sent notify_post() messages too often on
-	  Mac OS X.
-	- Kerberos access to the web interface did not work
-	  (STR #2748)
-	- The scheduler did not support "AuthType Default" in IPP
-	  policies (STR #2749)
-	- The scheduler did not support the "HideImplicitMembers"
-	  directive as documented (STR #2760)
-	- "make check" didn't return a non-zero exit code on
-	  error (STR #2758)
-	- The scheduler incorrectly logged AUTH_foo environment
-	  variables in debug mode (STR #2751)
-	- The image filters inverted PBM files (STR #2746)
-	- cupsctl would crash if the scheduler was not running
-	  (STR #2741)
-	- The scheduler could crash when printing using a port
-	  monitor (STR #2742)
-	- The scheduler would crash if PAM was broken (STR #2734)
-	- The image filters did not work with some CMYK JPEG files
-	  produced by Adobe applications (STR #2727)
-	- The Mac OS X USB backend did not work with printers that
-	  did not report a make or model.
-	- The job-sheets option was not encoded properly (STR #2715)
-	- The scheduler incorrectly complained about missing LSB
-	  PPD directories.
-
-
-CHANGES IN CUPS V1.3.6
-
-	- Documentation updates (STR #2646, STR #2647, STR #2649)
-	- Fixed a problem with the web interface "Use Kerberos
-	  Authentication" check box (STR #2703)
-	- The scheduler unconditionally overwrote the printer-state-
-	  message with "process-name failed" when a filter or backend
-	  failed, preventing a useful error message from being shown
-	  to the user.
-	- Policies on CUPS-Move-Job didn't work as expected (STR
-	  #2699)
-	- The configure script only supported D-BUS on Linux
-	  (STR #2702)
-	- The scheduler did not support </LimitExcept> (STR #2701)
-	- The scheduler did not reset the job-hold-until attribute
-	  after a job's hold time was reached.
-	- The scheduler did not support printer supply attributes
-	  (STR #1307)
-	- The Kerberos credentials provided by some Windows KDCs
-	  were still too large - now use a dynamic buffer to
-	  support credentials up to 64k in size (STR #2695)
-	- Printing a test page from the web interface incorrectly
-	  defaulted to the "guest" user (STR #2688)
-	- The cupsEncodeOptions2() function did not parse multiple-
-	  value attribute values properly (STR #2690)
-	- The scheduler incorrectly sent printer-stopped events for
-	  status updates from the print filters (STR #2680)
-	- The IPP backend could crash when handling printer errors
-	  (STR #2667)
-	- Multi-file jobs did not print to remote CUPS servers
-	  (STR #2673)
-	- The scheduler did not provide the Apple language ID to
-	  job filters.
-	- Kerberos authentication did not work with the web
-	  interface (STR #2606, STR #2669)
-	- The requesing-user-name-allowed and -denied functionality
-	  did not work for Kerberos-authenticated usernames (STR
-	  #2670)
-	- CUPS didn't compile on HP-UX 11i (STR #2679)
-	- cupsEncodeOptions2() did not handle option values like
-	  "What's up, doc?" properly.
-	- Added lots of memory allocation checks (Fortify)
-	- The scheduler would crash if it was unable to add a job
-	  file (Fortify)
-	- ppdOpen*() did not check all memory allocations (Coverity)
-	- ippReadIO() did not check all memory allocations (Coverity)
-	- The PostScript filter did not detect read errors (Coverity)
-	- The scheduler did not check for a missing job-sheets-completed
-	  attribute when sending an event notification (Coverity)
-	- "Set Printer Options" might not work with raw queues (Coverity)
-	- cupsRasterInterpretPPD() could crash on certain PostScript
-	  errors (Coverity)
-	- The USB backend did not check for back-channel support
-	  properly on all systems (Coverity)
-	- Fixed memory leaks in the GIF and PNM image loading code
-	  (Coverity)
-	- Removed some dead code in the CUPS API and scheduler (Coverity)
-	- Fixed two overflow bugs in the HP-GL/2 filter (Coverity)
-	- Fixed another ASN1 string parsing bug (STR #2665)
-	- The RSS notifier directory was not installed with the
-	  correct permissions.
-	- The standard CUPS backends could use 100% CPU while waiting
-	  for print data (STR #2664)
-	- Filename-based MIME rules did not work (STR #2659)
-	- The cups-polld program did not exit if the scheduler crashed
-	  (STR #2640)
-	- The scheduler would crash if you tried to set the port-monitor
-	  on a raw queue (STR #2639)
-	- The scheduler could crash if a polled remote printer was
-	  converted to a class (STR #2656)
-	- The web interface and cupsctl did not correctly reflect
-	  the "allow printing from the Internet" state (STR #2650)
-	- The scheduler incorrectly treated MIME types as case-
-	  sensitive (STR #2657)
-	- The Java support classes did not send UTF-8 strings to
-	  the scheduler (STR #2651)
-	- The CGI code did not handle interrupted POST requests
-	  properly (STR #2652)
-	- The PostScript filter incorrectly handled number-up when
-	  the number of pages was evenly divisible by the number-up
-	  value.
-	- The PDF filter incorrectly filtered pages when page-ranges
-	  and number-up were both specified (STR #2643)
-	- The IPP backend did not handle printing of pictwps files
-	  to a non-Mac CUPS server properly.
-	- The scheduler did not detect network interface changes
-	  on operating systems other than Mac OS X (STR #2631)
-	- The scheduler now logs the UNIX error message when it
-	  is unable to create a request file such as a print job.
-	- Added support for --enable-pie on Mac OS X.
-
-
-CHANGES IN CUPS V1.3.5
-
-	- The SNMP backend did not check for negative string
-	  lengths (STR #2589)
-	- The scheduler incorrectly removed auth-info attributes,
-	  potentially leading to a loss of all options for a job.
-	- The scheduler stopped sending CUPS browse packets on a
-	  restart when using fixed addresses (STR #2618)
-	- Fixed PDF filter security issues (CVE-2007-4352
-	  CVE-2007-5392 CVE-2007-5393)
-	- Changing settings would always change the DefaultAuthType
-	  and Allow lines (STR #2580)
-	- The scheduler would crash when submitting an undefined
-	  format file from Samba with LogLevel debug2 (STR #2600)
-	- The scheduler did not use poll() when epoll() was not
-	  supported by the running kernel (STR #2582)
-	- Fixed a compile problem with Heimdal Kerberos (STR #2592)
-	- The USB backend now retries connections to a printer
-	  indefinitely rather than stopping the queue.
-	- Printers with untranslated JCL options were not exported
-	  to Samba correctly (STR #2570)
-	- The USB backend did not work with some Minolta USB
-	  printers (STR #2604)
-	- The strcasecmp() emulation code did not compile (STR
-	  #2612)
-	- The scheduler would crash if a job was sent to an empty
-	  class (STR #2605)
-	- The lpc command did not work in non-UTF-8 locales (STR
-	  #2595)
-	- Subscriptions for printer-stopped events also received
-	  other state changes (STR #2572)
-	- cupstestppd incorrectly reported translation errors for
-	  the "en" locale.
-	- ppdOpen() did not handle custom options properly when the
-	  Custom attribute appeared before the OpenUI for that
-	  option.
-	- The scheduler could crash when deleting a printer or
-	  listing old jobs.
-	- The Mac OS X USB backend did not allow for requeuing of
-	  jobs submitted to a class.
-	- lpmove didn't accept a job ID by itself.
-	- The scheduler incorrectly removed job history information
-	  for remote print jobs.
-	- The scheduler incorrectly sent the
-	  "com.apple.printerListChanged" message for printer state
-	  changes.
-	- The PostScript filter drew the page borders (when enabled)
-	  outside the imageable area.
-	- The LPD and IPP backends did not default to the correct
-	  port numbers when using alternate scheme names.
-	- The scheduler incorrectly deleted hardwired remote
-	  printers on system sleep.
-	- The scheduler would abort if a bad browse protocol name
-	  was listed in the cupsd.conf file.
-	- The online cupsd.conf help file incorrectly showed
-	  "dns-sd" instead of "dnssd" for Bonjour sharing.
-	- The scheduler could crash changing the port-monitor value.
-	- The scheduler generated CoreFoundation errors when run as
-	  a background process.
-	- When printing with number-up > 1, it was possible to get
-	  an extra blank page.
-
-
-CHANGES IN CUPS V1.3.4
-
-	- Documentation updates (STR #2560, STR #2563, STR #2569)
-	- CUPS now maps the "nb" locale to "no" on all platforms
-	  (STR #2575)
-	- CUPS did not work with a Windows 2003 R2 KDC (STR #2568)
-	- ippReadIO() could read past the end of a buffer (STR
-	  #2561)
-	- The scheduler would crash on shutdown if it was unable
-	  to create a Kerberos context.
-	- Multiple AuthTypes in cupsd.conf did not work (STR
-	  #2545)
-	- The snmp.conf file referenced the wrong man page (STR
-	  #2564)
-	- The cupsaddsmb program didn't handle domain sockets
-	  properly (STR #2556)
-	- The scheduler now validates device URIs when adding
-	  printers.
-	- Updated httpSeparateURI() to support hostnames with
-	  the backslash character.
-	- Updated the Japanese localization (STR #2546)
-	- The parallel backend now gets the current IEEE-1284
-	  device ID string on Linux (STR #2553)
-	- The IPP backend now checks the job status at
-	  variable intervals (from 1 to 10 seconds) instead
-	  of every 10 seconds for faster remote printing
-	  (STR #2548)
-	- "lpr -p" and "lpr -l" did not work (STR #2544)
-	- Compilation failed when a previous version of CUPS
-	  was installed and was included in the SSL include
-	  path (STR #2538)
-	- The scheduler did not reject requests with charsets
-	  other than US-ASCII or UTF-8, and the CUPS API
-	  incorrectly passed the locale charset to the scheduler
-	  instead of UTF-8 (STR #2537)
-	- cups-deviced did not filter out duplicate devices.
-	- The AppleTalk backend incorrectly added a scheme
-	  listing when AppleTalk was disabled or no printers
-	  were found.
-	- The PostScript filter generated N^2 copies when the
-	  printer supported collated copies and user requested
-	  reverse-order output.
-	- The scheduler did not reprint all of the files in a
-	  job that was held.
-	- The scheduler did not update the printcap file after
-	  removing stale remote queues.
-	- The cupsd.conf man page incorrectly referenced
-	  "AuthType Kerberos" instead of "AuthType Negotiate".
-
-
-CHANGES IN CUPS V1.3.3
-
-	- The scheduler did not use the attributes-natural-language
-	  attribute when passing the LANG environment variable to
-	  cups-deviced or cups-driverd.
-	- The scheduler did not use the printer-op-policy when
-	  modifying classes or printers (STR #2525)
-	- The auth-info-required attribute was not always updated
-	  for remote queues that required authentication.
-	- The German web interface localization contained errors
-	  (STR #2523)
-	- The Swedish localization contained errors (STR #2522)
-
-
-CHANGES IN CUPS V1.3.2
-
-	- The 1.3.1 release was incorrectly created from the
-	  1.4.x source tree (STR #2519)
-	- Added support for 32/64-bit libraries on HP-UX
-	  (STR #2520)
-	- The scheduler incorrectly used portrait as the default
-	  orientation (STR #2513)
-	- The scheduler no longer writes the printcap file for
-	  every remote printer update (STR #2512)
-	- Remote raw printing with multiple copies did not work
-	  (STR #2518)
-	- Updated the configure script to require at least autoconf
-	  2.60 (STR #2515)
-	- Some gzip'd PPD files were not read in their entirety
-	  (STR #2510)
-
-
-CHANGES IN CUPS V1.3.1
-
-	- Documentation updates.
-	- The USB backend on Mac OS X could hang if the driver and
-          printer did not match.
-	- Delegated Kerberos credentials were not working.
-	- "make distclean" incorrectly removed the edit-config.tmpl
-	  files (STR #2508)
-	- Fix compile problem on HP-UX (STR #2501)
-	- The cupstestppd utility now tests for resolutions greater
-	  than 99999 DPI to detect a missing  "x" between the X and Y
-	  resolutions.
-	- Fixed many problems in the various translations and added
-	  a new "checkpo" utility to validate them.
-	- The cupstestppd utility now tests the custom page size code
-	  for CUPS raster drivers.
-	- cupsLangDefault() did not attempt to return a language that
-	  was supported by the calling application.
-	- If a remote printer stopped while a job was being sent, the
-	  local queue would also get stopped and the job re-queued,
-	  resulting in duplicate prints in some cases.
-	- A few Apple-specific job options needed to be omitted when
-	  printing a banner page.
-	- The new peer credential support did not compile on FreeBSD
-	  (STR #2495)
-	- Direct links to help files did not set the current section
-	  so the table-of-contents was not shown.
-	- The configure script did not support --localedir=foo (STR #2488)
-	- The backends were not displaying their localized messages.
-	- CUPS-Authenticate-Job did not require Kerberos authentication
-	  on queues protected by Kerberos.
-	- The Zebra ZPL driver did not work with Brady label printers
-	  (STR #2487)
-	- Norwegian wasn't localized on Mac OS X.
-	- getnameinfo() returns an error on some systems when DNS is
-	  not available, leading to numerous problems (STR #2486)
-	- The cupsfilter command did not work properly on Mac OS X.
-	- The scheduler makefile contained a typo (STR #2483)
-	- The TBCP and BCP port monitors did not handle the trailing
-	  CTRL-D in some PostScript output properly.
-	- Fixed the localization instructions and German template for
-	  the "Find New Printers" button (STR #2478)
-	- The web interface did not work with the Chinese localization
-	  (STR #2477)
-	- The web interface home page did not work for languages that
-	  were only partially localized (STR #2472)
-	- Updated the Spanish web interface localization (STR #2473)
-	- ppdLocalize() did not work for country-specific localizations.
-
-
-CHANGES IN CUPS V1.3.0
-
-	- The scheduler did not handle out-of-file conditions
-	  gracefully when accepting new connections, leading to
-	  heavy CPU usage.
-	- The scheduler did not detect ServerBin misconfigurations
-	  (STR #2470)
-	- "AuthType Default" did not work as expected when the
-	  "DefaultAuthType foo" line appeared after it in the
-	  cupsd.conf file.
-	- The on-line help did not describe many common printing
-	  options (STR #1846)
-	- The IPP backend did not return the "auth required" status
-	  when printing to a Kerberos-protected queue.
-	- The scheduler was not looking in the correct directories
-	  for LSB PPD files (STR #2464)
-	- Changed references to ESP Ghostscript to GPL Ghostscript
-	  (STR #2463)
-	- The PostScript filter did not cleanly terminate when
-	  the job was canceled or stopped.
-	- Fixed generation of Kerberos credentials for remote
-	  printing.  Note that this requires a recent version of
-	  MIT Kerberos with a working krb5_cc_new_unique()
-	  function or Heimdal Kerberos.
-	- Added Portuguese and updated Italian message catalogs.
-
-
-CHANGES IN CUPS V1.3rc2
-
-	- Added more range checking to the pdftops filter. 
-	- The scheduler would crash if a remote IPP queue was stopped
-	  (STR #2460)
-	- The scheduler did not allow "DefaultAuthType None".
-
-
-CHANGES IN CUPS V1.3rc1
-
-	- Updated the German localization (STR #2443)
-	- cupsAdminGetServerSettings() did not handle </Foo> properly.
-	- When lprm and cancel are run with no job ID, they now will
-	  cancel the first stopped job if no pending or processing
-	  jobs are left in the queue.
-	- The scheduler now logs successful print jobs, filter
-	  failures, and the job file types at the default log
-	  level (STR #2458)
-	- The scheduler now logs the usernames it is using for
-	  authorization at LogLevel debug instead of debug2 (STR #2448)
-	- Added Intellitech Intellibar and Zebra CPCL PPDs to the list
-	  of installed PPDs.
-	- Added 6" and 8" wide label sizes for the Zebra ZPL Label
-	  Printer driver (STR #2442)
-	- The cupsaddsmb program and web interface now support
-	  exporting of 64-bit Windows drivers, when available
-	  (STR #2439)
-	- Moving a job that was printing did not stop the job on the
-	  original printer (STR #2262)
-	- The cups-lpd mini-daemon did not work on Mac OS X server.
-	- Added httpGetAuthString() and httpSetAuthString() APIs to get
-	  and set the current (cached) authorization string to use for
-	  HTTP requests.
-	- Updated the default cupsd.conf policy to list the
-	  "administrative" operations separately from the "printer
-	  control" operations so that it is easier to define a
-	  group of users that are "printer operators".
-	- The web interface now pulls the default cupsd.conf file
-	  from cupsd.conf.default in the CUPS config directory.
-	- Added a help file for using Kerberos with CUPS.
-	- The scheduler now strips the "@KDC" portion of Kerberos
-	  usernames since those usernames typically do not appear in
-	  the group membership lists used by CUPS.
-	- cupsMarkOptions() could (incorrectly) leave multiple option
-	  choices marked.
-	- Backends could (incorrectly) run as root during discovery
-	  (STR #2454)
-	- Avahi is now supported for DNS-SD (Bonjour) printer sharing
-	  (STR #2455)
-	- The default cupsd.conf file had typos and old operation names
-	  (STR #2450)
-	- The scheduler now erases authentication cache files using the
-	  7-pass US DoD algorithm.
-	- Delegated Kerberos credentials (proxy authentication) did not
-	  work.
-	- The filter makefile did not optimize the libcupsimage.2.dylib
-	  with a sectorder file.
-	- The IPP backend incorrectly wrote an empty printer message
-	  when processing the "none" state reason.
-	- The USB backend could deadlock on Mac OS X while performing
-	  a side-channel command.
-	- The scheduler did not prevent remote queues from being
-	  shared/published.
-	- The scheduler did not remove the temporary request file on
-	  authentication errors.
-	- ppdLocalizeIPPReason() did not handle "scheme:" schemes or
-	  "file" URLs.
-	- ppdLocalizeIPPReason() was not exported on Mac OS X.
-
-
-CHANGES IN CUPS V1.3b1
-
-	- Copyright updates - CUPS is now owned by Apple Inc.
-	- Documentation updates (STR #1775, STR #2027, STR #2130,
-	  STR #2131, STR #2263, STR #2356, STR #2397)
-	- Added new cupsfilter utility (STR #1734)
-	- Added new job-printer-state-message and
-	  job-printer-state-reasons attributes to jobs (STR #2418)
-	- Added LDAP+SSL support (STR #1967)
-	- CUPS now supports authentication via peer credentials
-	  over domain sockets (STR #2242, STR #2277)
-	- The CUPS sample driver PPDs are now generated by the PPD
-	  compiler and include all of the localized languages by
-	  default (STR #2164)
-	- You can now specify "AuthType Default" in the cupsd.conf
-	  file to use the default authentication defined by the
-	  DefaultAuthType directive.
-	- The SNMP backend no longer adds a default Address line
-	  when none is specified in the snmp.conf file; this allows
-	  the backend to be easily disabled as needed (STR #2434)
-	- Added a new cupsctl command for doing basic changes to
-	  the cupsd.conf file (STR #1777)
-	- Added a new ppdLocalizeIPPReason() function to get the
-	  localized text/URI for a given IPP reason keyword for a
-	  driver.
-	- Removed the deskjet2.ppd driver, as it only worked with
-	  a very small subset of HP DeskJet printers and was
-	  confusing to users.  The rastertohp driver still
-	  supports the deskjet2.ppd options for existing queues.
-	- The scheduler did not add a trailing banner page if a
-	  client did not specify the last document in a job (STR
-	  #1711)
-	- The scheduler did not report Bonjour shared printers as
-	  remote printers (STR #2384)
-	- Added new -R and -W options to the cupstestppd program
-	  for greater control over the testing of PPDs.
-	- Added a new cupsGetServerPPD() function for getting
-	  an available PPD from the server (STR #2334)
-	- Added a new cupsDoIORequest() function for reading
-	  and writing files via IPP requests (STR #2334)
-	- Added a new CUPS_GET_PPD operation for getting an
-	  available PPD file on the server (STR #2334) 
-	- CUPS_GET_PPDS now reports multiple ppd-product values
-	  based on the PPD ModelName and Product strings (STR
-	  #2334, STR #2383)
-	- CUPS_GET_PPDS now reports the PSVersion attributes
-	  from a PPD file in the ppd-psversion attribute
-	  (STR #2334)
-	- CUPS_GET_PPDS now reports the cupsModelNumber attribute
-	  from a PPD file in the ppd-model-number attribute (STR
-	  #2383)
-	- CUPS_GET_PPDS now reports a driver type string in the
-	  ppd-type attribute based on the cupsFax and cupsFilter
-	  attributes in a PPD file (STR #2383)
-	- Added a new printer attribute called "cups-version"
-	  which reports the version of CUPS that is running
-	  (STR #2240)
-	- backendRunLoop() now aborts immediately on SIGTERM
-	  if no data has been written yet (STR #2103)
-	- Due to poor IPP support from the vendors, the SNMP
-	  backend no longer tries IPP connections; instead,
-	  it now uses a lookup file with fallback to port 9100
-	  (socket://address) and 515 (lpd://address) printing
-	  (STR #2035, STR #2354) 
-	- The scheduler now recreates the CUPS log directory as
-	  needed (STR #2353)
-	- cupsLangDefault() now maps new-style Apple locale names
-	  to the traditional ll_CC form (STR #2357)
-        - Add new cupsArrayNew2() API to support hashed lookups
-          of array elements (STR #2358)
-        - ppdConflicts() optimizations (STR #2358)
-	- The cupstestppd program now tests for existing filters,
-	  icons, profiles, and dialog extensions (STR #2326)
-	- The web interface no longer lists new printers on the
-	  main administration page.  Instead, a new "List Available
-	  Printers" button is provided that shows a separate page
-	  with the list of printers.
-	- The web interface now supports setting the banner and
-	  policy options on raw printers and classes (STR #2238)
-	- The socket backend now reads any pending back-channel
-	  data before shutting down the socket (STR #2325)
-	- Added a new ErrorPolicy directive in the cupsd.conf
-	  file (STR #1871)
-	- Printers that use JCL options are now exported to Samba
-	  correctly (STR #1985)
-	- The IPP backend now relays printer-state-message values
-	  from the server to the client (STR #2109)
-	- Added support for the PWG printer-alert and
-	  printer-alert-description attributes (STR #2088)
-	- Added support for LPD "stream" mode (STR #2036)
-	- The scheduler now reports the PostScript product string
-	  from PPD files in CUPS-Get-PPDs responses (STR #1900)
-	- Raw printing with queues pointing to the file pseudo-
-	  device and multiple files and/or banners now works (STR
-	  #1933)
-	- Added new public cupsAdminGetServerSettings() and
-	  cupsAdminSetServerSettings() APIs.
-	- Added new "makebuttons" script in the "tools" directory
-	  for creating web interface buttons (STR #2231)
-	- Added support for DNS-SD (aka "Bonjour") printer sharing
-	  (STR #1171)
-	- Job operations (cancel, hold, release, etc.) from the
-	  web interface now return back to the original page (STR
-	  #2239)
-	- The classes or printers list is now shown after a
-	  successful deletion from the web interface (STR #1999)
-	- The default configuration now allows browse packets from
-	  any address (STR #2008)
-	- The web interface now provides an "allow printing from the
-	  Internet" check box (STR #1897)
-	- The notify-events-default and
-	  notify-lease-duration-default attributes can now be set
-	  (STR #1671)
-	- Server-side default options are now sent to clients when
-	  the "printer-defaults" attribute group is requested (STR
-	  #1923)
-	- Added support for Linux "relro" linker option (STR #1614)
-	- CUPS now validates the number-up option value (STR #1329)
-	- The on-line help now provides better search capabilities
-	  (STR #1701)
-	- The web interface "Add This Printer" button now allows you
-	  to change the printer name, description,  and location
-	  (STR #1646)
-	- Added support for Mac OS X authorization services
-	  (STR #2206)
-	- Added support for driver-specific pre-filters (STR #2108)
-	- Added a new side-channel API for drivers and backends
-	  for basic device control and information queries (STR
-	  #1898)
-	- The scheduler now uses poll(), epoll(), or /dev/kqueue
-	  instead of select() when possible (STR #1261)
-	- Added new cupsArrayGetIndex() and cupsArrayGetInsert()
-	  functions to get the current index and insertion
-	  positions of an array.
-	- Added a new --with-max-copies configure option (STR
-	  #2090)
-	- Added new cupsRemoveDest() and cupsSetDefaultDest()
-	  functions.
-	- Added support for cupsPJLCharset attribute in PPD files
-	  which specifies the character set that is used in PJL
-	  strings (STR #1969)
-	- Moved the definition of the (private) _http_s structure
-	  to http-private.h; code that directly accesses the
-	  http_t members will no longer compile!
-	- Added support for setting the document-format-default
-	  attribute on a per-printer basis.
-	- Added support for IntelliBar label printers.
@@ -1,4 +1,4 @@
-CREDITS.txt - 2008-12-08
+CREDITS.txt - 2006-04-17
 ------------------------

 Few projects are completed by one person, and CUPS is no exception.  We'd
@@ -6,7 +6,6 @@ like to thank the following individuals for their contributions:

    Nathaniel Barbour              - Lots of testing and feedback.
    N. Becker                      - setsid().
-    Philippe Combes                - French localization and buttons script.
    Jean-Eric Cuendet              - GhostScript filters for CUPS.
    Van Dang                       - HTTP and IPP policeman.
    L. Peter Deutsch               - MD5 code.
@@ -19,10 +18,8 @@ like to thank the following individuals for their contributions:
    Till Kamppeter                 - Bug fixes, beta testing, evangelism.
    Kenshi Muto                    - Japanese localization, patches, and
                                     testing.
-    Tomohiro Kato                  - Japanese localization.
    Kiko                           - Bug fixes.
    Sergey V. Kovalyov             - ESP Print Pro and CUPS beta tester.
-    Marek Laane                    - Estonian translation.
    Mark Lawrence                  - Microsoft interoperability testing.
    Jeff Licquia                   - Bug fixes, beta testing, evangelism.
    Jason McMullan                 - Original CUPS RPM distributions.
@@ -30,18 +27,15 @@ like to thank the following individuals for their contributions:
    Daniel Nylander                - Swedish 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.
-    Opher Shachar                  - Hebrew localization.
+    Juan Pablo González Riopedre   - Spanish localization
    Stuart Stevens                 - HP JetDirect IPP information.
    Andrea Suatoni                 - IRIX desktop integration and testing.
-    Teppo Turlianen                - Finnish localization.
+    Tomohiro Kato                  - Japanese localization.
    Tim Waugh                      - Lots of patches, testing, and Linux
                                     integration.
    Yugami                         - LDAP browsing support.

 If I've missed someone, please let me know by sending an email to
-"msweet@apple.com".
+"mike@easysw.com".
@@ -1,73 +1,76 @@
-INSTALL - CUPS v1.4b2 - 2008-12-15
+INSTALL - CUPS v1.2.0 - 2006-05-08
 ----------------------------------

-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".
+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.                                                  ****
+**** IF YOU HAVE A NON-POSTSCRIPT PRINTER, YOU WILL ALSO    ****
+**** NEED TO INSTALL ESP GHOSTSCRIPT AFTER YOU INSTALL CUPS ****


 BEFORE YOU BEGIN

-    You'll need ANSI-compliant C and C++ compilers, plus a make program and
-    POSIX-compliant shell (/bin/sh).  The GNU compiler tools and Bash work well
-    and we have tested the current CUPS code against several versions of GCC
-    with excellent results.
+    You'll need ANSI-compliant C and C++ compilers, plus a make
+    program and Bourne shell.  The GNU compiler tools work well -
+    we've tested the current CUPS code against several versions
+    of GCC with excellent results.

-    The makefiles used by the project should work with most versions of make.
-    We've tested them with GNU make as well as the make programs shipped by
-    Compaq, HP, SGI, and Sun.  BSD users should use GNU make (gmake) since BSD
-    make does not support "include".
+    The makefiles used by the project should work with all
+    versions of make.  We've tested them with GNU make as well as
+    the make programs shipped by Compaq, HP, SGI, and Sun. 
+    FreeBSD users should use GNU make (gmake).

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

-    Also, please note that CUPS does not include the Ghostscript-based
-    PostScript filter needed by non-PostScript printers.  You *must* download
-    GPL Ghostscript separately from the CUPS web site if you want to print
-    PostScript files to non-PostScript printers on operating systems other than
-    Mac OS X.
+    Also, please note that CUPS no longer includes the
+    Ghostscript- based pstoraster filter.  You *must* download
+    ESP Ghostscript separately from the CUPS web site if you want
+    to print PostScript files to non-PostScript printers.


-COMPILING THE SUBVERSION REPOSITORY CODE
+COMPILING FROM SUBVERSION

-    The CUPS Subversion repository doesn't hold a copy of the pre-built
-    configure script.  You'll need to run the GNU autoconf software (2.60 or
-    higher) to create it:
+    The CUPS Subversion repository doesn't hold a copy of the
+    pre-built configure script.  You'll need to run the GNU
+    autoconf software (2.52 or higher) before compiling the
+    software from Subversion:

 	autoconf -f


 CONFIGURATION

-    CUPS uses GNU autoconf, so you should find the usual "configure" script in
-    the main CUPS source directory.  To configure CUPS for your system, type:
+    CUPS uses GNU autoconf, so you should find the usual
+    "configure" script in the main CUPS source directory.  To
+    configure CUPS for your system, type:

 	./configure

-    The default installation will put the CUPS software in the "/etc", "/usr",
-    and "/var" directories on your system, which will overwrite any existing
-    printing commands on your system.  Use the "--prefix" option to install the
-    CUPS software in another location:
+    The default installation will put the CUPS software in the
+    "/etc", "/usr", and "/var" directories on your system, which
+    will overwrite any existing printing commands on your system.
+    Use the "--prefix" option to install the CUPS software in
+    another location:

 	./configure --prefix=/some/directory

-    To see a complete list of configuration options, use the --help option:
+    To see a complete list of configuration options, use the
+    --help option:

        ./configure --help

-    If any of the dependent libraries are not installed in a system default
-    location (typically "/usr/include" and "/usr/lib") you'll need to set the
-    CFLAGS, CPPFLAGS, CXXFLAGS, DSOFLAGS, and LDFLAGS environment variables
-    prior to running configure:
+    If any of the dependent libraries are not installed in a
+    system default location (typically "/usr/include" and
+    "/usr/lib") you'll need to set the CFLAGS, CPPFLAGS,
+    CXXFLAGS, DSOFLAGS, and LDFLAGS environment variables prior
+    to running configure:

 	setenv CFLAGS "-I/some/directory"
 	setenv CPPFLAGS "-I/some/directory"
@@ -85,15 +88,6 @@ CONFIGURATION
 	LDFLAGS="-L/some/directory" \
 	./configure ...

-    The "--enable-debug" option compiles CUPS with debugging information
-    enabled.  Additional debug logging support can be enabled using the
-    "--enable-debug-printfs" option - these debug messages are enabled using the
-    CUPS_DEBUG_LOG environment variable at run-time.
-
-    CUPS also includes an extensive set of unit tests that can be used to find
-    and diagnose a variety of common problems - use the "--enable-unit-tests"
-    configure option to run them at build time.
-
    Once you have configured things, just type:

 	make ENTER
@@ -105,26 +99,11 @@ CONFIGURATION
    to build the software.


-TESTING THE SOFTWARE
-
-    Aside from the built-in unit tests, CUPS includes an automated test
-    framework for testing the entire printing system.  To run the tests, just
-    type:
-
-	make check ENTER
-
-    or if you have FreeBSD, NetBSD, or OpenBSD type:
-
-	gmake check ENTER
-
-    The test framework runs a copy of the CUPS scheduler (cupsd) on port 8631
-    in /tmp/cups-$USER and produces a nice HTML report of the results.
-
-
 INSTALLING THE SOFTWARE

-    Once you have built the software you need to install it.  The "install"
-    target provides a quick way to install the software on your local system:
+    Once you have built the software you need to install it.  The
+    "install" target provides a quick way to install the software
+    on your local system:

 	make install ENTER

@@ -132,10 +111,12 @@ INSTALLING THE SOFTWARE

 	gmake install ENTER

-    You can also build binary packages that can be installed on other machines
-    using the RPM spec file ("packaging/cups.spec") or EPM list file
-    ("packaging/cups.list").  The latter also supports building of binary RPMs,
-    so it may be more convenient to use.
+    You can also build binary packages that can be installed on
+    other machines using the RPM spec file
+    ("packaging/cups.spec") or EPM list file
+    ("packaging/cups.list").  The latter also supports building
+    of binary RPMs, so it may be more convenient to use - we use
+    EPM to build all of our binary distributions.

    You can find the RPM software at:

@@ -143,7 +124,7 @@ INSTALLING THE SOFTWARE

    The EPM software is available at:

-	http://www.epmhome.org/
+	http://www.easysw.com/epm/


 CREATING BINARY DISTRIBUTIONS WITH EPM
@@ -157,8 +138,8 @@ CREATING BINARY DISTRIBUTIONS WITH EPM

 	gmake <format> ENTER

-    for FreeBSD, NetBSD, and OpenBSD.  The <format> target is one of the
-    following:
+    for FreeBSD, NetBSD, and OpenBSD.  The <format> target is one of
+    the following:

 	epm       - Builds a script + tarfile package
 	aix       - Builds an AIX package
@@ -175,27 +156,19 @@ CREATING BINARY DISTRIBUTIONS WITH EPM
 	tardist   - Builds an IRIX package (also inst)


-GETTING DEBUG LOGGING FROM CUPS
-
-    When configured with the "--enable-debug-printfs" option, CUPS compiles in
-    additional debug logging support in the scheduler, CUPS API, and CUPS
-    Imaging API.  Set the CUPS_DEBUG_LOG environment variable to a filename to
-    append logging information at run-time.  Use the name "-" to send the
-    messages to stderr.
-
-
 REPORTING PROBLEMS

-    If you have problems, READ THE DOCUMENTATION FIRST!  If the documentation
-    does not solve your problems, please post a message on the "cups.general"
-    forum at:
+    If you have problems, READ THE DOCUMENTATION FIRST!  If the
+    documentation does not solve your problems, please post a
+    message on the "cups.general" forum at:

        http://www.cups.org/newsgroups.php

-    Include your operating system and version, compiler and version, and any
-    errors or problems you've run into.  The "config.log" file and the output
-    from the configure script and make should also be sent, as it often helps to
-    determine the cause of your problem.
+    Include your operating system and version, compiler and
+    version, and any errors or problems you've run into. The
+    "config.log" file and the output from the configure script
+    and make should also be sent, as it often helps to determine
+    the cause of your problem.

-    If you are running a version of Linux, be sure to provide the Linux
-    distribution you have, too.
+    If you are running a version of Linux, be sure to provide the
+    Linux distribution you have, too.
@@ -1,10 +1,12 @@
                Common UNIX Printing System License Agreement

-                        Copyright 2007 by Apple Inc.
-			     1 Infinite Loop
-			  Cupertino, CA 95014 USA
+                Copyright 1997-2006 by Easy Software Products
+                        44141 AIRPORT VIEW DR STE 204
+                     HOLLYWOOD, MARYLAND 20636 USA

-                         WWW: http://www.cups.org/
+                           Voice: +1.301.373.9600
+                          Email: cups-info@cups.org
+                          WWW: http://www.cups.org


 INTRODUCTION
@@ -15,12 +17,12 @@ General Public License ("LGPL"), Version 2, with exceptions for
 Apple operating systems and the OpenSSL toolkit. A copy of the
 exceptions and licenses follow this introduction.

-The GNU LGPL applies to the CUPS and CUPS Imaging libraries
-located in the "cups" and "filter" subdirectories of the CUPS
-source distribution and in the "cups" include directory and
-library files in the binary distributions. The GNU GPL applies to
-the remainder of the CUPS distribution, including the "pdftops"
-filter which is based upon Xpdf.
+The GNU LGPL applies to the CUPS API library, located in the
+"cups" subdirectory of the CUPS source distribution and in the
+"cups" include directory and library files in the binary
+distributions. The GNU GPL applies to the remainder of the CUPS
+distribution, including the "pdftops" filter which is based upon
+Xpdf and the CUPS imaging library.

 For those not familiar with the GNU GPL, the license basically
 allows you to:
@@ -30,25 +32,28 @@ allows you to:
     binary form.
   - Sell verbatim copies of the software for a media fee, or
     sell support for the software.
+   - Distribute or sell printer drivers and filters that use
+     CUPS so long as source code is made available under the
+     GPL.

 What this license *does not* allow you to do is make changes or
 add features to CUPS and then sell a binary distribution without
-source code. You must provide source for any changes or additions
-to the software, and all code must be provided under the GPL or
-LGPL as appropriate. The only exceptions to this are the portions
-of the CUPS software covered by the Apple operating system
-license exceptions outlined later in this license agreement.
+source code. You must provide source for any new drivers,
+changes, or additions to the software, and all code must be
+provided under the GPL or LGPL as appropriate. The only
+exceptions to this are the portions of the CUPS software covered
+by the Apple operating system license exceptions outlined later
+in this license agreement.

 The GNU LGPL relaxes the "link-to" restriction, allowing you to
-develop applications that use the CUPS and CUPS Imaging libraries
-under other licenses and/or conditions as appropriate for your
-application, driver, or filter.
+develop applications that use the CUPS API library under other
+licenses and/or conditions as appropriate for your application.


 LICENSE EXCEPTIONS

-In addition, as the copyright holder of CUPS, Apple Inc. grants
-the following special exceptions:
+In addition, as the copyright holder of CUPS, Easy Software
+Products grants the following special exceptions:

     1. Apple Operating System Development License Exception;

@@ -91,58 +96,49 @@ the following special exceptions:

     2. OpenSSL Toolkit License Exception;

-	a. Apple Inc. explicitly allows the compilation and
-	   distribution of the CUPS software with the OpenSSL
-	   Toolkit.
+	a. Easy Software Products explicitly allows the
+	   compilation and distribution of the CUPS software
+	   with the OpenSSL Toolkit.

 No developer is required to provide these exceptions in a
 derived work.


-KERBEROS SUPPORT CODE
-
-The Kerberos support code ("KSC") is copyright 2006 by Jelmer
-Vernooij and is provided 'as-is', without any express or implied
-warranty.  In no event will the author or Apple Inc. be held
-liable for any damages arising from the use of the KSC.
-
-Sources files containing KSC have the following text at the top
-of each source file:
-
-     This file contains Kerberos support code, copyright 2006 by
-     Jelmer Vernooij.
-
-The KSC copyright and license apply only to Kerberos-related
-feature code in CUPS.  Such code is typically conditionally
-compiled based on the present of the HAVE_GSSAPI preprocessor
-definition.
-
-Permission is granted to anyone to use the KSC for any purpose,
-including commercial applications, and to alter it and
-redistribute it freely, subject to the following restrictions:
-
-     1. The origin of the KSC must not be misrepresented; you
-	must not claim that you wrote the original software. If
-	you use the KSC in a product, an acknowledgment in the
-	product documentation would be appreciated but is not
-	required.
-
-     2. Altered source versions must be plainly marked as such,
-	and must not be misrepresented as being the original
-	software.
-
-     3. This notice may not be removed or altered from any source
-	distribution. 
-
-
 TRADEMARKS

-Apple Inc. has trademarked the Common UNIX Printing System, CUPS,
-and CUPS logo. You may use these names and logos in any direct port
-or binary distribution of CUPS. Please contact Apple Inc. for written
-permission to use them in derivative products. Our intention is to
-protect the value of these trademarks and ensure that any derivative
-product meets the same high-quality standards as the original.
+Easy Software Products has trademarked the Common UNIX Printing
+System, CUPS, and CUPS logo. You may use these names and logos
+in any direct port or binary distribution of CUPS. Please
+contact Easy Software Products for written permission to use
+them in derivative products. Our intention is to protect the
+value of these trademarks and ensure that any derivative product
+meets the same high-quality standards as the original.
+
+
+BINARY DISTRIBUTION RIGHTS
+
+Easy Software Products also sells rights to the CUPS source code
+under a binary distribution license for vendors that are unable
+to release source code for their drivers, additions, and
+modifications to CUPS under the GNU GPL and LGPL. For
+information please contact us at the address shown above.
+
+The Common UNIX Printing System provides a "pdftops" filter that
+is based on the Xpdf software. For binary distribution licensing
+of this software, please contact:
+
+     Derek B. Noonburg
+     Email: derekn@glyphandcog.com
+     WWW: http://www.glyphandcog.com/
+
+
+SUPPORT
+
+Easy Software Products sells software support for CUPS as well
+as a commercial printing product based on CUPS called ESP Print
+Pro. You can find out more at our web site:
+
+     http://www.easysw.com/

 		    GNU GENERAL PUBLIC LICENSE
 		       Version 2, June 1991
@@ -3,14 +3,23 @@
 #
 #   Common makefile definitions for the Common UNIX Printing System (CUPS).
 #
-#   Copyright 2007-2008 by Apple Inc.
-#   Copyright 1997-2007 by Easy Software Products, all rights reserved.
+#   Copyright 1997-2006 by Easy Software Products, all rights reserved.
 #
 #   These coded instructions, statements, and computer programs are the
-#   property of Apple Inc. and are protected by Federal copyright
-#   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
-#   which should have been included with this file.  If this file is
-#   file is missing or damaged, see the license at "http://www.cups.org/".
+#   property of Easy Software Products and are protected by Federal
+#   copyright law.  Distribution and use rights are outlined in the file
+#   "LICENSE.txt" which should have been included with this file.  If this
+#   file is missing or damaged please contact Easy Software Products
+#   at:
+#
+#       Attn: CUPS Licensing Information
+#       Easy Software Products
+#       44141 Airport View Drive, Suite 204
+#       Hollywood, Maryland 20636 USA
+#
+#       Voice: (301) 373-9600
+#       EMail: cups-info@cups.org
+#         WWW: http://www.cups.org
 #

 #
@@ -22,7 +31,6 @@ AWK		=	@AWK@
 CC		=	@LIBTOOL@ @CC@
 CXX		=	@LIBTOOL@ @CXX@
 DSO		=	@DSO@
-DSOXX		=	@DSOXX@
 HTMLDOC		=	@HTMLDOC@
 INSTALL		=	@INSTALL@
 LD		=	@LD@
@@ -35,17 +43,17 @@ RM		=	@RM@ -f
 RMDIR		=	@RMDIR@
 SED		=	@SED@
 SHELL		=	/bin/sh
-
+STRIP		=	@STRIP@

 #
 # Installation programs...
 #

-INSTALL_BIN	=	$(LIBTOOL) $(INSTALL) -m 755 @INSTALL_STRIP@
+INSTALL_BIN	=	$(LIBTOOL) $(INSTALL) -m 755
 INSTALL_CONFIG	=	$(INSTALL) -m @CUPS_CONFIG_FILE_PERM@
 INSTALL_DATA	=	$(INSTALL) -m 644
 INSTALL_DIR	=	$(INSTALL) -d
-INSTALL_LIB	=	$(LIBTOOL) $(INSTALL) -m 755 @INSTALL_STRIP@
+INSTALL_LIB	=	$(LIBTOOL) $(INSTALL) -m 755
 INSTALL_MAN	=	$(INSTALL) -m 644
 INSTALL_SCRIPT	=	$(INSTALL) -m 755

@@ -78,21 +86,14 @@ UNINSTALL_LANGUAGES =	@UNINSTALL_LANGUAGES@
 #

 LIBCUPS		=	@LIBCUPS@
-LIBCUPSCGI	=	@LIBCUPSCGI@
-LIBCUPSDRIVER	=	@LIBCUPSDRIVER@
 LIBCUPSIMAGE	=	@LIBCUPSIMAGE@
-LIBCUPSMIME	=	@LIBCUPSMIME@
-LIBCUPSPPDC	=	@LIBCUPSPPDC@
 LIBJPEG		=	@LIBJPEG@
 LIBLDAP		=	@LIBLDAP@
 LIBMALLOC	=	@LIBMALLOC@
 LIBPAPER	=	@LIBPAPER@
 LIBPNG		=	@LIBPNG@
 LIBSLP		=	@LIBSLP@
-LIBGSSAPI	=	@LIBGSSAPI@
 LIBTIFF		=	@LIBTIFF@
-LIBUSB		=	@LIBUSB@
-LIBWRAP		=	@LIBWRAP@
 LIBZ		=	@LIBZ@

 #
@@ -104,7 +105,8 @@ INSTALLSTATIC	=	@INSTALLSTATIC@
 #
 # Program options...
 #
-# ARCHFLAGS     Defines the default architecture build options.
+# ARCHFLAGS     Defines the default architecture build options, used
+#               when compiling separate 32/64-bit libraries.
 # ARCH32FLAGS   Defines the 32-bit architecture build options, used
 #               when compiling separate 32/64-bit libraries.
 # ARCH64FLAGS   Defines the 64-bit architecture build options, used
@@ -115,35 +117,22 @@ INSTALLSTATIC	=	@INSTALLSTATIC@
 #               for extra debug info)
 #

-ALL_CFLAGS	=	-I.. -D_CUPS_SOURCE $(CFLAGS) $(SSLFLAGS) \
-			@LARGEFILE@ @PTHREAD_FLAGS@ $(OPTIONS)
-ALL_CXXFLAGS	=	-I.. -D_CUPS_SOURCE $(CXXFLAGS) $(SSLFLAGS) \
-			@LARGEFILE@ @PTHREAD_FLAGS@ $(OPTIONS)
 ARCHFLAGS	=	@ARCHFLAGS@
 ARFLAGS		=	@ARFLAGS@
 BACKLIBS	=	@BACKLIBS@
-BANNERTOPS	=	@BANNERTOPS@
-CFLAGS		=	@CPPFLAGS@ @CFLAGS@
+CFLAGS		=	-I.. $(SSLFLAGS) @CPPFLAGS@ @CFLAGS@ \
+			@LARGEFILE@ @PTHREAD_FLAGS@ $(OPTIONS)
 COMMONLIBS	=	@LIBS@
 CUPSDLIBS	=	@CUPSDLIBS@
-CXXFLAGS	=	@CPPFLAGS@ @CXXFLAGS@
+CXXFLAGS	=	-I.. $(SSLFLAGS) @CPPFLAGS@ @CXXFLAGS@ \
+			@LARGEFILE@ @PTHREAD_FLAGS@ $(OPTIONS)
 CXXLIBS		=	@CXXLIBS@
-DBUS_NOTIFIER	=	@DBUS_NOTIFIER@
-DBUS_NOTIFIERLIBS =	@DBUS_NOTIFIERLIBS@
-DNSSD_BACKEND	=	@DNSSD_BACKEND@
-DSOFLAGS	=	-L../cups @DSOFLAGS@
+DSOFLAGS	=	@DSOFLAGS@
 DSOLIBS		=	@DSOLIBS@ $(COMMONLIBS)
-DNSSDLIBS	=	@DNSSDLIBS@
-FONTS		=	@FONTS@
 IMGLIBS		=	@IMGLIBS@
 IMGFILTERS	=	@IMGFILTERS@
-LAUNCHDLIBS	=	@LAUNCHDLIBS@
-LDFLAGS		=	-L../cgi-bin -L../cups -L../filter -L../ppdc \
-			-L../scheduler @LDARCHFLAGS@ \
-			@LDFLAGS@ @RELROFLAGS@ @PIEFLAGS@ $(OPTIM)
-LEGACY_BACKENDS	=	@LEGACY_BACKENDS@
-LIBCUPSORDER	=	@LIBCUPSORDER@
-LIBCUPSIMAGEORDER =	@LIBCUPSIMAGEORDER@
+LDFLAGS		=	-L../cups -L../filter $(ARCHFLAGS) \
+			@LDFLAGS@ @PIEFLAGS@ $(OPTIM)
 LINKCUPS	=	@LINKCUPS@ $(SSLLIBS)
 LINKCUPSIMAGE	=	@LINKCUPSIMAGE@
 LIBS		=	$(LINKCUPS) $(COMMONLIBS)
@@ -153,12 +142,9 @@ PAMLIBS		=	@PAMLIBS@
 PAP		=	@PAP@
 PDFTOPS		=	@PDFTOPS@
 PHPDIR		=	@PHPDIR@
-PHPOPTIONS	=	@PHPOPTIONS@ -I../.. `$(PHPCONFIG) --includes`
 SSLFLAGS	=	@SSLFLAGS@
 SSLLIBS		=	@SSLLIBS@
-TEXTTOPS	=	@TEXTTOPS@
-UNITTESTS	=	@UNITTESTS@
-
+LAUNCHDLIBS	=	@LAUNCHDLIBS@

 #
 # Separate 32/64-bit library support...
@@ -220,7 +206,6 @@ BINDIR		=	$(BUILDROOT)@bindir@
 CACHEDIR	=	$(BUILDROOT)@CUPS_CACHEDIR@
 DATADIR		=	$(BUILDROOT)@CUPS_DATADIR@
 DOCDIR		=	$(BUILDROOT)@CUPS_DOCROOT@
-ICONDIR		=	@ICONDIR@
 INCLUDEDIR	=	$(BUILDROOT)$(includedir)
 INITDIR		=	@INITDIR@
 INITDDIR	=	@INITDDIR@
@@ -228,16 +213,11 @@ LIBDIR		=	$(BUILDROOT)$(libdir)
 LOCALEDIR	= 	$(BUILDROOT)@CUPS_LOCALEDIR@
 LOGDIR		= 	$(BUILDROOT)@CUPS_LOGDIR@
 MANDIR		=	$(BUILDROOT)@mandir@
-MENUDIR		=	@MENUDIR@
 PMANDIR		=	$(BUILDROOT)@PMANDIR@
-RCLEVELS	=	@RCLEVELS@
-RCSTART		=	@RCSTART@
-RCSTOP		=	@RCSTOP@
 REQUESTS	= 	$(BUILDROOT)@CUPS_REQUESTS@
 SBINDIR		=	$(BUILDROOT)@sbindir@
 SERVERBIN	= 	$(BUILDROOT)@CUPS_SERVERBIN@
 SERVERROOT	= 	$(BUILDROOT)@CUPS_SERVERROOT@
-SMFMANIFESTDIR	= 	@SMFMANIFESTDIR@
 STATEDIR	=	$(BUILDROOT)@CUPS_STATEDIR@
 XINETD		=	@XINETD@

@@ -259,30 +239,30 @@ DBUSDIR		=	@DBUSDIR@
 #

 .SILENT:
-.SUFFIXES:	.1 .1.gz .1m .1m.gz .3 .3.gz .5 .5.gz .7 .7.gz .8 .8.gz .a .c .cxx .h .man .o .32.o .64.o .gz
+.SUFFIXES:	.1 .1.gz .1m .1m.gz .5 .5.gz .7 .7.gz .8 .8.gz .a .c .cxx .h .man .o .32.o .64.o .gz

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

 .c.32.o:
 	echo Compiling 32-bit $<...
-	$(CC) $(ARCH32FLAGS) $(OPTIM) $(ALL_CFLAGS) -c -o $@ $<
+	$(CC) $(ARCH32FLAGS) $(OPTIM) $(CFLAGS) -c -o $@ $<

 .c.64.o:
 	echo Compiling 64-bit $<...
-	$(CC) $(ARCH64FLAGS) $(OPTIM) $(ALL_CFLAGS) -c -o $@ $<
+	$(CC) $(ARCH64FLAGS) $(OPTIM) $(CFLAGS) -c -o $@ $<

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

-.man.1 .man.1m .man.3 .man.5 .man.7 .man.8:
+.man.1 .man.1m .man.5 .man.7 .man.8:
 	echo Linking $<...
 	$(RM) $@
 	$(LN) $< $@

-.man.1.gz .man.1m.gz .man.3.gz .man.5.gz .man.7.gz .man.8.gz .man.gz:
+.man.1.gz .man.1m.gz .man.5.gz .man.7.gz .man.8.gz .man.gz:
 	echo -n Compressing $<...
 	$(RM) $@
 	gzip -v9 <$< >$@
@@ -3,34 +3,35 @@
 #
 #   Top-level Makefile for the Common UNIX Printing System (CUPS).
 #
-#   Copyright 2007-2008 by Apple Inc.
-#   Copyright 1997-2007 by Easy Software Products, all rights reserved.
+#   Copyright 1997-2006 by Easy Software Products, all rights reserved.
 #
 #   These coded instructions, statements, and computer programs are the
-#   property of Apple Inc. and are protected by Federal copyright
-#   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
-#   which should have been included with this file.  If this file is
-#   file is missing or damaged, see the license at "http://www.cups.org/".
+#   property of Easy Software Products and are protected by Federal
+#   copyright law.  Distribution and use rights are outlined in the file
+#   "LICENSE.txt" which should have been included with this file.  If this
+#   file is missing or damaged please contact Easy Software Products
+#   at:
+#
+#       Attn: CUPS Licensing Information
+#       Easy Software Products
+#       44141 Airport View Drive, Suite 204
+#       Hollywood, Maryland 20636-3142 USA
+#
+#       Voice: (301) 373-9600
+#       EMail: cups-info@cups.org
+#         WWW: http://www.cups.org
 #

 include Makedefs

-
-#
-# Don't run top-level build targets in parallel...
-#
-
-.NOTPARALLEL:
-
-
 #
 # Directories to make...
 #

-DIRS	=	cups filter backend berkeley cgi-bin driver locale man monitor \
-		notifier ppdc scheduler systemv test \
+DIRS	=	cups backend berkeley cgi-bin filter locale man monitor \
+		notifier $(PDFTOPS) scheduler systemv test \
 		$(PHPDIR) \
-		conf data doc examples $(FONTS) templates
+		conf data doc fonts ppd templates


 #
@@ -39,55 +40,9 @@ DIRS	=	cups filter backend berkeley cgi-bin driver locale man monitor \

 all:
 	chmod +x cups-config
-	echo Using ARCHFLAGS="$(ARCHFLAGS)"
-	echo Using ALL_CFLAGS="$(ALL_CFLAGS)"
-	echo Using ALL_CXXFLAGS="$(ALL_CXXFLAGS)"
-	echo Using CC="$(CC)"
-	echo Using CXX="$(CC)"
-	echo Using DSOFLAGS="$(DSOFLAGS)"
-	echo Using LDFLAGS="$(LDFLAGS)"
-	echo Using LIBS="$(LIBS)"
 	for dir in $(DIRS); do\
 		echo Making all in $$dir... ;\
-		(cd $$dir ; $(MAKE) $(MFLAGS) all $(UNITTESTS)) || exit 1;\
-	done
-
-
-#
-# Make library targets...
-#
-
-libs:
-	echo Using ARCHFLAGS="$(ARCHFLAGS)"
-	echo Using ALL_CFLAGS="$(ALL_CFLAGS)"
-	echo Using ALL_CXXFLAGS="$(ALL_CXXFLAGS)"
-	echo Using CC="$(CC)"
-	echo Using CXX="$(CC)"
-	echo Using DSOFLAGS="$(DSOFLAGS)"
-	echo Using LDFLAGS="$(LDFLAGS)"
-	echo Using LIBS="$(LIBS)"
-	for dir in $(DIRS); do\
-		echo Making libraries in $$dir... ;\
-		(cd $$dir ; $(MAKE) $(MFLAGS) libs) || exit 1;\
-	done
-
-
-#
-# Make unit test targets...
-#
-
-unittests:
-	echo Using ARCHFLAGS="$(ARCHFLAGS)"
-	echo Using ALL_CFLAGS="$(ALL_CFLAGS)"
-	echo Using ALL_CXXFLAGS="$(ALL_CXXFLAGS)"
-	echo Using CC="$(CC)"
-	echo Using CXX="$(CC)"
-	echo Using DSOFLAGS="$(DSOFLAGS)"
-	echo Using LDFLAGS="$(LDFLAGS)"
-	echo Using LIBS="$(LIBS)"
-	for dir in $(DIRS); do\
-		echo Making all in $$dir... ;\
-		(cd $$dir ; $(MAKE) $(MFLAGS) unittests) || exit 1;\
+		(cd $$dir ; $(MAKE) $(MFLAGS)) || exit 1;\
 	done


@@ -108,22 +63,17 @@ 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) init/cups.sh init/cups-lpd init/org.cups.cups-lpd.plist
-	$(RM) man/client.conf.man
+	$(RM) cups-config conf/cupsd.conf conf/pam.std
+	$(RM) doc/help/standard.html doc/index.html
+	$(RM) init/cups.sh init/cups-lpd
 	$(RM) man/cups-deviced.man man/cups-driverd.man
 	$(RM) man/cups-lpd.man man/cupsaddsmb.man man/cupsd.man
-	$(RM) man/cupsd.conf.man man/drv.man man/lpoptions.man
-	$(RM) packaging/cups.list
-	$(RM) packaging/cups-desc.plist packaging/cups-info.plist
-	$(RM) templates/header.tmpl
-	$(RM) desktop/cups.desktop
-	$(RM) init/cups.xml
+	$(RM) man/cupsd.conf.man man/lpoptions.man
+	$(RM) packaging/cups templates/edit-config.tmpl templates/header.tmpl
 	-$(RM) doc/*/index.html
+	-$(RM) templates/*/edit-config.tmpl
 	-$(RM) templates/*/header.tmpl
-	-$(RM) -r autom4te*.cache clang cups/charmaps cups/locale driver/test
+	-$(RM) -r autom4te*.cache


 #
@@ -138,39 +88,13 @@ depend:


 #
-# Run the clang.llvm.org static code analysis tool on the C sources.
+# Install object and target files...
 #

-.PHONY: clang
-clang:
-	$(RM) -r clang
-	scan-build -V -k -o `pwd`/clang $(MAKE) $(MFLAGS) \
-		CC=ccc-analyzer CXX=ccc-analyzer clean all
-
-
-#
-# Generate a ctags file...
-#
-
-ctags:
-	ctags -R .
-
-
-#
-# Install everything...
-#
-
-install:	install-data install-headers install-libs install-exec
-
-
-#
-# Install data files...
-#
-
-install-data:
+install:	installhdrs
 	for dir in $(DIRS); do\
-		echo Installing data files in $$dir... ;\
-		(cd $$dir; $(MAKE) $(MFLAGS) install-data) || exit 1;\
+		echo Installing in $$dir... ;\
+		(cd $$dir; $(MAKE) $(MFLAGS) install) || exit 1;\
 	done
 	echo Installing cups-config script...
 	$(INSTALL_DIR) -m 755 $(BINDIR)
@@ -179,101 +103,67 @@ install-data:
 		echo Installing init scripts...; \
 		$(INSTALL_DIR) -m 755 $(BUILDROOT)$(INITDIR)/init.d; \
 		$(INSTALL_SCRIPT) init/cups.sh $(BUILDROOT)$(INITDIR)/init.d/cups; \
-		for level in $(RCLEVELS); do \
-			$(INSTALL_DIR) -m 755 $(BUILDROOT)$(INITDIR)/rc$${level}.d; \
-			$(LN) ../init.d/cups $(BUILDROOT)$(INITDIR)/rc$${level}.d/S$(RCSTART)cups; \
-			if test `uname` = HP-UX; then \
-				level=`expr $$level - 1`; \
-				$(INSTALL_DIR) -m 755 $(BUILDROOT)$(INITDIR)/rc$${level}.d; \
-			fi; \
-			$(LN) ../init.d/cups $(BUILDROOT)$(INITDIR)/rc$${level}.d/K$(RCSTOP)cups; \
-		done; \
 		$(INSTALL_DIR) -m 755 $(BUILDROOT)$(INITDIR)/rc0.d; \
-		$(LN) ../init.d/cups $(BUILDROOT)$(INITDIR)/rc0.d/K$(RCSTOP)cups; \
+		$(INSTALL_SCRIPT) init/cups.sh  $(BUILDROOT)$(INITDIR)/rc0.d/K00cups; \
+		$(INSTALL_DIR) -m 755 $(BUILDROOT)$(INITDIR)/rc2.d; \
+		$(INSTALL_SCRIPT) init/cups.sh $(BUILDROOT)$(INITDIR)/rc2.d/S99cups; \
+		$(INSTALL_DIR) -m 755 $(BUILDROOT)$(INITDIR)/rc3.d; \
+		$(INSTALL_SCRIPT) init/cups.sh $(BUILDROOT)$(INITDIR)/rc3.d/S99cups; \
+		$(INSTALL_DIR) -m 755 $(BUILDROOT)$(INITDIR)/rc5.d; \
+		$(INSTALL_SCRIPT) init/cups.sh $(BUILDROOT)$(INITDIR)/rc5.d/S99cups; \
 	fi
 	if test "x$(INITDIR)" = x -a "x$(INITDDIR)" != x; then \
 		$(INSTALL_DIR) $(BUILDROOT)$(INITDDIR); \
-		if test "$(INITDDIR)" = "/System/Library/LaunchDaemons"; then \
+		if test "$(INITDDIR)" = "/System/Library/StartupItems/PrintingServices"; then \
+			echo Installing StartupItems files...; \
+			$(INSTALL_SCRIPT) init/PrintingServices $(BUILDROOT)$(INITDDIR)/PrintingServices; \
+			$(INSTALL_DATA) init/StartupParameters.plist $(BUILDROOT)$(INITDDIR)/StartupParameters.plist; \
+			$(INSTALL_DIR) -m 755 $(BUILDROOT)$(INITDDIR)/Resources/English.lproj; \
+			$(INSTALL_DATA) init/Localizable.strings $(BUILDROOT)$(INITDDIR)/Resources/English.lproj/Localizable.strings; \
+		elif test "$(INITDDIR)" = "/System/Library/LaunchDaemons"; then \
 			echo Installing LaunchDaemons configuration files...; \
 			$(INSTALL_DATA) init/org.cups.cupsd.plist $(BUILDROOT)$(DEFAULT_LAUNCHD_CONF); \
 			$(INSTALL_DATA) init/org.cups.cups-lpd.plist $(BUILDROOT)/System/Library/LaunchDaemons; \
-			case `uname -r` in \
-				8.*) \
-				$(INSTALL_DIR) $(BUILDROOT)/System/Library/StartupItems/PrintingServices; \
-				$(INSTALL_SCRIPT) init/PrintingServices.launchd $(BUILDROOT)/System/Library/StartupItems/PrintingServices/PrintingServices; \
-				$(INSTALL_DATA) init/StartupParameters.plist $(BUILDROOT)/System/Library/StartupItems/PrintingServices/StartupParameters.plist; \
-				$(INSTALL_DIR) $(BUILDROOT)/System/Library/StartupItems/PrintingServices/Resources/English.lproj; \
-				$(INSTALL_DATA) init/Localizable.strings $(BUILDROOT)/System/Library/StartupItems/PrintingServices/Resources/English.lproj/Localizable.strings; \
-				;; \
-			esac \
 		else \
 			echo Installing RC script...; \
 			$(INSTALL_SCRIPT) init/cups.sh $(BUILDROOT)$(INITDDIR)/cups; \
 		fi \
 	fi
-	if test "x$(SMFMANIFESTDIR)" != x; then \
-		echo Installing SMF manifest in $(SMFMANIFESTDIR)...;\
-		$(INSTALL_DIR) $(BUILDROOT)/$(SMFMANIFESTDIR); \
-		$(INSTALL_SCRIPT) init/cups.xml $(BUILDROOT)$(SMFMANIFESTDIR)/cups.xml; \
-	fi
 	if test "x$(DBUSDIR)" != x; then \
 		echo Installing cups.conf in $(DBUSDIR)...;\
-		$(INSTALL_DIR) -m 755 $(BUILDROOT)$(DBUSDIR)/system.d; \
-		$(INSTALL_DATA) packaging/cups-dbus.conf $(BUILDROOT)$(DBUSDIR)/system.d/cups.conf; \
+		$(INSTALL_DIR) -m 755 $(BUILDROOT)$(DBUSDIR); \
+		$(INSTALL_DATA) packaging/cups-dbus.conf $(BUILDROOT)$(DBUSDIR)/cups.conf; \
 	fi
 	if test "x$(XINETD)" != x; then \
 		echo Installing xinetd configuration file for cups-lpd...; \
 		$(INSTALL_DIR) -m 755 $(BUILDROOT)$(XINETD); \
 		$(INSTALL_DATA) init/cups-lpd $(BUILDROOT)$(XINETD)/cups-lpd; \
 	fi
-	if test "x$(MENUDIR)" != x; then \
-		echo Installing desktop menu...; \
-		$(INSTALL_DIR) -m 755 $(BUILDROOT)$(MENUDIR); \
-		$(INSTALL_DATA) desktop/cups.desktop $(BUILDROOT)$(MENUDIR); \
-	fi
-	if test "x$(ICONDIR)" != x; then \
+	if test -d /usr/share/applications; then \
 		echo Installing desktop icons...; \
-		$(INSTALL_DIR) -m 755 $(BUILDROOT)$(ICONDIR)/hicolor/16x16/apps; \
-		$(INSTALL_DATA) desktop/cups-16.png $(BUILDROOT)$(ICONDIR)/hicolor/16x16/apps/cups.png; \
-		$(INSTALL_DIR) -m 755 $(BUILDROOT)$(ICONDIR)/hicolor/32x32/apps; \
-		$(INSTALL_DATA) desktop/cups-32.png $(BUILDROOT)$(ICONDIR)/hicolor/32x32/apps/cups.png; \
-		$(INSTALL_DIR) -m 755 $(BUILDROOT)$(ICONDIR)/hicolor/64x64/apps; \
-		$(INSTALL_DATA) desktop/cups-64.png $(BUILDROOT)$(ICONDIR)/hicolor/64x64/apps/cups.png; \
-		$(INSTALL_DIR) -m 755 $(BUILDROOT)$(ICONDIR)/hicolor/128x128/apps; \
-		$(INSTALL_DATA) desktop/cups-128.png $(BUILDROOT)$(ICONDIR)/hicolor/128x128/apps/cups.png; \
+		$(INSTALL_DIR) -m 755 $(BUILDROOT)/usr/share/applications; \
+		$(INSTALL_DATA) desktop/cups.desktop $(BUILDROOT)/usr/share/applications; \
+		$(INSTALL_DIR) -m 755 $(BUILDROOT)/usr/share/icons/hicolor/16x16/apps; \
+		$(INSTALL_DATA) desktop/cups-16.png $(BUILDROOT)/usr/share/icons/hicolor/16x16/apps/cups.png; \
+		$(INSTALL_DIR) -m 755 $(BUILDROOT)/usr/share/icons/hicolor/32x32/apps; \
+		$(INSTALL_DATA) desktop/cups-32.png $(BUILDROOT)/usr/share/icons/hicolor/32x32/apps/cups.png; \
+		$(INSTALL_DIR) -m 755 $(BUILDROOT)/usr/share/icons/hicolor/64x64/apps; \
+		$(INSTALL_DATA) desktop/cups-64.png $(BUILDROOT)/usr/share/icons/hicolor/64x64/apps/cups.png; \
+		$(INSTALL_DIR) -m 755 $(BUILDROOT)/usr/share/icons/hicolor/128x128/apps; \
+		$(INSTALL_DATA) desktop/cups-128.png $(BUILDROOT)/usr/share/icons/hicolor/128x128/apps/cups.png; \
 	fi

-#
-# Install header files...
-#
-
-install-headers:
-	for dir in $(DIRS); do\
-		echo Installing header files in $$dir... ;\
-		(cd $$dir; $(MAKE) $(MFLAGS) install-headers) || exit 1;\
-	done
-

 #
-# Install programs...
+# Install source and header files...
 #

-install-exec:	all
-	for dir in $(DIRS); do\
-		echo Installing programs in $$dir... ;\
-		(cd $$dir; $(MAKE) $(MFLAGS) install-exec) || exit 1;\
-	done
+installsrc:
+	gnutar --dereference --exclude=.svn -cf - . | gnutar -C $(SRCROOT) -xf -

-
-#
-# Install libraries...
-#
-
-install-libs:	libs
-	for dir in $(DIRS); do\
-		echo Installing libraries in $$dir... ;\
-		(cd $$dir; $(MAKE) $(MFLAGS) install-libs) || exit 1;\
-	done
+installhdrs:
+	(cd cups ; $(MAKE) $(MFLAGS) installhdrs) || exit 1;\
+	(cd filter ; $(MAKE) $(MFLAGS) installhdrs) || exit 1;


 #
@@ -308,9 +198,7 @@ uninstall:
 			$(RM) $(BUILDROOT)$(INITDDIR)/Resources/English.lproj/Localizable.strings; \
 			$(RMDIR) $(BUILDROOT)$(INITDDIR)/Resources/English.lproj; \
 		elif test "$(INITDDIR)" = "/System/Library/LaunchDaemons"; then \
-			$(RM) $(BUILDROOT)$(INITDDIR)/org.cups.cupsd.plist; \
-			$(RM) $(BUILDROOT)$(INITDDIR)/org.cups.cups-lpd.plist; \
-			$(RMDIR) $(BUILDROOT)/System/Library/StartupItems/PrintingServices; \
+			$(RM) $(BUILDROOT)$(DEFAULT_LAUNCHD_CONF); \
 		else \
 			$(INSTALL_SCRIPT) init/cups.sh $(BUILDROOT)$(INITDDIR)/cups; \
 		fi \
@@ -349,7 +237,7 @@ check:	all

 EPMFLAGS	=	-v --output-dir dist $(EPMARCH)

-aix bsd deb depot inst pkg setld slackware swinstall tardist:
+aix bsd deb depot inst pkg rpm setld slackware swinstall tardist:
 	epm $(EPMFLAGS) -f $@ cups packaging/cups.list

 epm:
@@ -358,9 +246,6 @@ epm:
 osx:
 	epm $(EPMFLAGS) -f osx -s packaging/installer.tif cups packaging/cups.list

-rpm:
-	epm $(EPMFLAGS) -f rpm -s packaging/installer.gif cups packaging/cups.list
-
 .PHONEY:	dist
 dist:	all
 	$(RM) -r dist
@@ -1,160 +1,167 @@
-README - CUPS v1.4b2 - 2008-12-15
+README - CUPS v1.2.3 - 2006-08-28
 ---------------------------------

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


 INTRODUCTION

-    The Common UNIX Printing System ("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 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 networked printers, and printers can
-    be shared from one computer to another, even over the Internet!
+    CUPS provides a portable printing layer for UNIX(r)-based
+    operating systems.  It has been developed by Easy Software
+    Products to promote a standard printing solution for all UNIX
+    vendors and users.  CUPS provides the System V and Berkeley
+    command-line interfaces.

-    Internally, CUPS uses PostScript Printer Description ("PPD") files to
-    describe printer capabilities and features and a wide variety of generic
-    and device-specific programs to convert and print many types of files.
-    Sample drivers are included with CUPS to support many Dymo, EPSON, HP,
-    Intellitech, OKIDATA, and Zebra printers.  Many more drivers are available
-    online and (in some cases) on the driver CD-ROM that came with your printer.
+    CUPS uses the Internet Printing Protocol ("IPP") as the basis
+    for managing print jobs and queues.  The Line Printer Daemon
+    ("LPD") Server Message Block ("SMB"), and AppSocket (a.k.a.
+    JetDirect) protocols are also supported with reduced
+    functionality.  CUPS adds network printer browsing and
+    PostScript Printer Description ("PPD") based printing options
+    to support real-world printing under UNIX.

-    CUPS is licensed under the GNU General Public License and GNU Library
-    General Public License versions 2.  See the file "LICENSE.txt" for more
-    information.
+    CUPS includes an image file RIP that supports printing of
+    image files to non-PostScript printers.  A customized version
+    of GPL Ghostscript for CUPS called ESP Ghostscript is
+    available separately to support printing of PostScript files
+    within the CUPS driver framework.  Sample drivers for Dymo,
+    EPSON, HP, OKIDATA, and Zebra printers are included that use
+    these filters.
+
+    Drivers for thousands of printers are provided with our ESP
+    Print Pro software, available at:
+
+	    http://www.easysw.com/printpro/
+
+    CUPS is licensed under the GNU General Public License and GNU
+    Library General Public License.  Please contact Easy Software
+    Products for commercial support and "binary distribution"
+    rights.


 READING THE DOCUMENTATION

-    Once you have installed the software you can access the documentation (and
-    a bunch of other stuff) online at:
+    Once you have installed the software you can access the
+    documentation (and a bunch of other stuff) on-line at:

 	http://localhost:631/

-    If you're having trouble getting that far, the documentation is located
-    under the "doc/help" directory.
+    If you're having trouble getting that far, the documentation
+    is located under the "doc/help" directory.

    Please read the documentation before asking questions.


 GETTING SUPPORT AND OTHER RESOURCES

-    If you have problems, READ THE DOCUMENTATION FIRST!  We also provide many
-    discussion forums which are available at:
+    If you have problems, READ THE DOCUMENTATION FIRST!  We also
+    provide many discussion forums which are available at:

 	http://www.cups.org/newsgroups.php

-    See the CUPS web site at "http://www.cups.org/" for other resources.
+    Commercial support (with a guaranteed response time) is
+    available from Easy Software Products.  For more information
+    see:
+
+	http://www.easysw.com/cups/
+
+    See the CUPS web site at "http://www.cups.org/" for other
+    site links.


 SETTING UP PRINTER QUEUES USING YOUR WEB BROWSER

-    CUPS includes a web-based administration tool that allows you to manage
-    printers, classes, and jobs on your server.  Open the following URL in your
-    browser to access the printer administration tools:
+    CUPS 1.2 includes a web-based administration tool that allows
+    you to manage printers, classes, and jobs on your server. 
+    Open the following URL in your browser to access the printer
+    administration tools:

 	http://localhost:631/admin/

-    DO NOT use the hostname for your machine - it will not work with the default
-    CUPS configuration.  To enable administration access on other addresses,
-    check the "Allow Remote Administration" box and click on the "Change
-    Settings" button.
+    DO NOT use the hostname for your machine - it will not work
+    with the default CUPS configuration.  To enable
+    administration access on other addresses, check the "Allow
+    Remote Administration" box and click on the "Change Settings"
+    button.

-    You will be asked for the administration password (root or any other user in
-    the sys/system/root/admin/lpadmin group on your system) when performing any
-    administrative function.
+    You will be asked for the administration password (root or
+    any other user in the sys/system/root group on your system)
+    when performing any administrative function.


 SETTING UP PRINTER QUEUES FROM THE COMMAND-LINE

-    CUPS works best with PPD (PostScript Printer Description) files.  In a pinch
-    you can also use System V style printer interface scripts.
+    CUPS works best with PPD (PostScript Printer Description)
+    files.  In a pinch you can also use System V style printer
+    interface scripts.

    CUPS includes several sample PPD files you can use:

-	Driver                         PPD Name
-	-----------------------------  ------------------------------
-	Dymo Label Printers            drv:///sample.drv/dymo.ppd
-	Intellitech Intellibar         drv:///sample.drv/intelbar.ppd
-	EPSON Stylus Color Series      drv:///sample.drv/stcolor.ppd
-	EPSON Stylus Photo Series      drv:///sample.drv/stphoto.ppd
-	EPSON Stylus New Color Series  drv:///sample.drv/stcolor2.ppd
-	EPSON Stylus New Photo Series  drv:///sample.drv/stphoto2.ppd
-	EPSON 9-pin Series             drv:///sample.drv/epson9.ppd
-	EPSON 24-pin Series            drv:///sample.drv/epson24.ppd
-	Generic PCL Laser Printer      drv:///sample.drv/generpcl.ppd
-	Generic PostScript Printer     drv:///sample.drv/generic.ppd
-	HP DeskJet Series              drv:///sample.drv/deskjet.ppd
-	HP LaserJet Series             drv:///sample.drv/laserjet.ppd
-	OKIDATA 9-Pin Series           drv:///sample.drv/okidata9.ppd
-	OKIDATA 24-Pin Series          drv:///sample.drv/okidat24.ppd
-	Zebra CPCL Label Printer       drv:///sample.drv/zebracpl.ppd
-	Zebra EPL1 Label Printer       drv:///sample.drv/zebraep1.ppd
-	Zebra EPL2 Label Printer       drv:///sample.drv/zebraep2.ppd
-	Zebra ZPL Label Printer        drv:///sample.drv/zebra.ppd
+	Driver                         PPD File
+	-----------------------------  ------------
+	Dymo Label Printers            dymo.ppd
+	EPSON Stylus Color Series      stcolor.ppd
+	EPSON Stylus Photo Series      stphoto.ppd
+	EPSON Stylus New Color Series  stcolor2.ppd
+	EPSON Stylus New Photo Series  stphoto2.ppd
+	EPSON 9-pin Series             epson9.ppd
+	EPSON 24-pin Series            epson24.ppd
+	HP DeskJet Series              deskjet.ppd
+	HP New DeskJet Series          deskjet2.ppd
+	HP LaserJet Series             laserjet.ppd
+	OKIDATA 9-Pin Series           okidata9.ppd
+	OKIDATA 24-Pin Series          okidat24.ppd
+	Zebra CPCL Label Printer       zebracpl.ppd
+	Zebra EPL1 Label Printer       zebraep1.ppd
+	Zebra EPL2 Label Printer       zebraep2.ppd
+	Zebra ZPL Label Printer        zebra.ppd

-    Run the "lpinfo -m" command to list the available drivers:
-
-        lpinfo -m
-
-    Run the "lpinfo -v" command to list the available printers:
+    Run the "lpinfo" command to list the available printers:

        lpinfo -v

-    Then use the correct URI to add the printer using the "lpadmin" command:
+    Then use the correct URI to add the printer using the
+    "lpadmin" command:

-        lpadmin -p printername -E -v device-uri -m ppd-name
+        lpadmin -p printername -E -v URI -m filename.ppd

    Network printers typically use "socket" or "lpd" URIs:

-        lpadmin -p printername -E -v socket://11.22.33.44 -m ppd-name
-        lpadmin -p printername -E -v lpd://11.22.33.44/ -m ppd-name
+        lpadmin -p printername -E -v socket://11.22.33.44 -m filename.ppd
+        lpadmin -p printername -E -v lpd://11.22.33.44/ -m filename.ppd

-    The sample drivers provide basic printing capabilities, but generally do not
-    exercise the full potential of the printers or CUPS.  The CUPS web site
-    provides links and drivers:
+    The sample drivers provide basic printing capabilities, but
+    generally do not exercise the full potential of the printers
+    or CUPS.  For fully-functional commercial printer drivers
+    check out our ESP Print Pro software at:

-        http://www.cups.org/ppd.php      PPD files
-	http://www.cups.org/links.php    Links to other drivers
+	http://www.easysw.com/printpro/


 PRINTING FILES

-    CUPS provides both the System V "lp" and Berkeley "lpr" commands for
-    printing:
+    CUPS provides both the System V "lp" and Berkeley "lpr"
+    commands for printing:

 	lp filename
 	lpr filename

-    Both the "lp" and "lpr" commands support printing options for the driver:
+    Both the "lp" and "lpr" commands support printing options for
+    the driver:

-	lp -o media=A4 -o resolution=600dpi filename
-	lpr -o media=A4 -o resolution=600dpi filename
+	lp -omedia=A4 -oresolution=600dpi filename
+	lpr -omedia=A4 -oresolution=600dpi filename

-    CUPS recognizes many types of images files as well as PDF, PostScript,
-    HP-GL/2, and text files, so you can print those files directly rather than
-    through an application.
+    CUPS recognizes many types of images files as well as PDF,
+    PostScript, HP-GL/2, and text files, so you can print those
+    files directly rather than through an application.

-    If you have an application that generates output specifically for your
-    printer then you need to use the "-oraw" or "-l" options:
+    If you have an application that generates output specifically
+    for your printer then you need to use the "-oraw" or "-l"
+    options:

-	lp -o raw filename
+	lp -oraw filename
 	lpr -l filename

    This will prevent the filters from misinterpreting your print
@@ -163,15 +170,37 @@ PRINTING FILES

 LEGAL STUFF

-    CUPS is Copyright 2007-2008 by Apple Inc.  CUPS, the CUPS logo, and the
-    Common UNIX Printing System are trademarks of Apple Inc.
+    CUPS is Copyright 1993-2006 by Easy Software Products.  CUPS,
+    the CUPS logo, and the Common UNIX Printing System are the
+    trademark property of Easy Software Products.

    The MD5 Digest code is Copyright 1999 Aladdin Enterprises.

-    This software is based in part on the work of the Independent JPEG Group.
+    The PDF filter (pdftops) is based on the Xpdf software,
+    Copyright 1996-2005 by Derek B. Noonburg.

-    CUPS is provided under the terms of version 2 of the GNU General Public
-    License and GNU Library General Public License. This program is distributed
-    in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
-    the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-    See the "doc/help/license.html" or "LICENSE.txt" files for more information.
+    This software is based in part on the work of the Independent
+    JPEG Group.
+
+    CUPS is provided under the terms of the GNU General Public
+    License and GNU Library General Public License. This program
+    is distributed in the hope that it will be useful, but
+    WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    "doc/help/license.html" or "LICENSE.txt" files for more
+    information.
+
+    For commercial licensing information, please contact:
+
+	Attn: CUPS Licensing Information
+	Easy Software Products
+	44141 Airport View Drive, Suite 204
+	Hollywood, Maryland 20636 USA
+
+	Voice: +1.301.373.9600
+	Email: cups-info@cups.org
+	WWW: http://www.cups.org/
+
+    Note that commercial licensors may also require a license from
+    Derek B. Noonburg who developed the Xpdf software used to print
+    PDF files.
@@ -1,76 +1,39 @@
-# DO NOT DELETE THIS LINE -- make depend depends on it.
+# DO NOT DELETE

-ipp.o: ../cups/http-private.h ../config.h ../cups/http.h ../cups/versioning.h
-ipp.o: ../cups/md5.h ../cups/ipp-private.h ../cups/ipp.h backend-private.h
-ipp.o: ../cups/backend.h ../cups/sidechannel.h ../cups/ppd-private.h
-ipp.o: ../cups/cups.h ../cups/ppd.h ../cups/array.h ../cups/file.h
-ipp.o: ../cups/language.h ../cups/debug.h ../cups/i18n.h ../cups/transcode.h
-ipp.o: ../cups/snmp-private.h ../cups/string.h
-lpd.o: ../cups/http-private.h ../config.h ../cups/http.h ../cups/versioning.h
-lpd.o: ../cups/md5.h ../cups/ipp-private.h ../cups/ipp.h backend-private.h
-lpd.o: ../cups/backend.h ../cups/sidechannel.h ../cups/ppd-private.h
-lpd.o: ../cups/cups.h ../cups/ppd.h ../cups/array.h ../cups/file.h
-lpd.o: ../cups/language.h ../cups/debug.h ../cups/i18n.h ../cups/transcode.h
-lpd.o: ../cups/snmp-private.h ../cups/string.h
-dnssd.o: backend-private.h ../cups/backend.h ../cups/versioning.h
-dnssd.o: ../cups/sidechannel.h ../cups/ppd-private.h ../cups/cups.h
-dnssd.o: ../cups/ipp.h ../cups/http.h ../cups/ppd.h ../cups/array.h
-dnssd.o: ../cups/file.h ../cups/language.h ../cups/debug.h ../cups/i18n.h
-dnssd.o: ../cups/transcode.h ../cups/snmp-private.h ../cups/string.h
-dnssd.o: ../config.h ../cups/array.h
-pap.o: ../config.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
-pap.o: ../cups/versioning.h ../cups/ppd.h ../cups/array.h ../cups/file.h
-pap.o: ../cups/language.h ../cups/backend.h ../cups/sidechannel.h
-pap.o: ../cups/i18n.h ../cups/transcode.h
-parallel.o: backend-private.h ../cups/backend.h ../cups/versioning.h
-parallel.o: ../cups/sidechannel.h ../cups/ppd-private.h ../cups/cups.h
-parallel.o: ../cups/ipp.h ../cups/http.h ../cups/ppd.h ../cups/array.h
-parallel.o: ../cups/file.h ../cups/language.h ../cups/debug.h ../cups/i18n.h
-parallel.o: ../cups/transcode.h ../cups/snmp-private.h ../cups/string.h
-parallel.o: ../config.h
-scsi.o: ../cups/backend.h ../cups/versioning.h ../cups/cups.h ../cups/ipp.h
-scsi.o: ../cups/http.h ../cups/ppd.h ../cups/array.h ../cups/file.h
-scsi.o: ../cups/language.h ../cups/i18n.h ../cups/transcode.h
-scsi.o: ../cups/string.h ../config.h
-serial.o: backend-private.h ../cups/backend.h ../cups/versioning.h
-serial.o: ../cups/sidechannel.h ../cups/ppd-private.h ../cups/cups.h
-serial.o: ../cups/ipp.h ../cups/http.h ../cups/ppd.h ../cups/array.h
-serial.o: ../cups/file.h ../cups/language.h ../cups/debug.h ../cups/i18n.h
-serial.o: ../cups/transcode.h ../cups/snmp-private.h ../cups/string.h
+betest.o: ../cups/string.h ../config.h
+ipp.o: ../cups/http-private.h ../config.h ../cups/http.h ../cups/md5.h
+ipp.o: ../cups/ipp-private.h ../cups/ipp.h ../cups/backend.h ../cups/cups.h
+ipp.o: ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
+ipp.o: ../cups/language.h ../cups/string.h
+lpd.o: ../cups/backend.h ../cups/http-private.h ../config.h ../cups/http.h
+lpd.o: ../cups/md5.h ../cups/ipp-private.h ../cups/ipp.h ../cups/cups.h
+lpd.o: ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
+lpd.o: ../cups/string.h
+pap.o: ../cups/http.h ../cups/md5.h
+parallel.o: backend-private.h ../cups/backend.h ../cups/cups.h ../cups/ipp.h
+parallel.o: ../cups/http.h ../cups/md5.h ../cups/ppd.h ../cups/array.h
+parallel.o: ../cups/file.h ../cups/language.h ../cups/debug.h
+parallel.o: ../cups/string.h ../config.h
+scsi.o: ../cups/backend.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
+scsi.o: ../cups/md5.h ../cups/ppd.h ../cups/array.h ../cups/file.h
+scsi.o: ../cups/language.h ../cups/string.h ../config.h
+serial.o: backend-private.h ../cups/backend.h ../cups/cups.h ../cups/ipp.h
+serial.o: ../cups/http.h ../cups/md5.h ../cups/ppd.h ../cups/array.h
+serial.o: ../cups/file.h ../cups/language.h ../cups/debug.h ../cups/string.h
 serial.o: ../config.h
-snmp.o: backend-private.h ../cups/backend.h ../cups/versioning.h
-snmp.o: ../cups/sidechannel.h ../cups/ppd-private.h ../cups/cups.h
-snmp.o: ../cups/ipp.h ../cups/http.h ../cups/ppd.h ../cups/array.h
-snmp.o: ../cups/file.h ../cups/language.h ../cups/debug.h ../cups/i18n.h
-snmp.o: ../cups/transcode.h ../cups/snmp-private.h ../cups/string.h
-snmp.o: ../config.h ../cups/array.h ../cups/file.h ../cups/http-private.h
-snmp.o: ../cups/md5.h ../cups/ipp-private.h
-socket.o: ../cups/http-private.h ../config.h ../cups/http.h
-socket.o: ../cups/versioning.h ../cups/md5.h ../cups/ipp-private.h
-socket.o: ../cups/ipp.h backend-private.h ../cups/backend.h
-socket.o: ../cups/sidechannel.h ../cups/ppd-private.h ../cups/cups.h
-socket.o: ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
-socket.o: ../cups/debug.h ../cups/i18n.h ../cups/transcode.h
-socket.o: ../cups/snmp-private.h ../cups/string.h
+snmp.o: ../cups/http-private.h ../config.h ../cups/http.h ../cups/md5.h
+snmp.o: ../cups/ipp-private.h ../cups/ipp.h backend-private.h
+snmp.o: ../cups/backend.h ../cups/cups.h ../cups/ppd.h ../cups/array.h
+snmp.o: ../cups/file.h ../cups/language.h ../cups/debug.h ../cups/string.h
+snmp.o: ../cups/array.h ../cups/file.h
+socket.o: ../cups/http-private.h ../config.h ../cups/http.h ../cups/md5.h
+socket.o: ../cups/ipp-private.h ../cups/ipp.h backend-private.h
+socket.o: ../cups/backend.h ../cups/cups.h ../cups/ppd.h ../cups/array.h
+socket.o: ../cups/file.h ../cups/language.h ../cups/debug.h ../cups/string.h
 test1284.o: ../cups/string.h ../config.h ieee1284.c backend-private.h
-test1284.o: ../cups/backend.h ../cups/versioning.h ../cups/sidechannel.h
-test1284.o: ../cups/ppd-private.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
-test1284.o: ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
-test1284.o: ../cups/debug.h ../cups/i18n.h ../cups/transcode.h
-test1284.o: ../cups/snmp-private.h
-testbackend.o: ../cups/string.h ../config.h ../cups/cups.h ../cups/ipp.h
-testbackend.o: ../cups/http.h ../cups/versioning.h ../cups/ppd.h
-testbackend.o: ../cups/array.h ../cups/file.h ../cups/language.h
-testbackend.o: ../cups/sidechannel.h
-testsupplies.o: backend-private.h ../cups/backend.h ../cups/versioning.h
-testsupplies.o: ../cups/sidechannel.h ../cups/ppd-private.h ../cups/cups.h
-testsupplies.o: ../cups/ipp.h ../cups/http.h ../cups/ppd.h ../cups/array.h
-testsupplies.o: ../cups/file.h ../cups/language.h ../cups/debug.h
-testsupplies.o: ../cups/i18n.h ../cups/transcode.h ../cups/snmp-private.h
-testsupplies.o: ../cups/string.h ../config.h
-usb.o: backend-private.h ../cups/backend.h ../cups/versioning.h
-usb.o: ../cups/sidechannel.h ../cups/ppd-private.h ../cups/cups.h
-usb.o: ../cups/ipp.h ../cups/http.h ../cups/ppd.h ../cups/array.h
-usb.o: ../cups/file.h ../cups/language.h ../cups/debug.h ../cups/i18n.h
-usb.o: ../cups/transcode.h ../cups/snmp-private.h ../cups/string.h
-usb.o: ../config.h
+test1284.o: ../cups/backend.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
+test1284.o: ../cups/md5.h ../cups/ppd.h ../cups/array.h ../cups/file.h
+test1284.o: ../cups/language.h ../cups/debug.h
+usb.o: ../cups/backend.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
+usb.o: ../cups/md5.h ../cups/ppd.h ../cups/array.h ../cups/file.h
+usb.o: ../cups/language.h ../cups/string.h ../config.h
@@ -3,27 +3,35 @@
 #
 #   Backend makefile for the Common UNIX Printing System (CUPS).
 #
-#   Copyright 2007-2008 by Apple Inc.
-#   Copyright 1997-2007 by Easy Software Products, all rights reserved.
+#   Copyright 1997-2006 by Easy Software Products, all rights reserved.
 #
 #   These coded instructions, statements, and computer programs are the
-#   property of Apple Inc. and are protected by Federal copyright
-#   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
-#   which should have been included with this file.  If this file is
-#   file is missing or damaged, see the license at "http://www.cups.org/".
+#   property of Easy Software Products and are protected by Federal
+#   copyright law.  Distribution and use rights are outlined in the file
+#   "LICENSE.txt" which should have been included with this file.  If this
+#   file is missing or damaged please contact Easy Software Products
+#   at:
+#
+#       Attn: CUPS Licensing Information
+#       Easy Software Products
+#       44141 Airport View Drive, Suite 204
+#       Hollywood, Maryland 20636 USA
+#
+#       Voice: (301) 373-9600
+#       EMail: cups-info@cups.org
+#         WWW: http://www.cups.org
 #
 #   This file is subject to the Apple OS-Developed Software exception.
 #

 include ../Makedefs

-RBACKENDS =	ipp lpd $(DNSSD_BACKEND)
-UBACKENDS =	$(PAP) $(LEGACY_BACKENDS) serial snmp socket usb
-TARGETS	=	test1284 testbackend testsupplies \
-		libbackend.a $(RBACKENDS) $(UBACKENDS)
-LIBOBJS	=	ieee1284.o network.o runloop.o snmp-supplies.o
-OBJS	=	ipp.o lpd.o dnssd.o pap.o parallel.o scsi.o serial.o snmp.o \
-		socket.o test1284.o testbackend.o testsupplies.o usb.o
+RBACKENDS =	ipp lpd
+UBACKENDS =	$(PAP) parallel scsi serial snmp socket usb
+TARGETS	=	betest test1284 libbackend.a $(RBACKENDS) $(UBACKENDS)
+LIBOBJS	=	ieee1284.o runloop.o
+OBJS	=	betest.o ipp.o lpd.o pap.o parallel.o scsi.o \
+		serial.o snmp.o socket.o test1284.o usb.o


 #
@@ -33,26 +41,12 @@ OBJS	=	ipp.o lpd.o dnssd.o pap.o parallel.o scsi.o serial.o snmp.o \
 all:	$(TARGETS)


-#
-# Make library targets...
-#
-
-libs:
-
-
-#
-# Make unit tests...
-#
-
-unittests:
-
-
 #
 # Clean all object files...
 #

 clean:
-	$(RM) $(OBJS) $(TARGETS) $(LIBOBJS) http mdns
+	$(RM) $(OBJS) $(TARGETS) http


 #
@@ -67,54 +61,16 @@ depend:
 # Install all targets...
 #

-install:	all install-data install-headers install-libs install-exec
-
-
-#
-# Install data files...
-#
-
-install-data:
-
-
-#
-# Install programs...
-#
-
-install-exec:
+install:	all
 	$(INSTALL_DIR) -m 755 $(SERVERBIN)/backend
 	for file in $(RBACKENDS); do \
-		$(LIBTOOL) $(INSTALL_BIN) -m 700 $$file $(SERVERBIN)/backend; \
+		$(LIBTOOL) $(INSTALL) -m 700 $$file $(SERVERBIN)/backend; \
 	done
 	for file in $(UBACKENDS); do \
 		$(INSTALL_BIN) $$file $(SERVERBIN)/backend; \
 	done
 	$(RM) $(SERVERBIN)/backend/http
 	$(LN) ipp $(SERVERBIN)/backend/http
-	if test "x$(DNSSD_BACKEND)" != x; then \
-		$(RM) $(SERVERBIN)/backend/mdns; \
-		$(LN) $(DNSSD_BACKEND) $(SERVERBIN)/backend/mdns; \
-	fi
-	if test "x$(SYMROOT)" != "x"; then \
-		$(INSTALL_DIR) $(SYMROOT); \
-		for file in $(TARGETS); do \
-			cp $$file $(SYMROOT); \
-		done \
-	fi
-
-
-#
-# Install headers...
-#
-
-install-headers:
-
-
-#
-# Install libraries...
-#
-
-install-libs:


 #
@@ -130,6 +86,15 @@ uninstall:
 	-$(RMDIR) $(SERVERBIN)


+#
+# betest
+#
+
+betest:	betest.o ../cups/$(LIBCUPS)
+	echo Linking $@...
+	$(CC) $(LDFLAGS) -o betest betest.o $(LIBS)
+
+
 #
 # test1284
 #
@@ -137,27 +102,7 @@ uninstall:
 test1284:	test1284.o ../cups/libcups.a
 	echo Linking $@...
 	$(CC) $(LDFLAGS) -o test1284 test1284.o ../cups/libcups.a \
-		$(LIBGSSAPI) $(SSLLIBS) $(COMMONLIBS) $(LIBZ)
-
-
-#
-# testbackend
-#
-
-testbackend:	testbackend.o ../cups/libcups.a
-	echo Linking $@...
-	$(CC) $(LDFLAGS) -o testbackend testbackend.o ../cups/libcups.a \
-		$(LIBGSSAPI) $(SSLLIBS) $(COMMONLIBS) $(LIBZ)
-
-
-#
-# testsupplies
-#
-
-testsupplies:	testsupplies.o libbackend.a ../cups/libcups.a
-	echo Linking $@...
-	$(CC) $(LDFLAGS) -o testsupplies testsupplies.o libbackend.a \
-		../cups/libcups.a $(LIBGSSAPI) $(SSLLIBS) $(COMMONLIBS) $(LIBZ)
+		$(SSLLIBS) $(COMMONLIBS) $(LIBZ)


 #
@@ -172,23 +117,24 @@ libbackend.a:	$(LIBOBJS)


 #
-# dnssd
+# ieee1394
 #

-dnssd:	dnssd.o ../cups/$(LIBCUPS) libbackend.a
+ieee1394:	ieee1394.o ieee1394-linux.o
 	echo Linking $@...
-	$(CC) $(LDFLAGS) -o dnssd dnssd.o libbackend.a $(LIBS)
-	$(RM) mdns
-	$(LN) dnssd mdns
+	$(CC) $(LDFLAGS) -o ieee1394 ieee1394.o ieee1394-linux.o -lraw1394 $(LIBS)
+
+ieee1394.o:		ieee1394.h
+ieee1394-linux.o:	ieee1394.h


 #
 # ipp
 #

-ipp:	ipp.o ../cups/$(LIBCUPS) libbackend.a
+ipp:	ipp.o ../cups/$(LIBCUPS)
 	echo Linking $@...
-	$(CC) $(LDFLAGS) -o ipp ipp.o libbackend.a $(LIBS)
+	$(CC) $(LDFLAGS) -o ipp ipp.o $(LIBS)
 	$(RM) http
 	$(LN) ipp http

@@ -197,9 +143,9 @@ ipp:	ipp.o ../cups/$(LIBCUPS) libbackend.a
 # lpd
 #

-lpd:	lpd.o ../cups/$(LIBCUPS) libbackend.a
+lpd:	lpd.o ../cups/$(LIBCUPS)
 	echo Linking $@...
-	$(CC) $(LDFLAGS) -o lpd lpd.o libbackend.a $(LIBS)
+	$(CC) $(LDFLAGS) -o lpd lpd.o $(LIBS)


 #
@@ -264,9 +210,8 @@ 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) \
-		$(BACKLIBS) $(LIBS)
-usb.o:	usb.c usb-darwin.c usb-libusb.c usb-unix.c
+	$(CC) $(LDFLAGS) -o usb usb.o libbackend.a $(BACKLIBS) $(LIBS)
+usb.o:	usb.c usb-darwin.c usb-unix.c


 #
@@ -3,14 +3,23 @@
 *
 *   Backend support definitions for the Common UNIX Printing System (CUPS).
 *
- *   Copyright 2007-2008 by Apple Inc.
- *   Copyright 1997-2007 by Easy Software Products, all rights reserved.
+ *   Copyright 1997-2006 by Easy Software Products, all rights reserved.
 *
 *   These coded instructions, statements, and computer programs are the
- *   property of Apple Inc. and are protected by Federal copyright
- *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   property of Easy Software Products and are protected by Federal
+ *   copyright law.  Distribution and use rights are outlined in the file
 *   "LICENSE" which should have been included with this file.  If this
- *   file is missing or damaged, see the license at "http://www.cups.org/".
+ *   file is missing or damaged please contact Easy Software Products
+ *   at:
+ *
+ *       Attn: CUPS Licensing Information
+ *       Easy Software Products
+ *       44141 Airport View Drive, Suite 204
+ *       Hollywood, Maryland 20636 USA
+ *
+ *       Voice: (301) 373-9600
+ *       EMail: cups-info@cups.org
+ *         WWW: http://www.cups.org
 *
 *   This file is subject to the Apple OS-Developed Software exception.
 */
@@ -24,11 +33,8 @@
 */

 #  include <cups/backend.h>
-#  include <cups/sidechannel.h>
-#  include <cups/ppd-private.h>
+#  include <cups/cups.h>
 #  include <cups/debug.h>
-#  include <cups/i18n.h>
-#  include <cups/snmp-private.h>
 #  include <stdlib.h>
 #  include <errno.h>
 #  include <cups/string.h>
@@ -44,229 +50,17 @@ extern "C" {
 #  endif /* __cplusplus */


-/*
- * OID constants...
- */
-
-/* Host MIB */
-#define CUPS_OID_mib2				1,3,6,1,2,1
-
-#define CUPS_OID_system				CUPS_OID_mib2,1
-#define CUPS_OID_sysLocation			CUPS_OID_system,6
-
-#define CUPS_OID_host				CUPS_OID_mib2,25
-
-#define CUPS_OID_hrSystem			CUPS_OID_host,1
-
-#define CUPS_OID_hrStorage			CUPS_OID_host,2
-
-#define CUPS_OID_hrDevice			CUPS_OID_host,3
-#define CUPS_OID_hrDeviceTable			CUPS_OID_hrDevice,2
-#define CUPS_OID_hrDeviceEntry			CUPS_OID_hrDeviceTable,1
-#define CUPS_OID_hrDeviceIndex			CUPS_OID_hrDeviceEntry,1
-#define CUPS_OID_hrDeviceType			CUPS_OID_hrDeviceEntry,2
-#define CUPS_OID_hrDeviceDescr			CUPS_OID_hrDeviceEntry,3
-
-#define CUPS_OID_hrPrinterTable			CUPS_OID_hrDevice,5
-#define CUPS_OID_hrPrinterEntry			CUPS_OID_hrPrinterTable,1
-#define CUPS_OID_hrPrinterStatus		CUPS_OID_hrPrinterEntry,1
-#define CUPS_OID_hrPrinterDetectedErrorState	CUPS_OID_hrPrinterEntry,2
-
-/* Printer MIB */
-#define CUPS_OID_printmib			CUPS_OID_mib2,43
-
-#define CUPS_OID_prtGeneral			CUPS_OID_printmib,5
-#define CUPS_OID_prtGeneralTable		CUPS_OID_prtGeneral,1
-#define CUPS_OID_prtGeneralEntry		CUPS_OID_prtGeneralTable,1
-#define CUPS_OID_prtGeneralPrinterName		CUPS_OID_prtGeneralEntry,16
-#define CUPS_OID_prtGeneralSerialNumber		CUPS_OID_prtGeneralEntry,17
-
-#define CUPS_OID_prtCover			CUPS_OID_printmib,6
-#define CUPS_OID_prtCoverTable			CUPS_OID_prtCover,1
-#define CUPS_OID_prtCoverEntry			CUPS_OID_prtCoverTable,1
-#define CUPS_OID_prtCoverDescription		CUPS_OID_prtCoverEntry,2
-#define CUPS_OID_prtCoverStatus			CUPS_OID_prtCoverEntry,3
-
-#define CUPS_OID_prtMarker			CUPS_OID_printmib,10
-#define CUPS_OID_prtMarkerTable			CUPS_OID_prtMarker,2
-#define CUPS_OID_prtMarkerEntry			CUPS_OID_prtMarkerTable,1
-#define CUPS_OID_prtMarkerLifeCount		CUPS_OID_prtMarkerEntry,4
-
-#define CUPS_OID_prtMarkerSupplies		CUPS_OID_printmib,11
-#define CUPS_OID_prtMarkerSuppliesTable		CUPS_OID_prtMarkerSupplies,1
-#define CUPS_OID_prtMarkerSuppliesEntry		CUPS_OID_prtMarkerSuppliesTable,1
-#define CUPS_OID_prtMarkerSuppliesIndex		CUPS_OID_prtMarkerSuppliesEntry,1
-#define CUPS_OID_prtMarkerSuppliesMarkerIndex	CUPS_OID_prtMarkerSuppliesEntry,2
-#define CUPS_OID_prtMarkerSuppliesColorantIndex	CUPS_OID_prtMarkerSuppliesEntry,3
-#define CUPS_OID_prtMarkerSuppliesClass		CUPS_OID_prtMarkerSuppliesEntry,4
-#define CUPS_OID_prtMarkerSuppliesType		CUPS_OID_prtMarkerSuppliesEntry,5
-#define CUPS_OID_prtMarkerSuppliesDescription	CUPS_OID_prtMarkerSuppliesEntry,6
-#define CUPS_OID_prtMarkerSuppliesSupplyUnit	CUPS_OID_prtMarkerSuppliesEntry,7
-#define CUPS_OID_prtMarkerSuppliesMaxCapacity	CUPS_OID_prtMarkerSuppliesEntry,8
-#define CUPS_OID_prtMarkerSuppliesLevel		CUPS_OID_prtMarkerSuppliesEntry,9
-
-#define CUPS_OID_prtMarkerColorant		CUPS_OID_printmib,12
-#define CUPS_OID_prtMarkerColorantTable		CUPS_OID_prtMarkerColorant,1
-#define CUPS_OID_prtMarkerColorantEntry		CUPS_OID_prtMarkerColorantTable,1
-#define CUPS_OID_prtMarkerColorantIndex		CUPS_OID_prtMarkerColorantEntry,1
-#define CUPS_OID_prtMarkerColorantMarkerIndex	CUPS_OID_prtMarkerColorantEntry,2
-#define CUPS_OID_prtMarkerColorantRole		CUPS_OID_prtMarkerColorantEntry,3
-#define CUPS_OID_prtMarkerColorantValue		CUPS_OID_prtMarkerColorantEntry,4
-#define CUPS_OID_prtMarkerColorantTonality	CUPS_OID_prtMarkerColorantEntry,5
-
-#define CUPS_OID_prtInterpreter			CUPS_OID_printmib,15
-#define CUPS_OID_prtInterpreterTable		CUPS_OID_prtInterpreter,1
-#define CUPS_OID_prtInterpreterEntry		CUPS_OID_prtInterpreterTable,1
-#define CUPS_OID_prtInterpreterLangFamily	CUPS_OID_prtInterpreterEntry,2
-#define CUPS_OID_prtInterpreterLangLevel	CUPS_OID_prtInterpreterEntry,3
-
-/* Printer Port Monitor MIB */
-#define CUPS_OID_enterprises			1,3,6,1,4,1
-#define CUPS_OID_pwg				CUPS_OID_enterprises,2699,1
-#define CUPS_OID_ppmMIB				CUPS_OID_pwg,2
-#define CUPS_OID_ppmMIBObjects			CUPS_OID_ppmMIB,1
-
-#define CUPS_OID_ppmGeneral			CUPS_OID_ppmMIBObjects,1
-
-#define CUPS_OID_ppmPrinter			CUPS_OID_ppmMIBObjects,2
-#define CUPS_OID_ppmPrinterTable		CUPS_OID_ppmPrinter,1
-#define CUPS_OID_ppmPrinterEntry		CUPS_OID_ppmPrinterTable,1
-#define CUPS_OID_ppmPrinterIndex		CUPS_OID_ppmPrinterEntry,1
-#define CUPS_OID_ppmPrinterName			CUPS_OID_ppmPrinterEntry,2
-#define CUPS_OID_ppmPrinterIEEE1284DeviceId	CUPS_OID_ppmPrinterEntry,3
-#define CUPS_OID_ppmPrinterNumberOfPorts	CUPS_OID_ppmPrinterEntry,4
-#define CUPS_OID_ppmPrinterPreferredPortIndex	CUPS_OID_ppmPrinterEntry,5
-#define CUPS_OID_ppmPrinterHrDeviceIndex	CUPS_OID_ppmPrinterEntry,6
-#define CUPS_OID_ppmPrinterSnmpCommunityName	CUPS_OID_ppmPrinterEntry,7
-#define CUPS_OID_ppmPrinterSnmpQueryEnabled	CUPS_OID_ppmPrinterEntry,8
-
-#define CUPS_OID_ppmPort			CUPS_OID_ppmMIBObjects,3
-#define CUPS_OID_ppmPortTable			CUPS_OID_ppmPort,1
-#define CUPS_OID_ppmPortEntry			CUPS_OID_ppmPortTable,1
-#define CUPS_OID_ppmPortIndex			CUPS_OID_ppmPortEntry,1
-#define CUPS_OID_ppmPortEnabled			CUPS_OID_ppmPortEntry,2
-#define CUPS_OID_ppmPortName			CUPS_OID_ppmPortEntry,3
-#define CUPS_OID_ppmPortServiceNameOrURI	CUPS_OID_ppmPortEntry,4
-#define CUPS_OID_ppmPortProtocolType		CUPS_OID_ppmPortEntry,5
-#define CUPS_OID_ppmPortProtocolTargetPort	CUPS_OID_ppmPortEntry,6
-#define CUPS_OID_ppmPortProtocolAltSourceEnabled CUPS_OID_ppmPortEntry,7
-#define CUPS_OID_ppmPortPrtChannelIndex		CUPS_OID_ppmPortEntry,8
-#define CUPS_OID_ppmPortLprByteCountEnabled	CUPS_OID_ppmPortEntry,9
-
-
-/*
- * State constants...
- */
-
-#define CUPS_TC_other				1
-#define CUPS_TC_unknown				2
-
-#define CUPS_TC_idle				3
-#define CUPS_TC_printing			4
-#define CUPS_TC_warmup				5
-
-/* These come from the hrPrinterDetectedErrorState OCTET-STRING */
-#define CUPS_TC_lowPaper			0x8000
-#define CUPS_TC_noPaper				0x4000
-#define CUPS_TC_lowToner			0x2000
-#define CUPS_TC_noToner				0x1000
-#define CUPS_TC_doorOpen			0x0800
-#define CUPS_TC_jammed				0x0400
-#define CUPS_TC_offline				0x0200
-#define CUPS_TC_serviceRequested		0x0100
-#define CUPS_TC_inputTrayMissing		0x0080
-#define CUPS_TC_outputTrayMissing		0x0040
-#define CUPS_TC_markerSupplyMissing		0x0020
-#define CUPS_TC_outputNearFull			0x0010
-#define CUPS_TC_outputFull			0x0008
-#define CUPS_TC_inputTrayEmpty			0x0004
-#define CUPS_TC_overduePreventMaint		0x0002
-
-#define CUPS_TC_prtCoverStatus_coverOpen	3
-#define CUPS_TC_prtCoverStatus_coverClosed	4
-#define CUPS_TC_prtCoverStatus_interlockOpen	5
-#define CUPS_TC_prtCoverStatus_interlockClosed	6
-
-#define CUPS_TC_langPCL				3
-#define CUPS_TC_langHPGL			4
-#define CUPS_TC_langPJL				5
-#define CUPS_TC_langPS				6
-#define CUPS_TC_langEscapeP			9
-#define CUPS_TC_langCCITT			26
-#define CUPS_TC_langLIPS			39
-#define CUPS_TC_langTIFF			40
-#define CUPS_TC_langPCLXL			47
-#define CUPS_TC_langPDF				54
-#define CUPS_TC_langJPEG			61
-
-#define CUPS_TC_supplyThatIsConsumed		3
-#define CUPS_TC_receptacleThatIsFilled		4
-
-#define CUPS_TC_process				3
-#define CUPS_TC_spot				4
-
-#define CUPS_TC_toner				3
-#define CUPS_TC_wasteToner			4
-#define CUPS_TC_ink				5
-#define CUPS_TC_inkCartridge			6
-#define CUPS_TC_inkRibbon			7
-#define CUPS_TC_wasteInk			8
-#define CUPS_TC_opc				9
-#define CUPS_TC_developer			10
-#define CUPS_TC_fuserOil			11
-#define CUPS_TC_solidWax			12
-#define CUPS_TC_ribbonWax			13
-#define CUPS_TC_wasteWax			14
-#define CUPS_TC_fuser				15
-#define CUPS_TC_coronaWire			16
-#define CUPS_TC_fuserOilWick			17
-#define CUPS_TC_cleanerUnit			18
-#define CUPS_TC_fuserCleaningPad		19
-#define CUPS_TC_transferUnit			20
-#define CUPS_TC_tonerCartridge			21
-#define CUPS_TC_fuserOiler			22
-#define CUPS_TC_water				23
-#define CUPS_TC_wasteWater			24
-#define CUPS_TC_glueWaterAdditive		25
-#define CUPS_TC_wastePaper			26
-#define CUPS_TC_bindingSupply			27
-#define CUPS_TC_bandingSupply			28
-#define CUPS_TC_stitchingWire			29
-#define CUPS_TC_shrinkWrap			30
-#define CUPS_TC_paperWrap			31
-#define CUPS_TC_staples				32
-#define CUPS_TC_inserts				33
-#define CUPS_TC_covers				34
-
-
 /*
 * Prototypes...
 */

-extern void		backendCheckSideChannel(int snmp_fd, http_addr_t *addr);
-extern int		backendDrainOutput(int print_fd, int device_fd);
-extern int		backendGetDeviceID(int fd, char *device_id,
-			                   int device_id_size,
-			                   char *make_model,
-					   int make_model_size,
-					   const char *scheme, char *uri,
-					   int uri_size);
-extern int		backendGetMakeModel(const char *device_id,
-			                    char *make_model,
-				            int make_model_size);
-extern void		backendNetworkSideCB(int print_fd, int device_fd,
-			                     int snmp_fd, http_addr_t *addr,
-					     int use_bc);
-extern ssize_t		backendRunLoop(int print_fd, int device_fd, int snmp_fd,
-			               http_addr_t *addr, int use_bc,
-				       void (*side_cb)(int print_fd,
-				                       int device_fd,
-						       int snmp_fd,
-						       http_addr_t *addr,
-						       int use_bc));
-extern int		backendSNMPSupplies(int snmp_fd, http_addr_t *addr,
-			                    int *page_count,
-					    int *printer_state);
+extern int	backendGetDeviceID(int fd, char *device_id, int device_id_size,
+		                   char *make_model, int make_model_size,
+				   const char *scheme, char *uri, int uri_size);
+extern int	backendGetMakeModel(const char *device_id, char *make_model,
+			            int make_model_size);
+extern ssize_t	backendRunLoop(int print_fd, int device_fd, int use_bc);
+

 #  ifdef __cplusplus
 }
@@ -0,0 +1,87 @@
+/*
+ * "$Id$"
+ *
+ *   Backend test program for the Common UNIX Printing System (CUPS).
+ *
+ *   Copyright 1997-2005 by Easy Software Products, all rights reserved.
+ *
+ *   These coded instructions, statements, and computer programs are the
+ *   property of Easy Software Products and are protected by Federal
+ *   copyright law.  Distribution and use rights are outlined in the file
+ *   "LICENSE" which should have been included with this file.  If this
+ *   file is missing or damaged please contact Easy Software Products
+ *   at:
+ *
+ *       Attn: CUPS Licensing Information
+ *       Easy Software Products
+ *       44141 Airport View Drive, Suite 204
+ *       Hollywood, Maryland 20636 USA
+ *
+ *       Voice: (301) 373-9600
+ *       EMail: cups-info@cups.org
+ *         WWW: http://www.cups.org
+ *
+ *   This file is subject to the Apple OS-Developed Software exception.
+ *
+ * Contents:
+ *
+ *   main() - Run the named backend.
+ */
+
+/*
+ * Include necessary headers.
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <cups/string.h>
+#include <unistd.h>
+
+
+/*
+ * 'main()' - Run the named backend.
+ *
+ * Usage:
+ *
+ *    betest device-uri job-id user title copies options [file]
+ */
+
+int			/* O - Exit status */
+main(int  argc,		/* I - Number of command-line arguments (7 or 8) */
+     char *argv[])	/* I - Command-line arguments */
+{
+  char		backend[255];	/* Method in URI */
+
+
+  if (argc < 7 || argc > 8)
+  {
+    fputs("Usage: betest device-uri job-id user title copies options [file]\n",
+          stderr);
+    return (1);
+  }
+
+ /*
+  * Extract the method from the device-uri - that's the program we want to
+  * execute.
+  */
+
+  if (sscanf(argv[1], "%254[^:]", backend) != 1)
+  {
+    fputs("betest: Bad device-uri - no colon!\n", stderr);
+    return (1);
+  }
+
+ /*
+  * Execute and return
+  */
+
+  execl(backend, argv[1], argv[2], argv[3], argv[4], argv[5], argv[6], argv[7],
+        NULL);
+
+  return (1);
+}
+
+
+/*
+ * End of "$Id$".
+ */
@@ -1,802 +0,0 @@
-/*
- * "$Id$"
- *
- *   DNS-SD discovery backend for the Common UNIX Printing System (CUPS).
- *
- *   Copyright 2008 by Apple Inc.
- *
- *   These coded instructions, statements, and computer programs are the
- *   property of Apple Inc. and are protected by Federal copyright
- *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
- *   "LICENSE" which should have been included with this file.  If this
- *   file is missing or damaged, see the license at "http://www.cups.org/".
- *
- *   This file is subject to the Apple OS-Developed Software exception.
- *
- * Contents:
- *
- *   main()                  - Browse for printers.
- *   browse_callback()       - Browse devices.
- *   browse_local_callback() - Browse local devices.
- *   compare_devices()       - Compare two devices.
- *   get_device()            - Create or update a device.
- *   query_callback()        - Process query data.
- *   unquote()               - Unquote a name string.
- */
-
-/*
- * Include necessary headers.
- */
-
-#include "backend-private.h"
-#include <cups/array.h>
-#include <dns_sd.h>
-
-
-/*
- * Device structure...
- */
-
-typedef enum
-{
-  CUPS_DEVICE_PRINTER = 0,		/* lpd://... */
-  CUPS_DEVICE_IPP,			/* ipp://... */
-  CUPS_DEVICE_FAX_IPP,			/* ipp://... */
-  CUPS_DEVICE_PDL_DATASTREAM,		/* socket://... */
-  CUPS_DEVICE_RIOUSBPRINT		/* riousbprint://... */
-} cups_devtype_t;
-
-
-typedef struct
-{
-  DNSServiceRef	ref;			/* Service reference for resolve */
-  char		*name,			/* Service name */
-		*domain,		/* Domain name */
-		*fullName,		/* Full name */
-		*make_and_model;	/* Make and model from TXT record */
-  cups_devtype_t type;			/* Device registration type */
-  int		priority,		/* Priority associated with type */
-		cups_shared,		/* CUPS shared printer? */
-		sent;			/* Did we list the device? */
-} cups_device_t;
-
-
-/*
- * Local functions...
- */
-
-static void		browse_callback(DNSServiceRef sdRef,
-			                DNSServiceFlags flags,
-				        uint32_t interfaceIndex,
-				        DNSServiceErrorType errorCode,
-				        const char *serviceName,
-				        const char *regtype,
-				        const char *replyDomain, void *context);
-static void		browse_local_callback(DNSServiceRef sdRef,
-					      DNSServiceFlags flags,
-					      uint32_t interfaceIndex,
-					      DNSServiceErrorType errorCode,
-					      const char *serviceName,
-					      const char *regtype,
-					      const char *replyDomain,
-					      void *context);
-static int		compare_devices(cups_device_t *a, cups_device_t *b);
-static void		exec_backend(char **argv);
-static cups_device_t	*get_device(cups_array_t *devices,
-			            const char *serviceName,
-			            const char *regtype,
-				    const char *replyDomain);
-static void		query_callback(DNSServiceRef sdRef,
-			               DNSServiceFlags flags,
-				       uint32_t interfaceIndex,
-				       DNSServiceErrorType errorCode,
-				       const char *fullName, uint16_t rrtype,
-				       uint16_t rrclass, uint16_t rdlen,
-				       const void *rdata, uint32_t ttl,
-				       void *context);
-static void		unquote(char *dst, const char *src, size_t dstsize);
-
-
-/*
- * 'main()' - Browse for printers.
- */
-
-int					/* O - Exit status */
-main(int  argc,				/* I - Number of command-line args */
-     char *argv[])			/* I - Command-line arguments */
-{
-  const char	*name;			/* Backend name */
-  DNSServiceRef	main_ref,		/* Main service reference */
-		fax_ipp_ref,		/* IPP fax service reference */
-		ipp_ref,		/* IPP service reference */
-		ipp_tls_ref,		/* IPP w/TLS service reference */
-		local_fax_ipp_ref,	/* Local IPP fax service reference */
-		local_ipp_ref,		/* Local IPP service reference */
-		local_ipp_tls_ref,	/* Local IPP w/TLS service reference */
-		local_printer_ref,	/* Local LPD service reference */
-		pdl_datastream_ref,	/* AppSocket service reference */
-		printer_ref,		/* LPD service reference */
-		riousbprint_ref;	/* Remote IO service reference */
-  int		fd;			/* Main file descriptor */
-  fd_set	input;			/* Input set for select() */
-  struct timeval timeout;		/* Timeout for select() */
-  cups_array_t	*devices;		/* Device array */
-  cups_device_t	*device;		/* Current device */
-
-
- /*
-  * Check command-line...
-  */
-
-  setbuf(stderr, NULL);
-
-  if (argc >= 6)
-    exec_backend(argv);
-  else if (argc != 1)
-  {
-    fprintf(stderr, "Usage: %s job user title copies options [filename(s)]\n",
-            argv[0]);
-    return (1);
-  }
-
- /*
-  * Only do discovery when run as "dnssd"...
-  */
-
-  if ((name = strrchr(argv[0], '/')) != NULL)
-    name ++;
-  else
-    name = argv[0];
-
-  if (strcmp(name, "dnssd"))
-    return (0);
-
- /*
-  * Create an array to track devices...
-  */
-
-  devices = cupsArrayNew((cups_array_func_t)compare_devices, NULL);
-
- /*
-  * Browse for different kinds of printers...
-  */
-
-  if (DNSServiceCreateConnection(&main_ref) != kDNSServiceErr_NoError)
-  {
-    perror("ERROR: Unable to create service connection");
-    return (1);
-  }
-
-  fd = DNSServiceRefSockFD(main_ref);
-
-  fax_ipp_ref = main_ref;
-  DNSServiceBrowse(&fax_ipp_ref, kDNSServiceFlagsShareConnection, 0,
-                   "_fax-ipp._tcp", NULL, browse_callback, devices);
-
-  ipp_ref = main_ref;
-  DNSServiceBrowse(&ipp_ref, kDNSServiceFlagsShareConnection, 0,
-                   "_ipp._tcp", NULL, browse_callback, devices);
-
-  ipp_tls_ref = main_ref;
-  DNSServiceBrowse(&ipp_tls_ref, kDNSServiceFlagsShareConnection, 0,
-                   "_ipp-tls._tcp", NULL, browse_callback, devices);
-
-  local_fax_ipp_ref = main_ref;
-  DNSServiceBrowse(&local_fax_ipp_ref, kDNSServiceFlagsShareConnection,
-                   kDNSServiceInterfaceIndexLocalOnly,
-		   "_fax-ipp._tcp", NULL, browse_local_callback, devices);
-
-  local_ipp_ref = main_ref;
-  DNSServiceBrowse(&local_ipp_ref, kDNSServiceFlagsShareConnection,
-                   kDNSServiceInterfaceIndexLocalOnly,
-		   "_ipp._tcp", NULL, browse_local_callback, devices);
-
-  local_ipp_tls_ref = main_ref;
-  DNSServiceBrowse(&local_ipp_tls_ref, kDNSServiceFlagsShareConnection,
-                   kDNSServiceInterfaceIndexLocalOnly,
-                   "_ipp-tls._tcp", NULL, browse_local_callback, devices);
-
-  local_printer_ref = main_ref;
-  DNSServiceBrowse(&local_printer_ref, kDNSServiceFlagsShareConnection,
-                   kDNSServiceInterfaceIndexLocalOnly,
-                   "_printer._tcp", NULL, browse_local_callback, devices);
-
-  pdl_datastream_ref = main_ref;  
-  DNSServiceBrowse(&pdl_datastream_ref, kDNSServiceFlagsShareConnection, 0,
-                   "_pdl-datastream._tcp", NULL, browse_callback, devices);
-
-  printer_ref = main_ref;
-  DNSServiceBrowse(&printer_ref, kDNSServiceFlagsShareConnection, 0,
-                   "_printer._tcp", NULL, browse_callback, devices);
-
-  riousbprint_ref = main_ref;
-  DNSServiceBrowse(&riousbprint_ref, kDNSServiceFlagsShareConnection, 0,
-                   "_riousbprint._tcp", NULL, browse_callback, devices);
-
- /*
-  * Loop until we are killed...
-  */
-
-  for (;;)
-  {
-    FD_ZERO(&input);
-    FD_SET(fd, &input);
-
-    timeout.tv_sec  = 1;
-    timeout.tv_usec = 0;
-
-    if (select(fd + 1, &input, NULL, NULL, &timeout) < 0)
-      continue;
-
-    if (FD_ISSET(fd, &input))
-    {
-     /*
-      * Process results of our browsing...
-      */
-
-      DNSServiceProcessResult(main_ref);
-    }
-    else
-    {
-     /*
-      * Announce any devices we've found...
-      */
-
-      DNSServiceErrorType status;	/* DNS query status */
-      cups_device_t *best;		/* Best matching device */
-      char	device_uri[1024];	/* Device URI */
-      int	count;			/* Number of queries */
-      static const char * const schemes[] =
-      		{ "lpd", "ipp", "ipp", "socket", "riousbprint" };
-					/* URI schemes for devices */
-
-
-      for (device = (cups_device_t *)cupsArrayFirst(devices),
-               best = NULL, count = 0;
-           device;
-	   device = (cups_device_t *)cupsArrayNext(devices))
-        if (!device->ref && !device->sent)
-	{
-	 /*
-	  * Found the device, now get the TXT record(s) for it...
-	  */
-
-          if (count < 10)
-	  {
-	    device->ref = main_ref;
-
-	    fprintf(stderr, "DEBUG: Querying \"%s\"...\n", device->fullName);
-
-	    status = DNSServiceQueryRecord(&(device->ref),
-				           kDNSServiceFlagsShareConnection,
-				           0, device->fullName,
-					   kDNSServiceType_TXT,
-				           kDNSServiceClass_IN, query_callback,
-				           devices);
-            if (status != kDNSServiceErr_NoError)
-	    {
-	      fputs("ERROR: Unable to query for TXT records!\n", stderr);
-	      fprintf(stderr, "DEBUG: DNSServiceQueryRecord returned %d\n",
-	              status);
-            }
-	    else
-	      count ++;
-          }
-	}
-	else if (!device->sent)
-	{
-	 /*
-	  * Got the TXT records, now report the device...
-	  */
-
-	  DNSServiceRefDeallocate(device->ref);
-	  device->ref = 0;
-
-          if (!best)
-	    best = device;
-	  else if (strcasecmp(best->name, device->name) ||
-	           strcasecmp(best->domain, device->domain))
-          {
-	    httpAssembleURI(HTTP_URI_CODING_ALL, device_uri, sizeof(device_uri),
-			    schemes[best->type], NULL, best->fullName, 0,
-			    best->cups_shared ? "/cups" : "/");
-
-	    cupsBackendReport("network", device_uri, best->make_and_model,
-	                      best->name, NULL, NULL);
-	    best->sent = 1;
-	    best       = device;
-	  }
-	  else if (best->priority > device->priority ||
-	           (best->priority == device->priority &&
-		    best->type < device->type))
-          {
-	    best->sent = 1;
-	    best       = device;
-	  }
-	  else
-	    device->sent = 1;
-        }
-
-      if (best)
-      {
-	httpAssembleURI(HTTP_URI_CODING_ALL, device_uri, sizeof(device_uri),
-			schemes[best->type], NULL, best->fullName, 0,
-			best->cups_shared ? "/cups" : "/");
-
-	cupsBackendReport("network", device_uri, best->make_and_model,
-			  best->name, NULL, NULL);
-	best->sent = 1;
-      }
-    }
-  }
-}
-
-
-/*
- * 'browse_callback()' - Browse devices.
- */
-
-static void
-browse_callback(
-    DNSServiceRef       sdRef,		/* I - Service reference */
-    DNSServiceFlags     flags,		/* I - Option flags */
-    uint32_t            interfaceIndex,	/* I - Interface number */
-    DNSServiceErrorType errorCode,	/* I - Error, if any */
-    const char          *serviceName,	/* I - Name of service/device */
-    const char          *regtype,	/* I - Type of service */
-    const char          *replyDomain,	/* I - Service domain */
-    void                *context)	/* I - Devices array */
-{
-  fprintf(stderr, "DEBUG2: browse_callback(sdRef=%p, flags=%x, "
-                  "interfaceIndex=%d, errorCode=%d, serviceName=\"%s\", "
-		  "regtype=\"%s\", replyDomain=\"%s\", context=%p)\n",
-          sdRef, flags, interfaceIndex, errorCode,
-	  serviceName ? serviceName : "(null)",
-	  regtype ? regtype : "(null)",
-	  replyDomain ? replyDomain : "(null)",
-	  context);
-
- /*
-  * Only process "add" data...
-  */
-
-  if (errorCode != kDNSServiceErr_NoError || !(flags & kDNSServiceFlagsAdd))
-    return;
-
- /*
-  * Get the device...
-  */
-
-  get_device((cups_array_t *)context, serviceName, regtype, replyDomain);
-}
-
-
-/*
- * 'browse_local_callback()' - Browse local devices.
- */
-
-static void
-browse_local_callback(
-    DNSServiceRef       sdRef,		/* I - Service reference */
-    DNSServiceFlags     flags,		/* I - Option flags */
-    uint32_t            interfaceIndex,	/* I - Interface number */
-    DNSServiceErrorType errorCode,	/* I - Error, if any */
-    const char          *serviceName,	/* I - Name of service/device */
-    const char          *regtype,	/* I - Type of service */
-    const char          *replyDomain,	/* I - Service domain */
-    void                *context)	/* I - Devices array */
-{
-  cups_device_t	*device;		/* Device */
-
-
-  fprintf(stderr, "DEBUG2: browse_local_callback(sdRef=%p, flags=%x, "
-                  "interfaceIndex=%d, errorCode=%d, serviceName=\"%s\", "
-		  "regtype=\"%s\", replyDomain=\"%s\", context=%p)\n",
-          sdRef, flags, interfaceIndex, errorCode,
-	  serviceName ? serviceName : "(null)",
-	  regtype ? regtype : "(null)",
-	  replyDomain ? replyDomain : "(null)",
-	  context);
-
- /*
-  * Only process "add" data...
-  */
-
-  if (errorCode != kDNSServiceErr_NoError || !(flags & kDNSServiceFlagsAdd))
-    return;
-
- /*
-  * Get the device...
-  */
-
-  device = get_device((cups_array_t *)context, serviceName, regtype,
-                      replyDomain);
-
- /*
-  * Hide locally-registered devices...
-  */
-
-  fprintf(stderr, "DEBUG: Hiding local printer \"%s\"...\n",
-	  device->fullName);
-  device->sent = 1;
-}
-
-
-/*
- * 'compare_devices()' - Compare two devices.
- */
-
-static int				/* O - Result of comparison */
-compare_devices(cups_device_t *a,	/* I - First device */
-                cups_device_t *b)	/* I - Second device */
-{
-  int result = strcmp(a->name, b->name);
-
-  if (result)
-    return (result);
-  else
-    return (strcmp(a->domain, b->domain));
-}
-
-
-/*
- * 'exec_backend()' - Execute the backend that corresponds to the
- *                    resolved service name.
- */
-
-static void
-exec_backend(char **argv)		/* I - Command-line arguments */
-{
-  const char	*resolved_uri,		/* Resolved device URI */
-		*cups_serverbin;	/* Location of programs */
-  char		scheme[1024],		/* Scheme from URI */
-		*ptr,			/* Pointer into scheme */
-		filename[1024];		/* Backend filename */
-
-
- /*
-  * Resolve the device URI...
-  */
-
-  if ((resolved_uri = cupsBackendDeviceURI(argv)) == NULL)
-    exit(CUPS_BACKEND_FAILED);
-
- /*
-  * Extract the scheme from the URI...
-  */
-
-  strlcpy(scheme, resolved_uri, sizeof(scheme));
-  if ((ptr = strchr(scheme, ':')) != NULL)
-    *ptr = '\0';
-
- /*
-  * Get the filename of the backend...
-  */
-
-  if ((cups_serverbin = getenv("CUPS_SERVERBIN")) == NULL)
-    cups_serverbin = CUPS_SERVERBIN;
-
-  snprintf(filename, sizeof(filename), "%s/backend/%s", cups_serverbin, scheme);
-
- /*
-  * Overwrite the device URIs and run the new backend...
-  */
-
-  setenv("DEVICE_URI", resolved_uri, 1);
-
-  argv[0] = (char *)resolved_uri;
-
-  fprintf(stderr, "DEBUG: Executing backend \"%s\"...\n", filename);
-
-  execv(filename, argv);
-
-  fprintf(stderr, "ERROR: Unable to execute backend \"%s\": %s\n", filename,
-          strerror(errno));
-  exit(CUPS_BACKEND_STOP);
-}
-
-
-/*
- * 'get_device()' - Create or update a device.
- */
-
-static cups_device_t *			/* O - Device */
-get_device(cups_array_t *devices,	/* I - Device array */
-           const char   *serviceName,	/* I - Name of service/device */
-           const char   *regtype,	/* I - Type of service */
-           const char   *replyDomain)	/* I - Service domain */
-{
-  cups_device_t	key,			/* Search key */
-		*device;		/* Device */
-  char		fullName[kDNSServiceMaxDomainName];
-					/* Full name for query */
-
-
- /*
-  * See if this is a new device...
-  */
-
-  key.name   = (char *)serviceName;
-  key.domain = (char *)replyDomain;
-
-  if (!strcmp(regtype, "_ipp._tcp.") ||
-      !strcmp(regtype, "_ipp-tls._tcp."))
-    key.type = CUPS_DEVICE_IPP;
-  else if (!strcmp(regtype, "_fax-ipp._tcp."))
-    key.type = CUPS_DEVICE_FAX_IPP;
-  else if (!strcmp(regtype, "_printer._tcp."))
-    key.type = CUPS_DEVICE_PRINTER;
-  else if (!strcmp(regtype, "_pdl-datastream._tcp."))
-    key.type = CUPS_DEVICE_PDL_DATASTREAM;
-  else
-    key.type = CUPS_DEVICE_RIOUSBPRINT;
-
-  for (device = cupsArrayFind(devices, &key);
-       device;
-       device = cupsArrayNext(devices))
-    if (strcasecmp(device->name, key.name) ||
-        strcasecmp(device->domain, key.domain))
-      break;
-    else if (device->type == key.type)
-      return (device);
-
- /*
-  * Yes, add the device...
-  */
-
-  fprintf(stderr, "DEBUG: Found \"%s.%s%s\"...\n", serviceName, regtype,
-	  replyDomain);
-
-  device           = calloc(sizeof(cups_device_t), 1);
-  device->name     = strdup(serviceName);
-  device->domain   = strdup(replyDomain);
-  device->type     = key.type;
-  device->priority = 50;
-
-  cupsArrayAdd(devices, device);
-
- /*
-  * Set the "full name" of this service, which is used for queries...
-  */
-
-  DNSServiceConstructFullName(fullName, serviceName, regtype, replyDomain);
-  device->fullName = strdup(fullName);
-
-  return (device);
-}
-
-
-/*
- * 'query_callback()' - Process query data.
- */
-
-static void
-query_callback(
-    DNSServiceRef       sdRef,		/* I - Service reference */
-    DNSServiceFlags     flags,		/* I - Data flags */
-    uint32_t            interfaceIndex,	/* I - Interface */
-    DNSServiceErrorType errorCode,	/* I - Error, if any */
-    const char          *fullName,	/* I - Full service name */
-    uint16_t            rrtype,		/* I - Record type */
-    uint16_t            rrclass,	/* I - Record class */
-    uint16_t            rdlen,		/* I - Length of record data */
-    const void          *rdata,		/* I - Record data */
-    uint32_t            ttl,		/* I - Time-to-live */
-    void                *context)	/* I - Devices array */
-{
-  cups_array_t	*devices;		/* Device array */
-  char		name[1024],		/* Service name */
-		*ptr;			/* Pointer into name */
-  cups_device_t	key,			/* Search key */
-		*device;		/* Device */
-
-
-  fprintf(stderr, "DEBUG2: query_callback(sdRef=%p, flags=%x, "
-                  "interfaceIndex=%d, errorCode=%d, fullName=\"%s\", "
-		  "rrtype=%u, rrclass=%u, rdlen=%u, rdata=%p, ttl=%u, "
-		  "context=%p)\n",
-          sdRef, flags, interfaceIndex, errorCode,
-	  fullName ? fullName : "(null)", rrtype, rrclass, rdlen, rdata, ttl,
-	  context);
-
- /*
-  * Only process "add" data...
-  */
-
-  if (errorCode != kDNSServiceErr_NoError || !(flags & kDNSServiceFlagsAdd))
-    return;
-
- /*
-  * Lookup the service in the devices array.
-  */
-
-  devices  = (cups_array_t *)context;
-  key.name = name;
-
-  unquote(name, fullName, sizeof(name));
-
-  if ((key.domain = strstr(name, "._tcp.")) != NULL)
-    key.domain += 6;
-  else
-    key.domain = (char *)"local.";
-
-  if ((ptr = strstr(name, "._")) != NULL)
-    *ptr = '\0';
-
-  if (strstr(fullName, "_ipp._tcp.") ||
-      strstr(fullName, "_ipp-tls._tcp."))
-    key.type = CUPS_DEVICE_IPP;
-  else if (strstr(fullName, "_fax-ipp._tcp."))
-    key.type = CUPS_DEVICE_FAX_IPP;
-  else if (strstr(fullName, "_printer._tcp."))
-    key.type = CUPS_DEVICE_PRINTER;
-  else if (strstr(fullName, "_pdl-datastream._tcp."))
-    key.type = CUPS_DEVICE_PDL_DATASTREAM;
-  else
-    key.type = CUPS_DEVICE_RIOUSBPRINT;
-
-  for (device = cupsArrayFind(devices, &key);
-       device;
-       device = cupsArrayNext(devices))
-  {
-    if (strcasecmp(device->name, key.name) ||
-        strcasecmp(device->domain, key.domain))
-    {
-      device = NULL;
-      break;
-    }
-    else if (device->type == key.type)
-    {
-     /*
-      * Found it, pull out the priority and make and model from the TXT
-      * record and save it...
-      */
-
-      const void *value;		/* Pointer to value */
-      uint8_t	valueLen;		/* Length of value (max 255) */
-      char	make_and_model[512],	/* Manufacturer and model */
-		model[256],		/* Model */
-		priority[256];		/* Priority */
-
-
-      value = TXTRecordGetValuePtr(rdlen, rdata, "priority", &valueLen);
-
-      if (value && valueLen)
-      {
-	memcpy(priority, value, valueLen);
-	priority[valueLen] = '\0';
-	device->priority = atoi(priority);
-      }
-
-      if ((value = TXTRecordGetValuePtr(rdlen, rdata, "usb_MFG",
-					&valueLen)) == NULL)
-	value = TXTRecordGetValuePtr(rdlen, rdata, "usb_MANUFACTURER",
-	                             &valueLen);
-
-      if (value && valueLen)
-      {
-	memcpy(make_and_model, value, valueLen);
-	make_and_model[valueLen] = '\0';
-      }
-      else
-	make_and_model[0] = '\0';
-
-      if ((value = TXTRecordGetValuePtr(rdlen, rdata, "usb_MDL",
-					&valueLen)) == NULL)
-	value = TXTRecordGetValuePtr(rdlen, rdata, "usb_MODEL", &valueLen);
-
-      if (value && valueLen)
-      {
-	memcpy(model, value, valueLen);
-	model[valueLen] = '\0';
-      }
-      else if ((value = TXTRecordGetValuePtr(rdlen, rdata, "product",
-					     &valueLen)) != NULL && valueLen > 2)
-      {
-	if (((char *)value)[0] == '(')
-	{
-	 /*
-	  * Strip parenthesis...
-	  */
-
-	  memcpy(model, value + 1, valueLen - 2);
-	  model[valueLen - 2] = '\0';
-	}
-	else
-	{
-	  memcpy(model, value, valueLen);
-	  model[valueLen] = '\0';
-	}
-
-	if (!strcasecmp(model, "GPL Ghostscript") ||
-	    !strcasecmp(model, "GNU Ghostscript") ||
-	    !strcasecmp(model, "ESP Ghostscript"))
-	{
-	  if ((value = TXTRecordGetValuePtr(rdlen, rdata, "ty",
-					    &valueLen)) != NULL)
-	  {
-	    memcpy(model, value, valueLen);
-	    model[valueLen] = '\0';
-
-	    if ((ptr = strchr(model, ',')) != NULL)
-	      *ptr = '\0';
-	  }
-	  else
-	    strcpy(model, "Unknown");
-	}
-      }
-      else
-	strcpy(model, "Unknown");
-
-      if (device->make_and_model)
-	free(device->make_and_model);
-
-      if (make_and_model[0])
-      {
-	strlcat(make_and_model, " ", sizeof(make_and_model));
-	strlcat(make_and_model, model, sizeof(make_and_model));
-	device->make_and_model = strdup(make_and_model);
-      }
-      else
-	device->make_and_model = strdup(model);
-
-      if ((device->type == CUPS_DEVICE_IPP ||
-	   device->type == CUPS_DEVICE_PRINTER) &&
-	  TXTRecordGetValuePtr(rdlen, rdata, "printer-type", &valueLen))
-      {
-       /*
-	* This is a CUPS printer!
-	*/
-
-	device->cups_shared = 1;
-
-	if (device->type == CUPS_DEVICE_PRINTER)
-	  device->sent = 1;
-      }
-
-      break;
-    }
-  }
-
-  if (!device)
-    fprintf(stderr, "DEBUG: Ignoring TXT record for \"%s\"...\n", fullName);
-}
-
-
-/*
- * 'unquote()' - Unquote a name string.
- */
-
-static void
-unquote(char       *dst,		/* I - Destination buffer */
-        const char *src,		/* I - Source string */
-	size_t     dstsize)		/* I - Size of destination buffer */
-{
-  char	*dstend = dst + dstsize - 1;	/* End of destination buffer */
-
-
-  while (*src && dst < dstend)
-  {
-    if (*src == '\\')
-    {
-      src ++;
-      if (isdigit(src[0] & 255) && isdigit(src[1] & 255) &&
-          isdigit(src[2] & 255))
-      {
-        *dst++ = ((((src[0] - '0') * 10) + src[1] - '0') * 10) + src[2] - '0';
-	src += 3;
-      }
-      else
-        *dst++ = *src++;
-    }
-    else
-      *dst++ = *src ++;
-  }
-
-  *dst = '\0';
-}
-
-
-/*
- * End of "$Id$".
- */
@@ -1,71 +0,0 @@
-Preliminary Design for CUPS Firewire Printer Backend - 03/19/2002
-----------------------------------------------------------------
-
-OVERVIEW
-
-    Easy Software Products will develop an IEEE-1394, a.k.a.
-    Firewire, printing interface for its Common UNIX Printing
-    System ("CUPS") for initial use under the Linux operating
-    system.  A follow-on implementation for MacOS X is
-    anticipated as well.
-
-    The operating system interfaces for IEEE-1394 ports vary
-    widely; the CUPS printing interface will abstract the OS
-    layer to a simpler interface geared towards discovering,
-    opening, reading from, writing to, and closing IEEE-1394
-    printers.
-
-    The initial development of the CUPS backend will be targeted
-    at the EPSON Stylus Pro 10000 large format printer, which
-    requires the bandwidth provided by Firewire in order to
-    print at full speed.  This printer supports printing via
-    Serial Bus Protocol 2 (SBP-2) using the SCSI and PWG command
-    sets. The CUPS backend will implement the PWG command set on
-    LUN 0 only.
-
-
-OS ABSTRACTION LAYER
-
-    The OS abstraction layer will be a thin client library that
-    implements the following functions:
-
-        ieee1394_list
-	ieee1394_open
-	ieee1394_close
-	ieee1394_read
-	ieee1394_write
-	ieee1394_error
-
-    The "ieee1394_list" function will list all of the available
-    printer devices on the bus.  The device information will
-    consist of the device URI (ieee1394:/something) used to
-    access the device and the make and model information, if
-    available, for the device ("EPSON Stylus Printer").
-
-    The "ieee1394_open" and "ieee1394_close" functions will open
-    and close a connection to the printer, respectively.
-
-    The "ieee1394_read" and "ieee1394_write" functions will read
-    and write data to and from the printer, respectively.  The
-    read function will be non-blocking, returning data only if
-    there is data coming back from the printer.
-
-    The "ieee1394_error" function will return a string
-    describing the last error or NULL if no error occurred.
-
-    The library will be responsible for creating any background
-    threads that are needed to monitor the connection to the
-    printer.
-
-
-CUPS BACKEND
-
-    The CUPS backend will use the OS abstraction layer to list
-    and access the Firewire printers.  The "main" function will
-    read and write printer data, while the "list_devices"
-    function will be called as necessary to identify the
-    available devices.
-
-    The CUPS 1.1 backend will record any status information in
-    the error log file, while the 1.2 backend will supply it to
-    the printer driver process.
@@ -1,35 +0,0 @@
-Easy Software Products
-44141 Airport View Drive
-Suite 204
-Hollywood, Maryland 20636
-+1.301.373.9600
-March 8, 2002
-
-
-Subject: EPSON Firewire Printer Driver for Linux
-
-Currently, no Firewire printer support exists for Linux.  Since
-the latest EPSON printer products depend on the Firewire
-interface to print at full speed, a solution is needed to
-support customers using Linux as their server platform.
-
-The Linux Firewire subsystem provides a user-mode driver
-interface that allows driver programs to access Firewire
-devices.  Easy Software Products will utilize this interface to
-develop a "backend" program for the Common UNIX Printing System
-that will allow users to print to EPSON printers using the
-Firewire interface.
-
-After examining the Linux interface, we estimate that it will
-require approximately 30 hours of development time to write,
-test, and document the Firewire backend, for a total cost of
-$3,000. The new backend will become a standard part of the CUPS
-software distribution and will be included with at least the
-following Linux distributions:
-
-    - Caldera Linux
-    - Mandrake Linux
-    - Red Hat Linux
-    - SuSE Linux
-
-ESP will provide EPSON with binaries for Red Hat Linux 7.2.
@@ -3,14 +3,23 @@
 *
 *   IEEE-1284 support functions for the Common UNIX Printing System (CUPS).
 *
- *   Copyright 2007-2008 by Apple Inc.
- *   Copyright 1997-2007 by Easy Software Products, all rights reserved.
+ *   Copyright 1997-2006 by Easy Software Products, all rights reserved.
 *
 *   These coded instructions, statements, and computer programs are the
- *   property of Apple Inc. and are protected by Federal copyright
- *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   property of Easy Software Products and are protected by Federal
+ *   copyright law.  Distribution and use rights are outlined in the file
 *   "LICENSE" which should have been included with this file.  If this
- *   file is missing or damaged, see the license at "http://www.cups.org/".
+ *   file is missing or damaged please contact Easy Software Products
+ *   at:
+ *
+ *       Attn: CUPS Licensing Information
+ *       Easy Software Products
+ *       44141 Airport View Drive, Suite 204
+ *       Hollywood, Maryland 20636 USA
+ *
+ *       Voice: (301) 373-9600
+ *       EMail: cups-info@cups.org
+ *         WWW: http://www.cups.org
 *
 *   This file is subject to the Apple OS-Developed Software exception.
 *
@@ -32,10 +41,6 @@
 #  include <linux/lp.h>
 #  define IOCNR_GET_DEVICE_ID		1
 #  define LPIOC_GET_DEVICE_ID(len)	_IOC(_IOC_READ, 'P', IOCNR_GET_DEVICE_ID, len)
-#  include <linux/parport.h>
-#  include <linux/ppdev.h>
-#  include <unistd.h>
-#  include <fcntl.h>
 #endif /* __linux */

 #ifdef __sun
@@ -64,17 +69,18 @@ backendGetDeviceID(
    char       *uri,			/* O - Device URI */
    int        uri_size)		/* I - Size of buffer */
 {
-#ifdef __APPLE__ /* This function is a no-op */
-  return (-1);
-
-#else /* Get the device ID from the specified file descriptor... */
-#  ifdef __linux
+  char	*attr,				/* 1284 attribute */
+  	*delim,				/* 1284 delimiter */
+	*uriptr,			/* Pointer into URI */
+	manufacturer[256],		/* Manufacturer string */
+	serial_number[1024];		/* Serial number string */
+  int	manulen;			/* Length of manufacturer string */
+#ifdef __linux
  int	length;				/* Length of device ID info */
-  int   got_id = 0;
-#  endif /* __linux */
-#  if defined(__sun) && defined(ECPPIOC_GETDEVID)
+#endif /* __linux */
+#if defined(__sun) && defined(ECPPIOC_GETDEVID)
  struct ecpp_device_id did;		/* Device ID buffer */
-#  endif /* __sun && ECPPIOC_GETDEVID */
+#endif /* __sun && ECPPIOC_GETDEVID */


  DEBUG_printf(("backendGetDeviceID(fd=%d, device_id=%p, device_id_size=%d, "
@@ -87,167 +93,87 @@ backendGetDeviceID(
  * Range check input...
  */

-  if (!device_id || device_id_size < 32)
+  if (fd < 0 ||
+      !device_id || device_id_size < 32 ||
+      !make_model || make_model_size < 32)
  {
    DEBUG_puts("backendGetDeviceID: Bad args!");
    return (-1);
  }

-  if (make_model)
-    *make_model = '\0';
+  *device_id  = '\0';
+  *make_model = '\0';

-  if (fd >= 0)
+  if (uri)
+    *uri = '\0';
+
+ /*
+  * Get the device ID string...
+  */
+
+#ifdef __linux
+  if (!ioctl(fd, LPIOC_GET_DEVICE_ID(device_id_size), device_id))
  {
   /*
-    * Get the device ID string...
+    * Extract the length of the device ID string from the first two
+    * bytes.  The 1284 spec says the length is stored MSB first...
    */

-    *device_id = '\0';
+    length = (((unsigned)device_id[0] & 255) << 8) +
+	     ((unsigned)device_id[1] & 255);

-#  ifdef __linux
-    if (ioctl(fd, LPIOC_GET_DEVICE_ID(device_id_size), device_id))
-    {
-     /*
-      * Linux has to implement things differently for every device it seems.
-      * Since the standard parallel port driver does not provide a simple
-      * ioctl() to get the 1284 device ID, we have to open the "raw" parallel
-      * device corresponding to this port and do some negotiation trickery
-      * to get the current device ID.
-      */
+   /*
+    * Check to see if the length is larger than our buffer; first
+    * assume that the vendor incorrectly implemented the 1284 spec,
+    * and then limit the length to the size of our buffer...
+    */

-      if (uri && !strncmp(uri, "parallel:/dev/", 14))
-      {
-	char	devparport[16];		/* /dev/parportN */
-	int	devparportfd,		/* File descriptor for raw device */
-		  mode;			/* Port mode */
+    if (length > (device_id_size - 2))
+      length = (((unsigned)device_id[1] & 255) << 8) +
+	       ((unsigned)device_id[0] & 255);

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

-       /*
-	* Since the Linux parallel backend only supports 4 parallel port
-	* devices, just grab the trailing digit and use it to construct a
-	* /dev/parportN filename...
-	*/
+   /*
+    * Copy the device ID text to the beginning of the buffer and
+    * nul-terminate.
+    */

-	snprintf(devparport, sizeof(devparport), "/dev/parport%s",
-		 uri + strlen(uri) - 1);
-
-	if ((devparportfd = open(devparport, O_RDWR | O_NOCTTY)) != -1)
-	{
-	 /*
-	  * Claim the device...
-	  */
-
-	  if (!ioctl(devparportfd, PPCLAIM))
-	  {
-	    fcntl(devparportfd, F_SETFL, fcntl(devparportfd, F_GETFL) | O_NONBLOCK);
-
-	    mode = IEEE1284_MODE_COMPAT;
-
-	    if (!ioctl(devparportfd, PPNEGOT, &mode))
-	    {
-	     /*
-	      * Put the device into Device ID mode...
-	      */
-
-	      mode = IEEE1284_MODE_NIBBLE | IEEE1284_DEVICEID;
-
-	      if (!ioctl(devparportfd, PPNEGOT, &mode))
-	      {
-	       /*
-		* Read the 1284 device ID...
-		*/
-
-		if ((length = read(devparportfd, device_id,
-				   device_id_size - 1)) >= 2)
-		{
-		  device_id[length] = '\0';
-		  got_id = 1;
-		}
-	      }
-	    }
-
-	   /*
-	    * Release the device...
-	    */
-
-	    ioctl(devparportfd, PPRELEASE);
-	  }
-
-	  close(devparportfd);
-	}
-      }
-    }
-    else
-      got_id = 1;
-
-    if (got_id)
-    {
-     /*
-      * Extract the length of the device ID string from the first two
-      * bytes.  The 1284 spec says the length is stored MSB first...
-      */
-
-      length = (((unsigned)device_id[0] & 255) << 8) +
-	       ((unsigned)device_id[1] & 255);
-
-     /*
-      * Check to see if the length is larger than our buffer; first
-      * assume that the vendor incorrectly implemented the 1284 spec,
-      * and then limit the length to the size of our buffer...
-      */
-
-      if (length > (device_id_size - 2))
-	length = (((unsigned)device_id[1] & 255) << 8) +
-		 ((unsigned)device_id[0] & 255);
-
-      if (length > (device_id_size - 2))
-	length = device_id_size - 2;
-
-     /*
-      * Copy the device ID text to the beginning of the buffer and
-      * nul-terminate.
-      */
-
-      memmove(device_id, device_id + 2, length);
-      device_id[length] = '\0';
-    }
-#    ifdef DEBUG
-    else
-      DEBUG_printf(("backendGetDeviceID: ioctl failed - %s\n",
-                    strerror(errno)));
-#    endif /* DEBUG */
-#  endif /* __linux */
-
-#   if defined(__sun) && defined(ECPPIOC_GETDEVID)
-    did.mode = ECPP_CENTRONICS;
-    did.len  = device_id_size - 1;
-    did.rlen = 0;
-    did.addr = device_id;
-
-    if (!ioctl(fd, ECPPIOC_GETDEVID, &did))
-    {
-     /*
-      * Nul-terminate the device ID text.
-      */
-
-      if (did.rlen < (device_id_size - 1))
-	device_id[did.rlen] = '\0';
-      else
-	device_id[device_id_size - 1] = '\0';
-    }
-#    ifdef DEBUG
-    else
-      DEBUG_printf(("backendGetDeviceID: ioctl failed - %s\n",
-                    strerror(errno)));
-#    endif /* DEBUG */
-#  endif /* __sun && ECPPIOC_GETDEVID */
+    memmove(device_id, device_id + 2, length);
+    device_id[length] = '\0';
  }
+#  ifdef DEBUG
+  else
+    printf("backendGetDeviceID: ioctl failed - %s\n", strerror(errno));
+#  endif /* DEBUG */
+#endif /* __linux */
+
+#if defined(__sun) && defined(ECPPIOC_GETDEVID)
+  did.mode = ECPP_CENTRONICS;
+  did.len  = device_id_size - 1;
+  did.rlen = 0;
+  did.addr = device_id;
+
+  if (!ioctl(fd, ECPPIOC_GETDEVID, &did))
+  {
+   /*
+    * Nul-terminate the device ID text.
+    */
+
+    if (did.rlen < (device_id_size - 1))
+      device_id[did.rlen] = '\0';
+    else
+      device_id[device_id_size - 1] = '\0';
+  }
+#  ifdef DEBUG
+  else
+    printf("backendGetDeviceID: ioctl failed - %s\n", strerror(errno));
+#  endif /* DEBUG */
+#endif /* __sun && ECPPIOC_GETDEVID */

  DEBUG_printf(("backendGetDeviceID: device_id=\"%s\"\n", device_id));

-  if (scheme && uri)
-    *uri = '\0';
-
  if (!*device_id)
    return (-1);

@@ -255,8 +181,7 @@ backendGetDeviceID(
  * Get the make and model...
  */

-  if (make_model)
-    backendGetMakeModel(device_id, make_model, make_model_size);
+  backendGetMakeModel(device_id, make_model, make_model_size);

 /*
  * Then generate a device URI...
@@ -264,61 +189,111 @@ backendGetDeviceID(

  if (scheme && uri && uri_size > 32)
  {
-    int			num_values;	/* Number of keys and values */
-    cups_option_t	*values;	/* Keys and values in device ID */
-    const char		*mfg,		/* Manufacturer */
-			*mdl,		/* Model */
-			*sern;		/* Serial number */
-    char		temp[256],	/* Temporary manufacturer string */
-			*tempptr;	/* Pointer into temp string */
-
-
   /*
-    * Get the make, model, and serial numbers...
+    * Look for the serial number field...
    */

-    num_values = _ppdGet1284Values(device_id, &values);
+    if ((attr = strstr(device_id, "SERN:")) != NULL)
+      attr += 5;
+    else if ((attr = strstr(device_id, "SERIALNUMBER:")) != NULL)
+      attr += 13;
+    else if ((attr = strstr(device_id, ";SN:")) != NULL)
+      attr += 4;

-    if ((sern = cupsGetOption("SERIALNUMBER", num_values, values)) == NULL)
-      if ((sern = cupsGetOption("SERN", num_values, values)) == NULL)
-        sern = cupsGetOption("SN", num_values, values);
-
-    if ((mfg = cupsGetOption("MANUFACTURER", num_values, values)) == NULL)
-      mfg = cupsGetOption("MFG", num_values, values);
-
-    if ((mdl = cupsGetOption("MODEL", num_values, values)) == NULL)
-      mdl = cupsGetOption("MDL", num_values, values);
-
-    if (mfg)
+    if (attr)
    {
-      if (!strcasecmp(mfg, "Hewlett-Packard"))
-        mfg = "HP";
-      else if (!strcasecmp(mfg, "Lexmark International"))
-        mfg = "Lexmark";
+      strlcpy(serial_number, attr, sizeof(serial_number));
+
+      if ((delim = strchr(serial_number, ';')) != NULL)
+	*delim = '\0';
    }
    else
-    {
-      strlcpy(temp, make_model, sizeof(temp));
-
-      if ((tempptr = strchr(temp, ' ')) != NULL)
-        *tempptr = '\0';
-
-      mfg = temp;
-    }
+      serial_number[0] = '\0';

   /*
    * Generate the device URI from the manufacturer, make_model, and
    * serial number strings.
    */

-    httpAssembleURIf(HTTP_URI_CODING_ALL, uri, uri_size, scheme, NULL, mfg, 0,
-                     "/%s%s%s", mdl, sern ? "?serial=" : "", sern ? sern : "");
+    snprintf(uri, uri_size, "%s://", scheme);

-    cupsFreeOptions(num_values, values);
+    if ((attr = strstr(device_id, "MANUFACTURER:")) != NULL)
+      attr += 13;
+    else if ((attr = strstr(device_id, "Manufacturer:")) != NULL)
+      attr += 13;
+    else if ((attr = strstr(device_id, "MFG:")) != NULL)
+      attr += 4;
+
+    if (attr)
+    {
+      strlcpy(manufacturer, attr, sizeof(manufacturer));
+
+      if ((delim = strchr(manufacturer, ';')) != NULL)
+        *delim = '\0';
+
+      if (!strcasecmp(manufacturer, "Hewlett-Packard"))
+        strcpy(manufacturer, "HP");
+      else if (!strcasecmp(manufacturer, "Lexmark International"))
+        strcpy(manufacturer, "Lexmark");
+    }
+    else
+    {
+      strlcpy(manufacturer, make_model, sizeof(manufacturer));
+
+      if ((delim = strchr(manufacturer, ' ')) != NULL)
+        *delim = '\0';
+    }
+
+    manulen = strlen(manufacturer);
+
+    for (uriptr = uri + strlen(uri), delim = manufacturer;
+	 *delim && uriptr < (uri + uri_size - 3);
+	 delim ++)
+      if (*delim == ' ')
+      {
+	*uriptr++ = '%';
+	*uriptr++ = '2';
+	*uriptr++ = '0';
+      }
+      else
+	*uriptr++ = *delim;
+
+    *uriptr++ = '/';
+
+    if (!strncasecmp(make_model, manufacturer, manulen))
+    {
+      delim = make_model + manulen;
+
+      while (isspace(*delim & 255))
+        delim ++;
+    }
+    else
+      delim = make_model;
+
+    for (; *delim && uriptr < (uri + uri_size - 3); delim ++)
+      if (*delim == ' ')
+      {
+	*uriptr++ = '%';
+	*uriptr++ = '2';
+	*uriptr++ = '0';
+      }
+      else
+	*uriptr++ = *delim;
+
+    if (serial_number[0])
+    {
+     /*
+      * Add the serial number to the URI...
+      */
+
+      strlcpy(uriptr, "?serial=", uri_size - (uriptr - uri));
+      strlcat(uriptr, serial_number, uri_size - (uriptr - uri));
+    }
+    else
+      *uriptr = '\0';
  }

  return (0);
-#endif /* __APPLE__ */
 }


@@ -332,11 +307,10 @@ backendGetMakeModel(
    char       *make_model,		/* O - Make/model */
    int        make_model_size)		/* I - Size of buffer */
 {
-  int		num_values;		/* Number of keys and values */
-  cups_option_t	*values;		/* Keys and values */
-  const char	*mfg,			/* Manufacturer string */
-		*mdl,			/* Model string */
-		*des;			/* Description string */
+  char	*attr,				/* 1284 attribute */
+  	*delim,				/* 1284 delimiter */
+	*mfg,				/* Manufacturer string */
+	*mdl;				/* Model string */


  DEBUG_printf(("backendGetMakeModel(device_id=\"%s\", "
@@ -359,42 +333,12 @@ backendGetMakeModel(
  * Look for the description field...
  */

-  num_values = _ppdGet1284Values(device_id, &values);
+  if ((attr = strstr(device_id, "DES:")) != NULL)
+    attr += 4;
+  else if ((attr = strstr(device_id, "DESCRIPTION:")) != NULL)
+    attr += 12;

-  if ((mdl = cupsGetOption("MODEL", num_values, values)) == NULL)
-    mdl = cupsGetOption("MDL", num_values, values);
-
-  if (mdl)
-  {
-   /*
-    * Build a make-model string from the manufacturer and model attributes...
-    */
-
-    if ((mfg = cupsGetOption("MANUFACTURER", num_values, values)) == NULL)
-      mfg = cupsGetOption("MFG", num_values, values);
-
-    if (!mfg || !strncasecmp(mdl, mfg, strlen(mfg)))
-    {
-     /*
-      * Just copy the model string, since it has the manufacturer...
-      */
-
-      _ppdNormalizeMakeAndModel(mdl, make_model, make_model_size);
-    }
-    else
-    {
-     /*
-      * Concatenate the make and model...
-      */
-
-      char	temp[1024];		/* Temporary make and model */
-
-      snprintf(temp, sizeof(temp), "%s %s", mfg, mdl);
-      _ppdNormalizeMakeAndModel(temp, make_model, make_model_size);
-    }
-  }
-  else if ((des = cupsGetOption("DESCRIPTION", num_values, values)) != NULL ||
-           (des = cupsGetOption("DES", num_values, values)) != NULL)
+  if (attr)
  {
   /*
    * Make sure the description contains something useful, since some
@@ -405,30 +349,119 @@ backendGetMakeModel(
    * containing at least one space and one letter.
    */

-    if (strlen(des) >= 8)
+    if ((delim = strchr(attr, ';')) == NULL)
+      delim = attr + strlen(attr);
+
+    if ((delim - attr) < 8)
+      attr = NULL;
+    else
    {
-      const char	*ptr;		/* Pointer into description */
-      int		letters,	/* Number of letters seen */
-			spaces;		/* Number of spaces seen */
+      char	*ptr;			/* Pointer into description */
+      int	letters,		/* Number of letters seen */
+		spaces;			/* Number of spaces seen */


-      for (ptr = des, letters = 0, spaces = 0; *ptr; ptr ++)
+      for (ptr = attr, letters = 0, spaces = 0; ptr < delim; ptr ++)
      {
-	if (isspace(*ptr & 255))
+        if (isspace(*ptr & 255))
 	  spaces ++;
 	else if (isalpha(*ptr & 255))
 	  letters ++;

-	if (spaces && letters)
+        if (spaces && letters)
 	  break;
      }

-      if (spaces && letters)
-        _ppdNormalizeMakeAndModel(des, make_model, make_model_size);
+      if (!spaces || !letters)
+        attr = NULL;
    }
  }

-  if (!make_model[0])
+  if ((mfg = strstr(device_id, "MANUFACTURER:")) != NULL)
+    mfg += 13;
+  else if ((mfg = strstr(device_id, "Manufacturer:")) != NULL)
+    mfg += 13;
+  else if ((mfg = strstr(device_id, "MFG:")) != NULL)
+    mfg += 4;
+
+  if ((mdl = strstr(device_id, "MODEL:")) != NULL)
+    mdl += 6;
+  else if ((mdl = strstr(device_id, "Model:")) != NULL)
+    mdl += 6;
+  else if ((mdl = strstr(device_id, "MDL:")) != NULL)
+    mdl += 4;
+
+  if (mdl)
+  {
+   /*
+    * Build a make-model string from the manufacturer and model attributes...
+    */
+
+    if (mfg)
+    {
+      if (!strncasecmp(mfg, "Hewlett-Packard", 15))
+	strlcpy(make_model, "HP", make_model_size);
+      else if (!strncasecmp(mfg, "Lexmark International", 21))
+	strlcpy(make_model, "Lexmark", make_model_size);
+      else
+	strlcpy(make_model, mfg, make_model_size);
+
+      if ((delim = strchr(make_model, ';')) != NULL)
+	*delim = '\0';
+
+      if (!strncasecmp(make_model, mdl, strlen(make_model)))
+      {
+       /*
+	* Just copy model string, since it has the manufacturer...
+	*/
+
+	strlcpy(make_model, mdl, make_model_size);
+      }
+      else
+      {
+       /*
+	* Concatenate the make and model...
+	*/
+
+	strlcat(make_model, " ", make_model_size);
+	strlcat(make_model, mdl, make_model_size);
+      }
+    }
+    else
+    {
+     /*
+      * Just copy model string, since it has the manufacturer...
+      */
+
+      strlcpy(make_model, mdl, make_model_size);
+    }
+  }
+  else if (attr)
+  {
+   /*
+    * Use description...
+    */
+
+    if (!strncasecmp(attr, "Hewlett-Packard hp ", 19))
+    {
+     /*
+      * Check for a common HP bug...
+      */
+
+      strlcpy(make_model, "HP ", make_model_size);
+      strlcpy(make_model + 3, attr + 19, make_model_size - 3);
+    }
+    else if (!strncasecmp(attr, "Hewlett-Packard ", 16))
+    {
+      strlcpy(make_model, "HP ", make_model_size);
+      strlcpy(make_model + 3, attr + 16, make_model_size - 3);
+    }
+    else
+    {
+      strlcpy(make_model, attr, make_model_size);
+    }
+  }
+  else
  {
   /*
    * Use "Unknown" as the printer make and model...
@@ -437,9 +470,31 @@ backendGetMakeModel(
    strlcpy(make_model, "Unknown", make_model_size);
  }

-  cupsFreeOptions(num_values, values);
+ /*
+  * Strip trailing data...
+  */

-  return (0);
+  if ((delim = strchr(make_model, ';')) != NULL)
+    *delim = '\0';
+
+ /*
+  * Strip trailing whitespace...
+  */
+
+  for (delim = make_model + strlen(make_model) - 1; delim >= make_model; delim --)
+    if (isspace(*delim & 255))
+      *delim = '\0';
+    else
+      break;
+
+ /*
+  * Return...
+  */
+
+  if (make_model[0])
+    return (0);
+  else
+    return (-1);
 }


@@ -3,14 +3,23 @@
 *
 *   Line Printer Daemon backend for the Common UNIX Printing System (CUPS).
 *
- *   Copyright 2007-2008 by Apple Inc.
- *   Copyright 1997-2007 by Easy Software Products, all rights reserved.
+ *   Copyright 1997-2006 by Easy Software Products, all rights reserved.
 *
 *   These coded instructions, statements, and computer programs are the
- *   property of Apple Inc. and are protected by Federal copyright
- *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   property of Easy Software Products and are protected by Federal
+ *   copyright law.  Distribution and use rights are outlined in the file
 *   "LICENSE" which should have been included with this file.  If this
- *   file is missing or damaged, see the license at "http://www.cups.org/".
+ *   file is missing or damaged please contact Easy Software Products
+ *   at:
+ *
+ *       Attn: CUPS Licensing Information
+ *       Easy Software Products
+ *       44141 Airport View Drive, Suite 204
+ *       Hollywood, Maryland 20636 USA
+ *
+ *       Voice: (301) 373-9600
+ *       EMail: cups-info@cups.org
+ *         WWW: http://www.cups.org
 *
 *   This file is subject to the Apple OS-Developed Software exception.
 *
@@ -29,11 +38,18 @@
 * Include necessary headers.
 */

+#include <cups/backend.h>
 #include <cups/http-private.h>
-#include "backend-private.h"
+#include <cups/cups.h>
+#include <stdio.h>
+#include <stdlib.h>
 #include <stdarg.h>
+#include <ctype.h>
+#include <cups/string.h>
+#include <errno.h>
 #include <sys/types.h>
 #include <sys/stat.h>
+#include <signal.h>

 #ifdef WIN32
 #  include <winsock.h>
@@ -57,14 +73,6 @@ static char	tmpfilename[1024] = "";	/* Temporary spool file name */
 static int	abort_job = 0;		/* Non-zero if we get SIGTERM */


-/*
- * Print mode...
- */
-
-#define MODE_STANDARD		0	/* Queue a copy */
-#define MODE_STREAM		1	/* Stream a copy */
-
-
 /*
 * The order for control and data files in LPD requests...
 */
@@ -88,9 +96,9 @@ static int	abort_job = 0;		/* Non-zero if we get SIGTERM */

 static int	lpd_command(int lpd_fd, int timeout, char *format, ...);
 static int	lpd_queue(const char *hostname, int port, const char *printer,
-		          int print_fd, int mode, const char *user,
-			  const char *title, int copies, int banner,
-			  int format, int order, int reserve,
+		          const char *filename,
+		          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);
 static int	lpd_write(int lpd_fd, char *buffer, int length);
@@ -112,32 +120,29 @@ int					/* O - Exit status */
 main(int  argc,				/* I - Number of command-line arguments (6 or 7) */
     char *argv[])			/* I - Command-line arguments */
 {
-  const char	*device_uri;		/* Device URI */
-  char		method[255],		/* Method in URI */
-		hostname[1024],		/* Hostname */
-		username[255],		/* Username info */
-		resource[1024],		/* Resource info (printer name) */
-		*options,		/* Pointer to options */
-		*name,			/* Name of option */
-		*value,			/* Value of option */
-		sep,			/* Separator character */
-		*filename,		/* File to print */
-		title[256];		/* Title string */
-  int		port;			/* Port number */
-  int		fd;			/* Print file */
-  int		status;			/* Status of LPD job */
-  int		mode;			/* Print mode */
-  int		banner;			/* Print banner page? */
-  int		format;			/* Print format */
-  int		order;			/* Order of control/data files */
-  int		reserve;		/* Reserve priviledged port? */
-  int		sanitize_title;		/* Sanitize title string? */
-  int		manual_copies,		/* Do manual copies? */
-		timeout,		/* Timeout */
-		contimeout,		/* Connection timeout */
-		copies;			/* Number of copies */
+  char			method[255],	/* Method in URI */
+			hostname[1024],	/* Hostname */
+			username[255],	/* Username info */
+			resource[1024],	/* Resource info (printer name) */
+			*options,	/* Pointer to options */
+			name[255],	/* Name of option */
+			value[255],	/* Value of option */
+			*ptr,		/* Pointer into name or value */
+			*filename,	/* File to print */
+			title[256];	/* Title string */
+  int			port;		/* Port number */
+  int			status;		/* Status of LPD job */
+  int			banner;		/* Print banner page? */
+  int			format;		/* Print format */
+  int			order;		/* Order of control/data files */
+  int			reserve;	/* Reserve priviledged port? */
+  int			sanitize_title;	/* Sanitize title string? */
+  int			manual_copies,	/* Do manual copies? */
+			timeout,	/* Timeout */
+			contimeout,	/* Connection timeout */
+			copies;		/* Number of copies */
 #if defined(HAVE_SIGACTION) && !defined(HAVE_SIGSET)
-  struct sigaction action;		/* Actions for POSIX signals */
+  struct sigaction	action;		/* Actions for POSIX signals */
 #endif /* HAVE_SIGACTION && !HAVE_SIGSET */


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

  if (argc == 1)
  {
-    printf("network lpd \"Unknown\" \"%s\"\n",
-           _cupsLangString(cupsLangDefault(), _("LPD/LPR Host or Printer")));
+    puts("network lpd \"Unknown\" \"LPD/LPR Host or Printer\"");
    return (CUPS_BACKEND_OK);
  }
  else if (argc < 6 || argc > 7)
  {
-    _cupsLangPrintf(stderr,
-                    _("Usage: %s job-id user title copies options [file]\n"),
-                    argv[0]);
+    fprintf(stderr, "Usage: %s job-id user title copies options [file]\n",
+            argv[0]);
    return (CUPS_BACKEND_FAILED);
  }

+ /*
+  * If we have 7 arguments, print the file named on the command-line.
+  * Otherwise, copy stdin to a temporary file and print the temporary
+  * file.
+  */
+
+  if (argc == 6)
+  {
+   /*
+    * Copy stdin to a temporary file...
+    */
+
+    int  fd;		/* Temporary file */
+    char buffer[8192];	/* Buffer for copying */
+    int  bytes;		/* Number of bytes read */
+
+
+    if ((fd = cupsTempFd(tmpfilename, sizeof(tmpfilename))) < 0)
+    {
+      perror("ERROR: unable to create temporary file");
+      return (CUPS_BACKEND_FAILED);
+    }
+
+    while ((bytes = fread(buffer, 1, sizeof(buffer), stdin)) > 0)
+      if (write(fd, buffer, bytes) < bytes)
+      {
+        perror("ERROR: unable to write to temporary file");
+	close(fd);
+	unlink(tmpfilename);
+	return (CUPS_BACKEND_FAILED);
+      }
+
+    close(fd);
+    filename = tmpfilename;
+  }
+  else
+    filename = argv[6];
+
 /*
  * Extract the hostname and printer name from the URI...
  */

-  if ((device_uri = cupsBackendDeviceURI(argv)) == NULL)
-    return (CUPS_BACKEND_FAILED);
-
-  httpSeparateURI(HTTP_URI_CODING_ALL, device_uri,
+  httpSeparateURI(HTTP_URI_CODING_ALL, cupsBackendDeviceURI(argv),
                  method, sizeof(method), username, sizeof(username),
 		  hostname, sizeof(hostname), &port,
 		  resource, sizeof(resource));

-  if (!port)
-    port = 515;				/* Default to port 515 */
-
  if (!username[0])
  {
   /*
@@ -214,7 +249,6 @@ main(int  argc,				/* I - Number of command-line arguments (6 or 7) */
  * See if there are any options...
  */

-  mode          = MODE_STANDARD;
  banner        = 0;
  format        = 'l';
  order         = ORDER_CONTROL_DATA;
@@ -224,16 +258,10 @@ main(int  argc,				/* I - Number of command-line arguments (6 or 7) */
  contimeout    = 7 * 24 * 60 * 60;

 #ifdef __APPLE__
- /*
-  * We want to pass utf-8 characters, not re-map them (3071945)
-  */
-
+  /* We want to pass utf-8 characters, not re-map them (3071945) */
  sanitize_title = 0;

- /*
-  * Get the default timeout from a system preference...
-  */
-
+  /* Get the default timeout from a system preference... */
  {
    CFPropertyListRef	pvalue;		/* Preference value */
    SInt32		toval;		/* Timeout value */
@@ -277,30 +305,29 @@ main(int  argc,				/* I - Number of command-line arguments (6 or 7) */
      * Get the name...
      */

-      name = options;
+      for (ptr = name; *options && *options != '=';)
+        if (ptr < (name + sizeof(name) - 1))
+          *ptr++ = *options++;
+      *ptr = '\0';

-      while (*options && *options != '=' && *options != '+' && *options != '&')
-        options ++;
-
-      if ((sep = *options) != '\0')
-        *options++ = '\0';
-
-      if (sep == '=')
+      if (*options == '=')
      {
       /*
        * Get the value...
 	*/

-        value = options;
+        options ++;

-	while (*options && *options != '+' && *options != '&')
+	for (ptr = value; *options && *options != '+' && *options != '&';)
+          if (ptr < (value + sizeof(value) - 1))
+            *ptr++ = *options++;
+	*ptr = '\0';
+
+	if (*options == '+' || *options == '&')
 	  options ++;
-
-        if (*options)
-	  *options++ = '\0';
      }
      else
-        value = (char *)"";
+        value[0] = '\0';

     /*
      * Process the option...
@@ -324,22 +351,7 @@ main(int  argc,				/* I - Number of command-line arguments (6 or 7) */
        if (strchr("cdfglnoprtv", value[0]))
 	  format = value[0];
 	else
-	  _cupsLangPrintf(stderr, _("ERROR: Unknown format character \"%c\"\n"),
-		          value[0]);
-      }
-      else if (!strcasecmp(name, "mode") && value[0])
-      {
-       /*
-        * Set control/data order...
-	*/
-
-        if (!strcasecmp(value, "standard"))
-	  mode = MODE_STANDARD;
-	else if (!strcasecmp(value, "stream"))
-	  mode = MODE_STREAM;
-	else
-	  _cupsLangPrintf(stderr, _("ERROR: Unknown print mode \"%s\"\n"),
-	                  value);
+	  fprintf(stderr, "ERROR: Unknown format character \"%c\"\n", value[0]);
      }
      else if (!strcasecmp(name, "order") && value[0])
      {
@@ -352,8 +364,7 @@ main(int  argc,				/* I - Number of command-line arguments (6 or 7) */
 	else if (!strcasecmp(value, "data,control"))
 	  order = ORDER_DATA_CONTROL;
 	else
-	  _cupsLangPrintf(stderr, _("ERROR: Unknown file order \"%s\"\n"),
-	                  value);
+	  fprintf(stderr, "ERROR: Unknown file order \"%s\"\n", value);
      }
      else if (!strcasecmp(name, "reserve"))
      {
@@ -400,7 +411,7 @@ main(int  argc,				/* I - Number of command-line arguments (6 or 7) */
      else if (!strcasecmp(name, "contimeout"))
      {
       /*
-        * Set the connection timeout...
+        * Set the timeout...
 	*/

 	if (atoi(value) > 0)
@@ -409,62 +420,6 @@ main(int  argc,				/* I - Number of command-line arguments (6 or 7) */
    }
  }

-  if (mode == MODE_STREAM)
-    order = ORDER_CONTROL_DATA;
-
- /*
-  * If we have 7 arguments, print the file named on the command-line.
-  * Otherwise, copy stdin to a temporary file and print the temporary
-  * file.
-  */
-
-  if (argc == 6 && mode == MODE_STANDARD)
-  {
-   /*
-    * Copy stdin to a temporary file...
-    */
-
-    char buffer[8192];	/* Buffer for copying */
-    int  bytes;		/* Number of bytes read */
-
-
-    if ((fd = cupsTempFd(tmpfilename, sizeof(tmpfilename))) < 0)
-    {
-      _cupsLangPrintError(_("ERROR: Unable to create temporary file"));
-      return (CUPS_BACKEND_FAILED);
-    }
-
-    while ((bytes = fread(buffer, 1, sizeof(buffer), stdin)) > 0)
-      if (write(fd, buffer, bytes) < bytes)
-      {
-        _cupsLangPrintError(_("ERROR: Unable to write to temporary file"));
-	close(fd);
-	unlink(tmpfilename);
-	return (CUPS_BACKEND_FAILED);
-      }
-  }
-  else if (argc == 6)
-  {
-   /*
-    * Stream from stdin...
-    */
-
-    filename = NULL;
-    fd       = 0;
-  }
-  else
-  {
-    filename = argv[6];
-    fd       = open(filename, O_RDONLY);
-
-    if (fd == -1)
-    {
-      _cupsLangPrintf(stderr, _("ERROR: Unable to open print file %s: %s\n"),
-                      filename, strerror(errno));
-      return (CUPS_BACKEND_FAILED);
-    }
-  }
-
 /*
  * Sanitize the document title...
  */
@@ -478,8 +433,6 @@ main(int  argc,				/* I - Number of command-line arguments (6 or 7) */
    * the remote end...
    */

-    char *ptr;
-
    for (ptr = title; *ptr; ptr ++)
      if (!isalnum(*ptr & 255) && !isspace(*ptr & 255))
 	*ptr = '_';
@@ -502,7 +455,7 @@ main(int  argc,				/* I - Number of command-line arguments (6 or 7) */
      copies        = atoi(argv[4]);
    }

-    status = lpd_queue(hostname, port, resource + 1, fd, mode,
+    status = lpd_queue(hostname, port, resource + 1, filename,
                       username, title, copies,
 		       banner, format, order, reserve, manual_copies,
 		       timeout, contimeout);
@@ -511,7 +464,7 @@ main(int  argc,				/* I - Number of command-line arguments (6 or 7) */
      fprintf(stderr, "PAGE: 1 %d\n", atoi(argv[4]));
  }
  else
-    status = lpd_queue(hostname, port, resource + 1, fd, mode,
+    status = lpd_queue(hostname, port, resource + 1, filename,
                       username, title, 1,
 		       banner, format, order, reserve, 1,
 		       timeout, contimeout);
@@ -523,9 +476,6 @@ main(int  argc,				/* I - Number of command-line arguments (6 or 7) */
  if (tmpfilename[0])
    unlink(tmpfilename);

-  if (fd)
-    close(fd);
-
 /*
  * Return the queue status...
  */
@@ -575,7 +525,7 @@ lpd_command(int  fd,		/* I - Socket connection to LPD host */

  if (lpd_write(fd, buf, bytes) < bytes)
  {
-    _cupsLangPrintError(_("ERROR: Unable to send LPD command"));
+    perror("ERROR: Unable to send LPD command");
    return (-1);
  }

@@ -583,15 +533,14 @@ lpd_command(int  fd,		/* I - Socket connection to LPD host */
  * Read back the status from the command and return it...
  */

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

  alarm(timeout);

  if (recv(fd, &status, 1, 0) < 1)
  {
-    _cupsLangPrintf(stderr,
-		    _("WARNING: Remote host did not respond with command "
-		      "status byte after %d seconds!\n"), timeout);
+    fprintf(stderr, "WARNING: Remote host did not respond with command "
+	            "status byte after %d seconds!\n", timeout);
    status = errno;
  }

@@ -611,8 +560,7 @@ static int				/* O - Zero on success, non-zero on failure */
 lpd_queue(const char *hostname,		/* I - Host to connect to */
          int        port,		/* I - Port to connect on */
          const char *printer,		/* I - Printer/queue name */
-	  int        print_fd,		/* I - File to print */
-	  int        mode,		/* I - Print mode */
+	  const char *filename,		/* I - File to print */
          const char *user,		/* I - Requesting user */
 	  const char *title,		/* I - Job title */
 	  int        copies,		/* I - Number of copies */
@@ -624,6 +572,7 @@ lpd_queue(const char *hostname,		/* I - Host to connect to */
 	  int        timeout,		/* I - Timeout... */
 	  int        contimeout)	/* I - Connection timeout */
 {
+  FILE			*fp;		/* Job file */
  char			localhost[255];	/* Local host name */
  int			error;		/* Error number */
  struct stat		filestats;	/* File statistics */
@@ -633,15 +582,13 @@ lpd_queue(const char *hostname,		/* I - Host to connect to */
 			*cptr;		/* Pointer into control file string */
  char			status;		/* Status byte from command */
  char			portname[255];	/* Port name */
-  int			delay;		/* Delay for retries... */
-  char			addrname[256];	/* Address name */
  http_addrlist_t	*addrlist,	/* Address list */
 			*addr;		/* Socket address */
-  int			snmp_fd,	/* SNMP socket */
-			have_supplies;	/* Printer supports supply levels? */
  int			copy;		/* Copies written */
  time_t		start_time;	/* Time of first connect */
+#ifdef __APPLE__
  int			recoverable;	/* Recoverable error shown? */
+#endif /* __APPLE__ */
  size_t		nbytes;		/* Number of bytes written */
  off_t			tbytes;		/* Total bytes written */
  char			buffer[32768];	/* Output buffer */
@@ -674,16 +621,18 @@ lpd_queue(const char *hostname,		/* I - Host to connect to */

  if ((addrlist = httpAddrGetList(hostname, AF_UNSPEC, portname)) == NULL)
  {
-    _cupsLangPrintf(stderr, _("ERROR: Unable to locate printer \'%s\'!\n"),
-                    hostname);
+    fprintf(stderr, "ERROR: Unable to locate printer \'%s\'!\n",
+            hostname);
    return (CUPS_BACKEND_STOP);
  }

 /*
-  * Remember when we started trying to connect to the printer...
+  * Remember when we starting trying to connect to the printer...
  */

+#ifdef __APPLE__
  recoverable = 0;
+#endif /* __APPLE__ */
  start_time  = time(NULL);

 /*
@@ -697,12 +646,10 @@ lpd_queue(const char *hostname,		/* I - Host to connect to */
    */

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

-    for (lport = reserve == RESERVE_RFC1179 ? 732 : 1024, addr = addrlist,
-             delay = 5;;
+    for (lport = reserve == RESERVE_RFC1179 ? 732 : 1024, addr = addrlist;;
         addr = addr->next)
    {
     /*
@@ -742,7 +689,7 @@ lpd_queue(const char *hostname,		/* I - Host to connect to */

 	if ((fd = socket(addr->addr.addr.sa_family, SOCK_STREAM, 0)) < 0)
 	{
-          _cupsLangPrintError(_("ERROR: Unable to create socket"));
+          perror("ERROR: Unable to create socket");
 	  sleep(1);

          continue;
@@ -759,7 +706,7 @@ lpd_queue(const char *hostname,		/* I - Host to connect to */

 	if ((fd = rresvport_af(&lport, addr->addr.addr.sa_family)) < 0)
 	{
-	  _cupsLangPrintError(_("ERROR: Unable to reserve port"));
+	  perror("ERROR: Unable to reserve port");
 	  sleep(1);

 	  continue;
@@ -798,9 +745,8 @@ lpd_queue(const char *hostname,		/* I - Host to connect to */
 	* available printer in the class.
 	*/

-        _cupsLangPuts(stderr,
-	              _("INFO: Unable to contact printer, queuing on next "
-			"printer in class...\n"));
+        fprintf(stderr, "INFO: Unable to connect to %s, queuing on next printer in class...\n",
+		hostname);

        httpAddrFreeList(addrlist);

@@ -818,20 +764,23 @@ lpd_queue(const char *hostname,		/* I - Host to connect to */
      {
        if (contimeout && (time(NULL) - start_time) > contimeout)
 	{
-	  _cupsLangPuts(stderr, _("ERROR: Printer not responding!\n"));
+	  fputs("ERROR: Printer not responding!\n", stderr);
 	  return (CUPS_BACKEND_FAILED);
 	}

+#ifdef __APPLE__
        recoverable = 1;
-
-	_cupsLangPrintf(stderr,
-			_("WARNING: recoverable: Network host \'%s\' is busy; "
-			  "will retry in %d seconds...\n"), hostname, delay);
-
-	sleep(delay);
-
-	if (delay < 30)
-	  delay += 5;
+	fprintf(stderr, "WARNING: recoverable: "
+	                "Network host \'%s\' is busy, down, or "
+	                "unreachable; will retry in 30 seconds...\n",
+                hostname);
+#else
+	fprintf(stderr, "WARNING: "
+	                "Network host \'%s\' is busy, down, or "
+	                "unreachable; will retry in 30 seconds...\n",
+                hostname);
+#endif /* __APPLE__ */
+	sleep(30);
      }
      else if (error == EADDRINUSE)
      {
@@ -843,16 +792,19 @@ lpd_queue(const char *hostname,		/* I - Host to connect to */
      }
      else
      {
+#ifdef __APPLE__
        recoverable = 1;
-
-        fprintf(stderr, "DEBUG: Connection error: %s\n", strerror(errno));
-	_cupsLangPuts(stderr,
-	              _("ERROR: recoverable: Unable to connect to printer; "
-		        "will retry in 30 seconds...\n"));
-	sleep(30);
+	perror("ERROR: recoverable: "
+	       "Unable to connect to printer; will retry in 30 seconds...");
+#else
+	perror("ERROR: "
+	       "Unable to connect to printer; will retry in 30 seconds...");
+#endif /* __APPLE__ */
+        sleep(30);
      }
    }

+#ifdef __APPLE__
    if (recoverable)
    {
     /*
@@ -864,70 +816,35 @@ lpd_queue(const char *hostname,		/* I - Host to connect to */
      fputs("INFO: recovered: \n", stderr);
      sleep(5);
    }
+#endif /* __APPLE__ */

    fputs("STATE: -connecting-to-device\n", stderr);
-    _cupsLangPuts(stderr, _("INFO: Connected to printer...\n"));
-
-#ifdef AF_INET6
-    if (addr->addr.addr.sa_family == AF_INET6)
-      fprintf(stderr, "DEBUG: Connected to [%s]:%d (IPv6) (local port %d)...\n", 
-	      httpAddrString(&addr->addr, addrname, sizeof(addrname)),
-	      ntohs(addr->addr.ipv6.sin6_port), lport);
-    else
-#endif /* AF_INET6 */
-      if (addr->addr.addr.sa_family == AF_INET)
-	fprintf(stderr, "DEBUG: Connected to %s:%d (IPv4) (local port %d)...\n",
-		httpAddrString(&addr->addr, addrname, sizeof(addrname)),
-		ntohs(addr->addr.ipv4.sin_port), lport);
-
-   /*
-    * See if the printer supports SNMP...
-    */
-
-    if ((snmp_fd = _cupsSNMPOpen(addr->addr.addr.sa_family)) >= 0)
-      have_supplies = !backendSNMPSupplies(snmp_fd, &(addr->addr), NULL, NULL);
-    else
-      have_supplies = 0;
-
-   /*
-    * Check for side-channel requests...
-    */
-
-    backendCheckSideChannel(snmp_fd, &(addr->addr));
+    fprintf(stderr, "INFO: Connected to %s...\n", hostname);
+    fprintf(stderr, "DEBUG: Connected on ports %d (local %d)...\n", port,
+            lport);

   /*
    * Next, open the print file and figure out its size...
    */

-    if (print_fd)
+    if (stat(filename, &filestats))
    {
-     /*
-      * Use the size from the print file...
-      */
+      httpAddrFreeList(addrlist);
+      close(fd);

-      if (fstat(print_fd, &filestats))
-      {
-	httpAddrFreeList(addrlist);
-	close(fd);
-
-	_cupsLangPrintError(_("ERROR: unable to stat print file"));
-	return (CUPS_BACKEND_FAILED);
-      }
-
-      filestats.st_size *= manual_copies;
+      perror("ERROR: unable to stat print file");
+      return (CUPS_BACKEND_FAILED);
    }
-    else
-    {
-     /*
-      * Use a "very large value" for the size so that the printer will
-      * keep printing until we close the connection...
-      */

-#ifdef _LARGEFILE_SOURCE
-      filestats.st_size = (size_t)(999999999999.0);
-#else
-      filestats.st_size = 2147483647;
-#endif /* _LARGEFILE_SOURCE */
+    filestats.st_size *= manual_copies;
+
+    if ((fp = fopen(filename, "rb")) == NULL)
+    {
+      httpAddrFreeList(addrlist);
+      close(fd);
+
+      perror("ERROR: unable to open print file for reading");
+      return (CUPS_BACKEND_FAILED);
    }

   /*
@@ -978,16 +895,6 @@ lpd_queue(const char *hostname,		/* I - Host to connect to */

    if (order == ORDER_CONTROL_DATA)
    {
-     /*
-      * Check for side-channel requests...
-      */
-
-      backendCheckSideChannel(snmp_fd, &(addr->addr));
-
-     /*
-      * Send the control file...
-      */
-
      if (lpd_command(fd, timeout, "\002%d cfA%03.3d%.15s\n", strlen(control),
                      (int)getpid() % 1000, localhost))
      {
@@ -997,13 +904,13 @@ lpd_queue(const char *hostname,		/* I - Host to connect to */
        return (CUPS_BACKEND_FAILED);
      }

-      _cupsLangPrintf(stderr, _("INFO: Sending control file (%u bytes)\n"),
-		      (unsigned)strlen(control));
+      fprintf(stderr, "INFO: Sending control file (%u bytes)\n",
+              (unsigned)strlen(control));

      if (lpd_write(fd, control, strlen(control) + 1) < (strlen(control) + 1))
      {
 	status = errno;
-	_cupsLangPrintError(_("ERROR: Unable to write control file"));
+	perror("ERROR: Unable to write control file");
      }
      else
      {
@@ -1011,9 +918,8 @@ lpd_queue(const char *hostname,		/* I - Host to connect to */

        if (read(fd, &status, 1) < 1)
 	{
-	  _cupsLangPrintf(stderr,
-			  _("WARNING: Remote host did not respond with control "
-			    "status byte after %d seconds!\n"), timeout);
+	  fprintf(stderr, "WARNING: Remote host did not respond with control "
+	                  "status byte after %d seconds!\n", timeout);
 	  status = errno;
 	}

@@ -1021,23 +927,16 @@ lpd_queue(const char *hostname,		/* I - Host to connect to */
      }

      if (status != 0)
-	_cupsLangPrintf(stderr,
-			_("ERROR: Remote host did not accept control file "
-			  "(%d)\n"), status);
+	fprintf(stderr, "ERROR: Remote host did not accept control file (%d)\n",
+        	status);
      else
-	_cupsLangPuts(stderr, _("INFO: Control file sent successfully\n"));
+	fputs("INFO: Control file sent successfully\n", stderr);
    }
    else
      status = 0;

    if (status == 0)
    {
-     /*
-      * Check for side-channel requests...
-      */
-
-      backendCheckSideChannel(snmp_fd, &(addr->addr));
-
     /*
      * Send the print file...
      */
@@ -1052,28 +951,22 @@ lpd_queue(const char *hostname,		/* I - Host to connect to */
        return (CUPS_BACKEND_FAILED);
      }

-      _cupsLangPrintf(stderr,
-#ifdef HAVE_LONG_LONG
-		      _("INFO: Sending data file (%lld bytes)\n"),
-#else
-		      _("INFO: Sending data file (%ld bytes)\n"),
-#endif /* HAVE_LONG_LONG */
-		      CUPS_LLCAST filestats.st_size);
+      fprintf(stderr, "INFO: Sending data file (" CUPS_LLFMT " bytes)\n",
+              CUPS_LLCAST filestats.st_size);

      tbytes = 0;
      for (copy = 0; copy < manual_copies; copy ++)
      {
-	lseek(print_fd, 0, SEEK_SET);
+	rewind(fp);

-	while ((nbytes = read(print_fd, buffer, sizeof(buffer))) > 0)
+	while ((nbytes = fread(buffer, 1, sizeof(buffer), fp)) > 0)
 	{
-	  _cupsLangPrintf(stderr,
-	                  _("INFO: Spooling LPR job, %.0f%% complete...\n"),
-			  100.0 * tbytes / filestats.st_size);
+	  fprintf(stderr, "INFO: Spooling LPR job, %.0f%% complete...\n",
+        	  100.0 * tbytes / filestats.st_size);

 	  if (lpd_write(fd, buffer, nbytes) < nbytes)
 	  {
-            _cupsLangPrintError(_("ERROR: Unable to send print file to printer"));
+            perror("ERROR: Unable to send print file to printer");
            break;
 	  }
 	  else
@@ -1081,60 +974,43 @@ lpd_queue(const char *hostname,		/* I - Host to connect to */
 	}
      }

-      if (mode == MODE_STANDARD)
+      if (tbytes < filestats.st_size)
+	status = errno;
+      else if (lpd_write(fd, "", 1) < 1)
      {
-	if (tbytes < filestats.st_size)
-	  status = errno;
-	else if (lpd_write(fd, "", 1) < 1)
-	{
-          _cupsLangPrintError(_("ERROR: Unable to send trailing nul to printer"));
-	  status = errno;
-	}
-	else
-	{
-	 /*
-          * Read the status byte from the printer; if we can't read the byte
-	  * back now, we should set status to "errno", however at this point
-	  * we know the printer got the whole file and we don't necessarily
-	  * want to requeue it over and over...
-	  */
-
-	  alarm(timeout);
-
-          if (recv(fd, &status, 1, 0) < 1)
-	  {
-	    _cupsLangPrintf(stderr,
-			    _("WARNING: Remote host did not respond with data "
-			      "status byte after %d seconds!\n"), timeout);
-	    status = 0;
-          }
-
-	  alarm(0);
-	}
+        perror("ERROR: Unable to send trailing nul to printer");
+	status = errno;
      }
      else
-        status = 0;
+      {
+       /*
+        * Read the status byte from the printer; if we can't read the byte
+	* back now, we should set status to "errno", however at this point
+	* we know the printer got the whole file and we don't necessarily
+	* want to requeue it over and over...
+	*/
+
+	alarm(timeout);
+
+        if (recv(fd, &status, 1, 0) < 1)
+	{
+	  fprintf(stderr, "WARNING: Remote host did not respond with data "
+	                  "status byte after %d seconds!\n", timeout);
+	  status = 0;
+        }
+
+	alarm(0);
+      }

      if (status != 0)
-	_cupsLangPrintf(stderr,
-	                _("ERROR: Remote host did not accept data file (%d)\n"),
-			status);
+	fprintf(stderr, "ERROR: Remote host did not accept data file (%d)\n",
+        	status);
      else
-	_cupsLangPuts(stderr, _("INFO: Data file sent successfully\n"));
+	fputs("INFO: Data file sent successfully\n", stderr);
    }

    if (status == 0 && order == ORDER_DATA_CONTROL)
    {
-     /*
-      * Check for side-channel requests...
-      */
-
-      backendCheckSideChannel(snmp_fd, &(addr->addr));
-
-     /*
-      * Send control file...
-      */
-
      if (lpd_command(fd, timeout, "\002%d cfA%03.3d%.15s\n", strlen(control),
                      (int)getpid() % 1000, localhost))
      {
@@ -1144,13 +1020,13 @@ lpd_queue(const char *hostname,		/* I - Host to connect to */
        return (CUPS_BACKEND_FAILED);
      }

-      _cupsLangPrintf(stderr, _("INFO: Sending control file (%lu bytes)\n"),
-		      (unsigned long)strlen(control));
+      fprintf(stderr, "INFO: Sending control file (%lu bytes)\n",
+              (unsigned long)strlen(control));

      if (lpd_write(fd, control, strlen(control) + 1) < (strlen(control) + 1))
      {
 	status = errno;
-	_cupsLangPrintError(_("ERROR: Unable to write control file"));
+	perror("ERROR: Unable to write control file");
      }
      else
      {
@@ -1158,9 +1034,8 @@ lpd_queue(const char *hostname,		/* I - Host to connect to */

        if (read(fd, &status, 1) < 1)
 	{
-	  _cupsLangPrintf(stderr,
-			  _("WARNING: Remote host did not respond with control "
-			    "status byte after %d seconds!\n"), timeout);
+	  fprintf(stderr, "WARNING: Remote host did not respond with control "
+	                  "status byte after %d seconds!\n", timeout);
 	  status = errno;
 	}

@@ -1168,25 +1043,18 @@ lpd_queue(const char *hostname,		/* I - Host to connect to */
      }

      if (status != 0)
-	_cupsLangPrintf(stderr,
-			_("ERROR: Remote host did not accept control file "
-			  "(%d)\n"), status);
+	fprintf(stderr, "ERROR: Remote host did not accept control file (%d)\n",
+        	status);
      else
-	_cupsLangPuts(stderr, _("INFO: Control file sent successfully\n"));
+	fputs("INFO: Control file sent successfully\n", stderr);
    }

-   /*
-    * Collect the final supply levels as needed...
-    */
-
-    if (have_supplies)
-      backendSNMPSupplies(snmp_fd, &(addr->addr), NULL, NULL);
-
   /*
    * Close the socket connection and input file...
    */

    close(fd);
+    fclose(fp);

    if (status == 0)
    {
@@ -1,277 +0,0 @@
-/*
- * "$Id$"
- *
- *   Common network APIs for the Common UNIX Printing System (CUPS).
- *
- *   Copyright 2007-2008 by Apple Inc.
- *   Copyright 2006-2007 by Easy Software Products, all rights reserved.
- *
- *   These coded instructions, statements, and computer programs are the
- *   property of Apple Inc. and are protected by Federal copyright
- *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
- *   "LICENSE" which should have been included with this file.  If this
- *   file is missing or damaged, see the license at "http://www.cups.org/".
- *
- *   This file is subject to the Apple OS-Developed Software exception.
- *
- * Contents:
- *
- *   backendCheckSideChannel() - Check the side-channel for pending requests.
- *   backendNetworkSideCB()    - Handle common network side-channel commands.
- */
-
-/*
- * Include necessary headers.
- */
-
-#include "backend-private.h"
-#include <limits.h>
-#ifdef __hpux
-#  include <sys/time.h>
-#else
-#  include <sys/select.h>
-#endif /* __hpux */
-
-
-/*
- * 'backendCheckSideChannel()' - Check the side-channel for pending requests.
- */
-
-
-void
-backendCheckSideChannel(
-    int         snmp_fd,		/* I - SNMP socket */
-    http_addr_t *addr)			/* I - Address of device */
-{
-  fd_set	input;			/* Select input set */
-  struct timeval timeout;		/* Select timeout */
-
-
-  FD_ZERO(&input);
-  FD_SET(CUPS_SC_FD, &input);
-
-  timeout.tv_sec = timeout.tv_usec = 0;
-
-  if (select(CUPS_SC_FD + 1, &input, NULL, NULL, &timeout) > 0)
-    backendNetworkSideCB(-1, -1, snmp_fd, addr, 0);
-}
-
-
-/*
- * 'backendNetworkSideCB()' - Handle common network side-channel commands.
- */
-
-void
-backendNetworkSideCB(
-    int         print_fd,		/* I - Print file or -1 */
-    int         device_fd,		/* I - Device file or -1 */
-    int         snmp_fd,		/* I - SNMP socket */
-    http_addr_t *addr,			/* I - Address of device */
-    int         use_bc)			/* I - Use back-channel data? */
-{
-  cups_sc_command_t	command;	/* Request command */
-  cups_sc_status_t	status;		/* Request/response status */
-  char			data[2048];	/* Request/response data */
-  int			datalen;	/* Request/response data size */
-  const char		*device_id;	/* 1284DEVICEID env var */
-
-
-  datalen = sizeof(data);
-
-  if (cupsSideChannelRead(&command, &status, data, &datalen, 1.0))
-  {
-    _cupsLangPuts(stderr, _("WARNING: Failed to read side-channel request!\n"));
-    return;
-  }
-
-  switch (command)
-  {
-    case CUPS_SC_CMD_DRAIN_OUTPUT :
-       /*
-        * Our sockets disable the Nagle algorithm and data is sent immediately.
-	*/
-
-        if (device_fd < 0)
-	  status = CUPS_SC_STATUS_NOT_IMPLEMENTED;
-	else if (backendDrainOutput(print_fd, device_fd))
-	  status = CUPS_SC_STATUS_IO_ERROR;
-	else 
-          status = CUPS_SC_STATUS_OK;
-
-	datalen = 0;
-        break;
-
-    case CUPS_SC_CMD_GET_BIDI :
-	status  = CUPS_SC_STATUS_OK;
-        data[0] = use_bc;
-        datalen = 1;
-        break;
-
-    case CUPS_SC_CMD_SNMP_GET :
-    case CUPS_SC_CMD_SNMP_GET_NEXT :
-        fprintf(stderr, "DEBUG: CUPS_SC_CMD_SNMP_%s: %d (%s)\n",
-	        command == CUPS_SC_CMD_SNMP_GET ? "GET" : "GET_NEXT", datalen,
-		data);
-
-        if (datalen < 2)
-	{
-	  status  = CUPS_SC_STATUS_BAD_MESSAGE;
-	  datalen = 0;
-	  break;
-	}
-
-        if (snmp_fd >= 0)
-	{
-	  cups_snmp_t	packet;		/* Packet from printer */
-
-
-          if (!_cupsSNMPStringToOID(data, packet.object_name, CUPS_SNMP_MAX_OID))
-	  {
-	    status  = CUPS_SC_STATUS_BAD_MESSAGE;
-	    datalen = 0;
-	    break;
-	  }
-
-          status  = CUPS_SC_STATUS_IO_ERROR;
-	  datalen = 0;
-
-          if (_cupsSNMPWrite(snmp_fd, addr, CUPS_SNMP_VERSION_1,
-	                     _cupsSNMPDefaultCommunity(),
-	                     command == CUPS_SC_CMD_SNMP_GET ?
-			         CUPS_ASN1_GET_REQUEST :
-				 CUPS_ASN1_GET_NEXT_REQUEST, 1,
-			     packet.object_name))
-          {
-	    if (_cupsSNMPRead(snmp_fd, &packet, 1.0))
-	    {
-	      char	*dataptr;	/* Pointer into data */
-	      int	i;		/* Looping var */
-
-
-              if (!_cupsSNMPOIDToString(packet.object_name, data, sizeof(data)))
-	      {
-	        fputs("DEBUG: Bad OID returned!\n", stderr);
-	        break;
-	      }
-
-	      datalen = (int)strlen(data) + 1;
-              dataptr = data + datalen;
-
-	      switch (packet.object_type)
-	      {
-	        case CUPS_ASN1_BOOLEAN :
-		    snprintf(dataptr, sizeof(data) - (dataptr - data), "%d",
-		             packet.object_value.boolean);
-		    break;
-
-	        case CUPS_ASN1_INTEGER :
-		    snprintf(dataptr, sizeof(data) - (dataptr - data), "%d",
-		             packet.object_value.integer);
-		    break;
-
-	        case CUPS_ASN1_BIT_STRING :
-	        case CUPS_ASN1_OCTET_STRING :
-		    strlcpy(dataptr, packet.object_value.string,
-		            sizeof(data) - (dataptr - data));
-		    break;
-
-	        case CUPS_ASN1_OID :
-		    _cupsSNMPOIDToString(packet.object_value.oid, dataptr,
-		                         sizeof(data) - (dataptr - data));
-		    break;
-
-                case CUPS_ASN1_HEX_STRING :
-		    for (i = 0;
-		         i < packet.object_value.hex_string.num_bytes &&
-			     dataptr < (data + sizeof(data) - 3);
-			 i ++, dataptr += 2)
-		      sprintf(dataptr, "%02X",
-		              packet.object_value.hex_string.bytes[i]);
-		    break;
-
-                case CUPS_ASN1_COUNTER :
-		    snprintf(dataptr, sizeof(data) - (dataptr - data), "%d",
-		             packet.object_value.counter);
-		    break;
-
-                case CUPS_ASN1_GAUGE :
-		    snprintf(dataptr, sizeof(data) - (dataptr - data), "%u",
-		             packet.object_value.gauge);
-		    break;
-
-                case CUPS_ASN1_TIMETICKS :
-		    snprintf(dataptr, sizeof(data) - (dataptr - data), "%u",
-		             packet.object_value.timeticks);
-		    break;
-
-                default :
-	            fprintf(stderr, "DEBUG: Unknown OID value type %02X!\n",
-		            packet.object_type);
-		    break;
-              }
-
-	      fprintf(stderr, "DEBUG: Returning %s %s\n", data, data + datalen);
-
-	      status  = CUPS_SC_STATUS_OK;
-	      datalen += (int)strlen(data + datalen);
-	    }
-	    else
-	      fputs("DEBUG: SNMP read error...\n", stderr);
-	  }
-	  else
-	    fputs("DEBUG: SNMP write error...\n", stderr);
-	  break;
-        }
-
-        status  = CUPS_SC_STATUS_NOT_IMPLEMENTED;
-	datalen = 0;
-	break;
-
-    case CUPS_SC_CMD_GET_DEVICE_ID :
-        if (snmp_fd >= 0)
-	{
-	  cups_snmp_t	packet;		/* Packet from printer */
-	  static const int ppmPrinterIEEE1284DeviceId[] =
-	  		{ CUPS_OID_ppmPrinterIEEE1284DeviceId,1,-1 };
-
-
-          status  = CUPS_SC_STATUS_IO_ERROR;
-	  datalen = 0;
-
-          if (_cupsSNMPWrite(snmp_fd, addr, CUPS_SNMP_VERSION_1,
-	                     _cupsSNMPDefaultCommunity(),
-	                     CUPS_ASN1_GET_REQUEST, 1,
-			     ppmPrinterIEEE1284DeviceId))
-          {
-	    if (_cupsSNMPRead(snmp_fd, &packet, 1.0) &&
-	        packet.object_type == CUPS_ASN1_OCTET_STRING)
-	    {
-	      strlcpy(data, packet.object_value.string, sizeof(data));
-	      datalen = (int)strlen(data);
-	      status  = CUPS_SC_STATUS_OK;
-	    }
-	  }
-
-	  break;
-        }
-
-	if ((device_id = getenv("1284DEVICEID")) != NULL)
-	{
-	  strlcpy(data, device_id, sizeof(data));
-	  datalen = (int)strlen(data);
-	  break;
-	}
-
-    default :
-        status  = CUPS_SC_STATUS_NOT_IMPLEMENTED;
-	datalen = 0;
-	break;
-  }
-
-  cupsSideChannelWrite(command, status, data, datalen, 1.0);
-}
-
-
-/*
- * End of "$Id$".
- */
@@ -3,14 +3,23 @@
 *
 *   Parallel port backend for the Common UNIX Printing System (CUPS).
 *
- *   Copyright 2007-2008 by Apple Inc.
- *   Copyright 1997-2007 by Easy Software Products, all rights reserved.
+ *   Copyright 1997-2006 by Easy Software Products, all rights reserved.
 *
 *   These coded instructions, statements, and computer programs are the
- *   property of Apple Inc. and are protected by Federal copyright
- *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   property of Easy Software Products and are protected by Federal
+ *   copyright law.  Distribution and use rights are outlined in the file
 *   "LICENSE" which should have been included with this file.  If this
- *   file is missing or damaged, see the license at "http://www.cups.org/".
+ *   file is missing or damaged please contact Easy Software Products
+ *   at:
+ *
+ *       Attn: CUPS Licensing Information
+ *       Easy Software Products
+ *       44141 Airport View Drive, Suite 204
+ *       Hollywood, Maryland 20636 USA
+ *
+ *       Voice: (301) 373-9600
+ *       EMail: cups-info@cups.org
+ *         WWW: http://www.cups.org
 *
 *   This file is subject to the Apple OS-Developed Software exception.
 *
@@ -18,7 +27,6 @@
 *
 *   main()         - Send a file to the specified parallel port.
 *   list_devices() - List all parallel devices.
- *   side_cb()      - Handle side-channel requests...
 */

 /*
@@ -58,9 +66,7 @@
 * Local functions...
 */

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


 /*
@@ -82,8 +88,7 @@ main(int  argc,				/* I - Number of command-line arguments (6 or 7) */
 		*options;		/* Pointer to options */
  int		port;			/* Port number (not used) */
  int		print_fd,		/* Print file */
-		device_fd,		/* Parallel device */
-		use_bc;			/* Read back-channel data? */
+		device_fd;		/* Parallel device */
  int		copies;			/* Number of copies to print */
  size_t	tbytes;			/* Total number of bytes written */
  struct termios opts;			/* Parallel port options */
@@ -123,9 +128,7 @@ main(int  argc,				/* I - Number of command-line arguments (6 or 7) */
  }
  else if (argc < 6 || argc > 7)
  {
-    _cupsLangPrintf(stderr,
-		    _("Usage: %s job-id user title copies options [file]\n"),
-		    argv[0]);
+    fputs("Usage: parallel job-id user title copies options [file]\n", stderr);
    return (CUPS_BACKEND_FAILED);
  }

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

    if ((print_fd = open(argv[6], O_RDONLY)) < 0)
    {
-      _cupsLangPrintf(stderr,
-                      _("ERROR: Unable to open print file \"%s\": %s\n"),
-		      argv[6], strerror(errno));
+      perror("ERROR: unable to open print file");
      return (CUPS_BACKEND_FAILED);
    }

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

  do
  {
-#if defined(__linux) || defined(__FreeBSD__)
-   /*
-    * The Linux and FreeBSD parallel port drivers currently are broken WRT
-    * select() and bidirection I/O...
-    */
-
-    device_fd = open(resource, O_WRONLY | O_EXCL);
-    use_bc    = 0;
-
-#else
-    if ((device_fd = open(resource, O_RDWR | O_EXCL)) < 0)
-    {
-      device_fd = open(resource, O_WRONLY | O_EXCL);
-      use_bc    = 0;
-    }
-    else
-      use_bc = 1;
-#endif /* __linux || __FreeBSD__ */
-
-    if (device_fd == -1)
+    if ((device_fd = open(resource, O_WRONLY | O_EXCL)) == -1)
    {
      if (getenv("CLASS") != NULL)
      {
@@ -217,9 +199,8 @@ main(int  argc,				/* I - Number of command-line arguments (6 or 7) */
 	* available printer in the class.
 	*/

-        _cupsLangPuts(stderr,
-	              _("INFO: Unable to contact printer, queuing on next "
-			"printer in class...\n"));
+        fputs("INFO: Unable to open parallel port, queuing on next printer "
+	      "in class...\n", stderr);

       /*
        * Sleep 5 seconds to keep the job from requeuing too rapidly...
@@ -232,22 +213,21 @@ main(int  argc,				/* I - Number of command-line arguments (6 or 7) */

      if (errno == EBUSY)
      {
-        _cupsLangPuts(stderr,
-	              _("INFO: Printer busy; will retry in 30 seconds...\n"));
+        fputs("INFO: Parallel port busy; will retry in 30 seconds...\n",
+	      stderr);
 	sleep(30);
      }
      else if (errno == ENXIO || errno == EIO || errno == ENOENT)
      {
-        _cupsLangPuts(stderr,
-	              _("INFO: Printer not connected; will retry in 30 "
-		        "seconds...\n"));
+        fputs("INFO: Printer not connected; will retry in 30 seconds...\n",
+	      stderr);
 	sleep(30);
      }
      else
      {
-	_cupsLangPrintf(stderr,
-		        _("ERROR: Unable to open device file \"%s\": %s\n"),
-			resource, strerror(errno));
+	fprintf(stderr,
+	        "ERROR: Unable to open parallel port device file \"%s\": %s\n",
+	        resource, strerror(errno));
 	return (CUPS_BACKEND_FAILED);
      }
    }
@@ -284,16 +264,11 @@ main(int  argc,				/* I - Number of command-line arguments (6 or 7) */
      lseek(print_fd, 0, SEEK_SET);
    }

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

    if (print_fd != 0 && tbytes >= 0)
-      _cupsLangPrintf(stderr,
-#ifdef HAVE_LONG_LONG
-		      _("INFO: Sent print file, %lld bytes...\n"),
-#else
-		      _("INFO: Sent print file, %ld bytes...\n"),
-#endif /* HAVE_LONG_LONG */
-		      CUPS_LLCAST tbytes);
+      fprintf(stderr, "INFO: Sent print file, " CUPS_LLFMT " bytes...\n",
+	      CUPS_LLCAST tbytes);
  }

 /*
@@ -313,7 +288,7 @@ main(int  argc,				/* I - Number of command-line arguments (6 or 7) */
 * 'list_devices()' - List all parallel devices.
 */

-static void
+void
 list_devices(void)
 {
 #if defined(__hpux) || defined(__sgi) || defined(__sun)
@@ -327,9 +302,7 @@ list_devices(void)
  char	device[255],		/* Device filename */
 	basedevice[255],	/* Base device filename for ports */
 	device_id[1024],	/* Device ID string */
-	make_model[1024],	/* Make and model */
-	info[1024],		/* Info string */
-	uri[1024];		/* Device URI */
+	make_model[1024];	/* Make and model */


  if (!access("/dev/parallel/", 0))
@@ -355,20 +328,13 @@ list_devices(void)
      * Now grab the IEEE 1284 device ID string...
      */

-      snprintf(uri, sizeof(uri), "parallel:%s", device);
-
      if (!backendGetDeviceID(fd, device_id, sizeof(device_id),
                              make_model, sizeof(make_model),
-			      NULL, uri, sizeof(uri)))
-      {
-        snprintf(info, sizeof(info), "%s LPT #%d", make_model, i + 1);
-	cupsBackendReport("direct", uri, make_model, info, device_id, NULL);
-      }
+			      NULL, NULL, 0))
+	printf("direct parallel:%s \"%s\" \"%s LPT #%d\" \"%s\"\n", device,
+	       make_model, make_model, i + 1, device_id);
      else
-      {
-        snprintf(info, sizeof(info), "LPT #%d", i + 1);
-	cupsBackendReport("direct", uri, NULL, info, NULL, NULL);
-      }
+	printf("direct parallel:%s \"Unknown\" \"LPT #%d\"\n", device, i + 1);

      close(fd);
    }
@@ -570,7 +536,7 @@ list_devices(void)
      printf("direct parallel:%s \"Unknown\" \"Parallel Port #%d\"\n", device, i + 1);
    }
  }
-#elif defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__) || defined(__FreeBSD_kernel__)
+#elif defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
  int	i;			/* Looping var */
  int	fd;			/* File descriptor */
  char	device[255];		/* Device filename */
@@ -611,79 +577,6 @@ list_devices(void)
 }


-/*
- * 'side_cb()' - Handle side-channel requests...
- */
-
-static void
-side_cb(int         print_fd,		/* I - Print file */
-        int         device_fd,		/* I - Device file */
-        int         snmp_fd,		/* I - SNMP socket (unused) */
-	http_addr_t *addr,		/* I - Device address (unused) */
-	int         use_bc)		/* I - Using back-channel? */
-{
-  cups_sc_command_t	command;	/* Request command */
-  cups_sc_status_t	status;		/* Request/response status */
-  char			data[2048];	/* Request/response data */
-  int			datalen;	/* Request/response data size */
-
-
-  (void)snmp_fd;
-  (void)addr;
-
-  datalen = sizeof(data);
-
-  if (cupsSideChannelRead(&command, &status, data, &datalen, 1.0))
-  {
-    _cupsLangPuts(stderr, _("WARNING: Failed to read side-channel request!\n"));
-    return;
-  }
-
-  switch (command)
-  {
-    case CUPS_SC_CMD_DRAIN_OUTPUT :
-        if (backendDrainOutput(print_fd, device_fd))
-	  status = CUPS_SC_STATUS_IO_ERROR;
-	else if (tcdrain(device_fd))
-	  status = CUPS_SC_STATUS_IO_ERROR;
-	else
-	  status = CUPS_SC_STATUS_OK;
-
-	datalen = 0;
-        break;
-
-    case CUPS_SC_CMD_GET_BIDI :
-	status  = CUPS_SC_STATUS_OK;
-        data[0] = use_bc;
-        datalen = 1;
-        break;
-
-    case CUPS_SC_CMD_GET_DEVICE_ID :
-        memset(data, 0, sizeof(data));
-
-        if (backendGetDeviceID(device_fd, data, sizeof(data) - 1,
-	                       NULL, 0, NULL, NULL, 0))
-        {
-	  status  = CUPS_SC_STATUS_NOT_IMPLEMENTED;
-	  datalen = 0;
-	}
-	else
-        {
-	  status  = CUPS_SC_STATUS_OK;
-	  datalen = strlen(data);
-	}
-        break;
-
-    default :
-        status  = CUPS_SC_STATUS_NOT_IMPLEMENTED;
-	datalen = 0;
-	break;
-  }
-
-  cupsSideChannelWrite(command, status, data, datalen, 1.0);
-}
-
-
 /*
 * End of "$Id$".
 */
@@ -1,23 +1,31 @@
 /*
 * "$Id$"
 *
- *   Common run loop APIs for the Common UNIX Printing System (CUPS).
+ *   Common run loop API for the Common UNIX Printing System (CUPS).
 *
- *   Copyright 2007-2008 by Apple Inc.
- *   Copyright 2006-2007 by Easy Software Products, all rights reserved.
+ *   Copyright 2006 by Easy Software Products, all rights reserved.
 *
 *   These coded instructions, statements, and computer programs are the
- *   property of Apple Inc. and are protected by Federal copyright
- *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   property of Easy Software Products and are protected by Federal
+ *   copyright law.  Distribution and use rights are outlined in the file
 *   "LICENSE" which should have been included with this file.  If this
- *   file is missing or damaged, see the license at "http://www.cups.org/".
+ *   file is missing or damaged please contact Easy Software Products
+ *   at:
+ *
+ *       Attn: CUPS Licensing Information
+ *       Easy Software Products
+ *       44141 Airport View Drive, Suite 204
+ *       Hollywood, Maryland 20636 USA
+ *
+ *       Voice: (301) 373-9600
+ *       EMail: cups-info@cups.org
+ *         WWW: http://www.cups.org
 *
 *   This file is subject to the Apple OS-Developed Software exception.
 *
 * Contents:
 *
- *   backendDrainOutput() - Drain pending print data to the device.
- *   backendRunLoop()     - Read and write print and back-channel data.
+ *   backendRunLoop() - Read and write print and back-channel data.
 */

 /*
@@ -25,7 +33,6 @@
 */

 #include "backend-private.h"
-#include <limits.h>
 #ifdef __hpux
 #  include <sys/time.h>
 #else
@@ -33,122 +40,14 @@
 #endif /* __hpux */


-/*
- * 'backendDrainOutput()' - Drain pending print data to the device.
- */
-
-int					/* O - 0 on success, -1 on error */
-backendDrainOutput(int print_fd,	/* I - Print file descriptor */
-                   int device_fd)	/* I - Device file descriptor */
-{
-  int		nfds;			/* Maximum file descriptor value + 1 */
-  fd_set	input;			/* Input set for reading */
-  ssize_t	print_bytes,		/* Print bytes read */
-		bytes;			/* Bytes written */
-  char		print_buffer[8192],	/* Print data buffer */
-		*print_ptr;		/* Pointer into print data buffer */
-  struct timeval timeout;		/* Timeout for read... */
-
-
-  fprintf(stderr, "DEBUG: backendDrainOutput(print_fd=%d, device_fd=%d)\n",
-          print_fd, device_fd);
-
- /*
-  * Figure out the maximum file descriptor value to use with select()...
-  */
-
-  nfds = (print_fd > device_fd ? print_fd : device_fd) + 1;
-
- /*
-  * Now loop until we are out of data from print_fd...
-  */
-
-  for (;;)
-  {
-   /*
-    * Use select() to determine whether we have data to copy around...
-    */
-
-    FD_ZERO(&input);
-    FD_SET(print_fd, &input);
-
-    timeout.tv_sec  = 0;
-    timeout.tv_usec = 0;
-
-    if (select(nfds, &input, NULL, NULL, &timeout) < 0)
-      return (-1);
-
-    if (!FD_ISSET(print_fd, &input))
-      return (0);
-
-    if ((print_bytes = read(print_fd, print_buffer,
-			    sizeof(print_buffer))) < 0)
-    {
-     /*
-      * Read error - bail if we don't see EAGAIN or EINTR...
-      */
-
-      if (errno != EAGAIN || errno != EINTR)
-      {
-	perror("ERROR: Unable to read print data");
-	return (-1);
-      }
-
-      print_bytes = 0;
-    }
-    else if (print_bytes == 0)
-    {
-     /*
-      * End of file, return...
-      */
-
-      return (0);
-    }
-
-    fprintf(stderr, "DEBUG: Read %d bytes of print data...\n",
-	    (int)print_bytes);
-
-    for (print_ptr = print_buffer; print_bytes > 0;)
-    {
-      if ((bytes = write(device_fd, print_ptr, print_bytes)) < 0)
-      {
-       /*
-        * Write error - bail if we don't see an error we can retry...
-	*/
-
-        if (errno != ENOSPC && errno != ENXIO && errno != EAGAIN &&
-	    errno != EINTR && errno != ENOTTY)
-	{
-	  _cupsLangPrintf(stderr, _("ERROR: Unable to write print data: %s\n"),
-			  strerror(errno));
-	  return (-1);
-	}
-      }
-      else
-      {
-        fprintf(stderr, "DEBUG: Wrote %d bytes of print data...\n", (int)bytes);
-
-        print_bytes -= bytes;
-	print_ptr   += bytes;
-      }
-    }
-  }
-}
-
-
 /*
 * 'backendRunLoop()' - Read and write print and back-channel data.
 */

 ssize_t					/* O - Total bytes on success, -1 on error */
-backendRunLoop(
-    int         print_fd,		/* I - Print file descriptor */
-    int         device_fd,		/* I - Device file descriptor */
-    int         snmp_fd,		/* I - SNMP socket or -1 if none */
-    http_addr_t *addr,			/* I - Address of device */
-    int         use_bc,			/* I - Use back-channel? */
-    void        (*side_cb)(int, int, int, http_addr_t *, int))
-					/* I - Side-channel callback */
+backendRunLoop(int print_fd,		/* I - Print file descriptor */
+               int device_fd,		/* I - Device file descriptor */
+	       int use_bc)		/* I - Use back-channel? */
 {
  int		nfds;			/* Maximum file descriptor value + 1 */
  fd_set	input,			/* Input set for reading */
@@ -162,18 +61,13 @@ backendRunLoop(
  char		print_buffer[8192],	/* Print data buffer */
 		*print_ptr,		/* Pointer into print data buffer */
 		bc_buffer[1024];	/* Back-channel data buffer */
-  struct timeval timeout;		/* Timeout for select() */
-  time_t	curtime,		/* Current time */
-		snmp_update = 0;
 #if defined(HAVE_SIGACTION) && !defined(HAVE_SIGSET)
  struct sigaction action;		/* Actions for POSIX signals */
 #endif /* HAVE_SIGACTION && !HAVE_SIGSET */


-  fprintf(stderr,
-          "DEBUG: backendRunLoop(print_fd=%d, device_fd=%d, snmp_fd=%d, "
-	  "addr=%p, use_bc=%d, side_cb=%p)\n",
-          print_fd, device_fd, snmp_fd, addr, use_bc, side_cb);
+  fprintf(stderr, "DEBUG: backendRunLoop(print_fd=%d, device_fd=%d, use_bc=%d)\n",
+          print_fd, device_fd, use_bc);

 /*
  * If we are printing data from a print driver on stdin, ignore SIGTERM
@@ -207,8 +101,7 @@ backendRunLoop(
  * Now loop until we are out of data from print_fd...
  */

-  for (print_bytes = 0, print_ptr = print_buffer, offline = -1,
-           paperout = -1, total_bytes = 0;;)
+  for (print_bytes = 0, print_ptr = print_buffer, offline = 0, paperout = 0, total_bytes = 0;;)
  {
   /*
    * Use select() to determine whether we have data to copy around...
@@ -219,57 +112,31 @@ backendRunLoop(
      FD_SET(print_fd, &input);
    if (use_bc)
      FD_SET(device_fd, &input);
-    if (!print_bytes && side_cb)
-      FD_SET(CUPS_SC_FD, &input);

    FD_ZERO(&output);
-    if (print_bytes || (!use_bc && !side_cb))
+    if (print_bytes || !use_bc)
      FD_SET(device_fd, &output);

-    if (use_bc || side_cb)
+    if (use_bc)
    {
-      timeout.tv_sec  = 5;
-      timeout.tv_usec = 0;
-
-      if (select(nfds, &input, &output, NULL, &timeout) < 0)
+      if (select(nfds, &input, &output, NULL, NULL) < 0)
      {
       /*
 	* Pause printing to clear any pending errors...
 	*/

-	if (errno == ENXIO && offline != 1)
+	if (errno == ENXIO && !offline)
 	{
-	  fputs("STATE: +offline-report\n", stderr);
-	  _cupsLangPuts(stderr, _("INFO: Printer is currently offline.\n"));
+	  fputs("STATE: +offline-error\n", stderr);
+	  fputs("INFO: Printer is currently off-line.\n", stderr);
 	  offline = 1;
 	}
-	else if (errno == EINTR && total_bytes == 0)
-	{
-	  fputs("DEBUG: Received an interrupt before any bytes were "
-	        "written, aborting!\n", stderr);
-          return (0);
-	}

 	sleep(1);
 	continue;
      }
    }

-   /*
-    * Check if we have a side-channel request ready...
-    */
-
-    if (side_cb && FD_ISSET(CUPS_SC_FD, &input))
-    {
-     /*
-      * Do the side-channel request, then start back over in the select
-      * loop since it may have read from print_fd...
-      */
-
-      (*side_cb)(print_fd, device_fd, snmp_fd, addr, use_bc);
-      continue;
-    }
-
   /*
    * Check if we have back-channel data ready...
    */
@@ -283,12 +150,6 @@ backendRunLoop(
 	        CUPS_LLCAST bc_bytes);
        cupsBackChannelWrite(bc_buffer, bc_bytes, 1.0);
      }
-      else if (bc_bytes < 0 && errno != EAGAIN && errno != EINTR)
-      {
-        fprintf(stderr, "DEBUG: Error reading back-channel data: %s\n",
-	        strerror(errno));
-	use_bc = 0;
-      }
    }

   /*
@@ -342,26 +203,25 @@ backendRunLoop(

        if (errno == ENOSPC)
 	{
-	  if (paperout != 1)
+	  if (!paperout)
 	  {
-	    fputs("STATE: +media-empty-warning\n", stderr);
-	    _cupsLangPuts(stderr, _("ERROR: Out of paper!\n"));
+	    fputs("ERROR: Out of paper!\n", stderr);
+	    fputs("STATUS: +media-tray-empty-error\n", stderr);
 	    paperout = 1;
 	  }
        }
 	else if (errno == ENXIO)
 	{
-	  if (offline != 1)
+	  if (!offline)
 	  {
-	    fputs("STATE: +offline-report\n", stderr);
-	    _cupsLangPuts(stderr, _("INFO: Printer is currently off-line.\n"));
+	    fputs("STATE: +offline-error\n", stderr);
+	    fputs("INFO: Printer is currently off-line.\n", stderr);
 	    offline = 1;
 	  }
 	}
 	else if (errno != EAGAIN && errno != EINTR && errno != ENOTTY)
 	{
-	  fprintf(stderr, _("ERROR: Unable to write print data: %s\n"),
-	          strerror(errno));
+	  perror("ERROR: Unable to write print data");
 	  return (-1);
 	}
      }
@@ -369,14 +229,14 @@ backendRunLoop(
      {
        if (paperout)
 	{
-	  fputs("STATE: -media-empty-warning\n", stderr);
+	  fputs("STATUS: -media-tray-empty-error\n", stderr);
 	  paperout = 0;
 	}

 	if (offline)
 	{
-	  fputs("STATE: -offline-report\n", stderr);
-	  _cupsLangPuts(stderr, _("INFO: Printer is now online.\n"));
+	  fputs("STATE: -offline-error\n", stderr);
+	  fputs("INFO: Printer is now on-line.\n", stderr);
 	  offline = 0;
 	}

@@ -387,18 +247,6 @@ backendRunLoop(
 	total_bytes += bytes;
      }
    }
-
-   /*
-    * Do SNMP updates periodically...
-    */
-
-    if (snmp_fd >= 0 && time(&curtime) >= snmp_update)
-    {
-      if (backendSNMPSupplies(snmp_fd, addr, NULL, NULL))
-        snmp_update = INT_MAX;
-      else
-        snmp_update = curtime + 5;
-    }
  }

 /*
@@ -3,7 +3,6 @@
 *
 *   IRIX SCSI printer support for the Common UNIX Printing System (CUPS).
 *
- *   Copyright 2007 by Apple Inc.
 *   Copyright 2003-2005 by Easy Software Products, all rights reserved.
 *
 *   Redistribution and use in source and binary forms, with or
@@ -66,8 +65,7 @@
 void
 list_devices(void)
 {
-  printf("direct scsi \"Unknown\" \"%s\"\n",
-         _cupsLangString(cupsLangDefault(), _("SCSI Printer")));
+  puts("direct scsi \"Unknown\" \"SCSI Printer\"");
 }


@@ -97,8 +95,7 @@ print_device(const char *resource,	/* I - SCSI device */

  if (strncmp(resource, "/dev/scsi/", 10) != 0)
  {
-    _cupsLangPrintf(stderr, _("ERROR: Bad SCSI device file \"%s\"!\n"),
-                    resource);
+    fprintf(stderr, "ERROR: Bad SCSI device file \"%s\"!\n", resource);
    return (CUPS_BACKEND_STOP);
  }

@@ -121,9 +118,8 @@ print_device(const char *resource,	/* I - SCSI device */
 	* available printer in the class.
 	*/

-        _cupsLangPuts(stderr,
-	              _("INFO: Unable to contact printer, queuing on next "
-			"printer in class...\n"));
+        fputs("INFO: Unable to open SCSI device, queuing on next printer in class...\n",
+	      stderr);

       /*
        * Sleep 5 seconds to keep the job from requeuing too rapidly...
@@ -136,15 +132,14 @@ print_device(const char *resource,	/* I - SCSI device */

      if (errno != EAGAIN && errno != EBUSY)
      {
-	_cupsLangPrintf(stderr,
-	                _("ERROR: Unable to open device file \"%s\": %s\n"),
-			resource, strerror(errno));
+	fprintf(stderr, "ERROR: Unable to open SCSI device \"%s\" - %s\n",
+        	resource, strerror(errno));
 	return (CUPS_BACKEND_FAILED);
      }
      else
      {
-        _cupsLangPuts(stderr,
-	              _("INFO: Printer busy; will retry in 30 seconds...\n"));
+        fprintf(stderr, "INFO: SCSI device \"%s\" busy; retrying...\n",
+	        resource);
        sleep(30);
      }
    }
@@ -206,9 +201,8 @@ print_device(const char *resource,	/* I - SCSI device */
 	if (ioctl(scsi_fd, DS_ENTER, &scsi_req) < 0 ||
            scsi_req.ds_status != 0)
        {
-	  _cupsLangPrintf(stderr,
-			  _("WARNING: SCSI command timed out (%d); "
-			    "retrying...\n"), scsi_req.ds_status);
+	  fprintf(stderr, "WARNING: SCSI command timed out (%d); retrying...\n",
+	          scsi_req.ds_status);
          sleep(try + 1);
 	}
 	else
@@ -216,8 +210,8 @@ print_device(const char *resource,	/* I - SCSI device */

      if (try >= 10)
      {
-	_cupsLangPrintf(stderr, _("ERROR: Unable to send print data (%d)\n"),
-			scsi_req.ds_status);
+	fprintf(stderr, "ERROR: Unable to send print data (%d)\n",
+	        scsi_req.ds_status);
        close(scsi_fd);
 	return (CUPS_BACKEND_FAILED);
      }
@@ -3,7 +3,6 @@
 *
 *   Linux SCSI printer support for the Common UNIX Printing System (CUPS).
 *
- *   Copyright 2007 by Apple Inc.
 *   Copyright 2003-2005 by Easy Software Products, all rights reserved.
 *
 *   Redistribution and use in source and binary forms, with or
@@ -56,7 +55,6 @@
 */

 #include <scsi/sg.h>
-#include <cups/i18n.h>


 /*
@@ -79,8 +77,7 @@ int	print_device(const char *resource, int fd, int copies) { return (1); }
 void
 list_devices(void)
 {
-  printf("direct scsi \"Unknown\" \"%s\"\n",
-         _cupsLangString(cupsLangDefault(), _("SCSI Printer")));
+  puts("direct scsi \"Unknown\" \"SCSI Printer\"");
 }


@@ -111,8 +108,7 @@ print_device(const char *resource,	/* I - SCSI device */

  if (strncmp(resource, "/dev/sg", 7) != 0)
  {
-    _cupsLangPrintf(stderr, _("ERROR: Bad SCSI device file \"%s\"!\n"),
-                    resource);
+    fprintf(stderr, "ERROR: Bad SCSI device file \"%s\"!\n", resource);
    return (CUPS_BACKEND_STOP);
  }

@@ -135,9 +131,8 @@ print_device(const char *resource,	/* I - SCSI device */
 	* available printer in the class.
 	*/

-        _cupsLangPuts(stderr,
-	              _("INFO: Unable to contact printer, queuing on next "
-		        "printer in class...\n"));
+        fputs("INFO: Unable to open SCSI device, queuing on next printer in class...\n",
+	      stderr);

       /*
        * Sleep 5 seconds to keep the job from requeuing too rapidly...
@@ -150,15 +145,14 @@ print_device(const char *resource,	/* I - SCSI device */

      if (errno != EAGAIN && errno != EBUSY)
      {
-	_cupsLangPrintf(stderr,
-	                _("ERROR: Unable to open device file \"%s\": %s\n"),
-			resource, strerror(errno));
+	fprintf(stderr, "ERROR: Unable to open SCSI device \"%s\" - %s\n",
+        	resource, strerror(errno));
 	return (CUPS_BACKEND_FAILED);
      }
      else
      {
-        _cupsLangPuts(stderr,
-	              _("INFO: Printer busy; will retry in 30 seconds...\n"));
+        fprintf(stderr, "INFO: SCSI device \"%s\" busy; retrying...\n",
+	        resource);
        sleep(30);
      }
    }
@@ -224,9 +218,8 @@ print_device(const char *resource,	/* I - SCSI device */
 	if (ioctl(scsi_fd, SG_IO, &scsi_req) < 0 ||
            scsi_req.status != 0)
        {
-	  _cupsLangPrintf(stderr,
-			  _("WARNING: SCSI command timed out (%d); "
-			    "retrying...\n"), scsi_req.status);
+	  fprintf(stderr, "WARNING: SCSI command timed out (%d); retrying...\n",
+	          scsi_req.status);
          sleep(try + 1);
 	}
 	else
@@ -234,8 +227,8 @@ print_device(const char *resource,	/* I - SCSI device */

      if (try >= 10)
      {
-	_cupsLangPrintf(stderr, _("ERROR: Unable to send print data (%d)\n"),
-			scsi_req.status);
+	fprintf(stderr, "ERROR: Unable to send print data (%d)\n",
+	        scsi_req.status);
        close(scsi_fd);
 	return (CUPS_BACKEND_FAILED);
      }
@@ -3,7 +3,6 @@
 *
 *   SCSI printer backend for the Common UNIX Printing System (CUPS).
 *
- *   Copyright 2007 by Apple Inc.
 *   Copyright 2003-2006 by Easy Software Products, all rights reserved.
 *
 *   Redistribution and use in source and binary forms, with or
@@ -56,12 +55,10 @@

 #include <cups/backend.h>
 #include <cups/cups.h>
-#include <cups/i18n.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <errno.h>
 #include <cups/string.h>
-#include <cups/i18n.h>
 #include <signal.h>

 #ifdef WIN32
@@ -83,7 +80,7 @@ void	list_devices(void);
 int	print_device(const char *resource, int fd, int copies);


-#if defined(__linux__) && defined(HAVE_SCSI_SG_H)
+#ifdef __linux__
 #  include "scsi-linux.c"
 #elif defined(__sgi)
 #  include "scsi-irix.c"
@@ -93,7 +90,7 @@ int	print_device(const char *resource, int fd, int copies);
 */
 void	list_devices(void) {}
 int	print_device(const char *resource, int fd, int copies) { return (CUPS_BACKEND_FAILED); }
-#endif /* __linux && HAVE_SCSI_SG_H */
+#endif /* __linux */


 /*
@@ -153,9 +150,7 @@ main(int  argc,		/* I - Number of command-line arguments (6 or 7) */
  }
  else if (argc < 6 || argc > 7)
  {
-    _cupsLangPrintf(stderr,
-                    _("Usage: %s job-id user title copies options [file]\n"),
-		    argv[0]);
+    fputs("Usage: scsi:/dev/file job-id user title copies options [file]\n", stderr);
    return (CUPS_BACKEND_FAILED);
  }

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

    if ((fp = open(argv[6], O_RDONLY)) < 0)
    {
-      _cupsLangPrintf(stderr,
-                      _("ERROR: Unable to open print file \"%s\": %s\n"),
-		      argv[6], strerror(errno));
+      perror("ERROR: unable to open print file");
      return (CUPS_BACKEND_FAILED);
    }

@@ -3,14 +3,23 @@
 *
 *   Serial port backend for the Common UNIX Printing System (CUPS).
 *
- *   Copyright 2007 by Apple Inc.
- *   Copyright 1997-2007 by Easy Software Products, all rights reserved.
+ *   Copyright 1997-2006 by Easy Software Products, all rights reserved.
 *
 *   These coded instructions, statements, and computer programs are the
- *   property of Apple Inc. and are protected by Federal copyright
- *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   property of Easy Software Products and are protected by Federal
+ *   copyright law.  Distribution and use rights are outlined in the file
 *   "LICENSE" which should have been included with this file.  If this
- *   file is missing or damaged, see the license at "http://www.cups.org/".
+ *   file is missing or damaged please contact Easy Software Products
+ *   at:
+ *
+ *       Attn: CUPS Licensing Information
+ *       Easy Software Products
+ *       44141 Airport View Drive, Suite 204
+ *       Hollywood, Maryland 20636 USA
+ *
+ *       Voice: (301) 373-9600
+ *       EMail: cups-info@cups.org
+ *         WWW: http://www.cups.org
 *
 *   This file is subject to the Apple OS-Developed Software exception.
 *
@@ -18,7 +27,6 @@
 *
 *   main()         - Send a file to the printer or server.
 *   list_devices() - List all serial devices.
- *   side_cb()      - Handle side-channel requests...
 */

 /*
@@ -83,8 +91,7 @@
 * Local functions...
 */

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


 /*
@@ -104,9 +111,9 @@ main(int  argc,				/* I - Number of command-line arguments (6 or 7) */
 		username[255],		/* Username info (not used) */
 		resource[1024],		/* Resource info (device and options) */
 		*options,		/* Pointer to options */
-		*name,			/* Name of option */
-		*value,			/* Value of option */
-		sep;			/* Option separator */
+		name[255],		/* Name of option */
+		value[255],		/* Value of option */
+		*ptr;			/* Pointer into name or value */
  int		port;			/* Port number (not used) */
  int		copies;			/* Number of copies to print */
  int		print_fd,		/* Print file */
@@ -161,9 +168,7 @@ main(int  argc,				/* I - Number of command-line arguments (6 or 7) */
  }
  else if (argc < 6 || argc > 7)
  {
-    _cupsLangPrintf(stderr,
-                    _("Usage: %s job-id user title copies options [file]\n"),
-	            argv[0]);
+    fputs("Usage: serial job-id user title copies options [file]\n", stderr);
    return (CUPS_BACKEND_FAILED);
  }

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

    if ((print_fd = open(argv[6], O_RDONLY)) < 0)
    {
-      _cupsLangPrintf(stderr,
-                      _("ERROR: Unable to open print file \"%s\": %s\n"),
-                      argv[6], strerror(errno));
+      perror("ERROR: unable to open print file");
      return (CUPS_BACKEND_FAILED);
    }

@@ -237,9 +240,8 @@ main(int  argc,				/* I - Number of command-line arguments (6 or 7) */
 	* available printer in the class.
 	*/

-        _cupsLangPuts(stderr,
-	              _("INFO: Unable to contact printer, queuing on next "
-			"printer in class...\n"));
+        fputs("INFO: Unable to open serial port, queuing on next printer in class...\n",
+	      stderr);

       /*
        * Sleep 5 seconds to keep the job from requeuing too rapidly...
@@ -252,15 +254,13 @@ main(int  argc,				/* I - Number of command-line arguments (6 or 7) */

      if (errno == EBUSY)
      {
-        _cupsLangPuts(stderr,
-	              _("INFO: Printer busy; will retry in 30 seconds...\n"));
+        fputs("INFO: Serial port busy; will retry in 30 seconds...\n", stderr);
 	sleep(30);
      }
      else
      {
-	_cupsLangPrintf(stderr,
-	                _("ERROR: Unable to open device file \"%s\": %s\n"),
-			resource, strerror(errno));
+	fprintf(stderr, "ERROR: Unable to open serial port device file \"%s\": %s\n",
+	        resource, strerror(errno));
 	return (CUPS_BACKEND_FAILED);
      }
    }
@@ -291,30 +291,29 @@ main(int  argc,				/* I - Number of command-line arguments (6 or 7) */
      * Get the name...
      */

-      name = options;
+      for (ptr = name; *options && *options != '=';)
+        if (ptr < (name + sizeof(name) - 1))
+          *ptr++ = *options++;
+      *ptr = '\0';

-      while (*options && *options != '=' && *options != '+' && *options != '&')
-        options ++;
-
-      if ((sep = *options) != '\0')
-        *options++ = '\0';
-
-      if (sep == '=')
+      if (*options == '=')
      {
       /*
        * Get the value...
 	*/

-        value = options;
+        options ++;

-	while (*options && *options != '+' && *options != '&')
+	for (ptr = value; *options && *options != '+' && *options != '&';)
+          if (ptr < (value + sizeof(value) - 1))
+            *ptr++ = *options++;
+	*ptr = '\0';
+
+	if (*options == '+' || *options == '&')
 	  options ++;
-
-        if (*options)
-	  *options++ = '\0';
      }
      else
-        value = (char *)"";
+        value[0] = '\0';

     /*
      * Process the option...
@@ -377,8 +376,7 @@ main(int  argc,				/* I - Number of command-line arguments (6 or 7) */
 	      break;
 #  endif /* B230400 */
          default :
-	      _cupsLangPrintf(stderr, _("WARNING: Unsupported baud rate %s!\n"),
-			      value);
+	      fprintf(stderr, "WARNING: Unsupported baud rate %s!\n", value);
 	      break;
 	}
 #endif /* B19200 == 19200 */
@@ -558,8 +556,6 @@ main(int  argc,				/* I - Number of command-line arguments (6 or 7) */
      if (!print_bytes)
 	FD_SET(print_fd, &input);
      FD_SET(device_fd, &input);
-      if (!print_bytes)
-        FD_SET(CUPS_SC_FD, &input);

      FD_ZERO(&output);
      if (print_bytes)
@@ -568,21 +564,6 @@ main(int  argc,				/* I - Number of command-line arguments (6 or 7) */
      if (select(nfds, &input, &output, NULL, NULL) < 0)
 	continue;			/* Ignore errors here */

-     /*
-      * Check if we have a side-channel request ready...
-      */
-
-      if (FD_ISSET(CUPS_SC_FD, &input))
-      {
-       /*
-	* Do the side-channel request, then start back over in the select
-	* loop since it may have read from print_fd...
-	*/
-
-        side_cb(print_fd, device_fd, 1);
-	continue;
-      }
-
     /*
      * Check if we have back-channel data ready...
      */
@@ -612,7 +593,7 @@ main(int  argc,				/* I - Number of command-line arguments (6 or 7) */

 	  if (errno != EAGAIN || errno != EINTR)
 	  {
-	    _cupsLangPrintError(_("ERROR: Unable to read print data"));
+	    perror("ERROR: Unable to read print data");

            tcsetattr(device_fd, TCSADRAIN, &origopts);

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

 	  if (errno != EAGAIN && errno != EINTR && errno != ENOTTY)
 	  {
-	    _cupsLangPrintError(_("ERROR: Unable to write print data"));
+	    perror("ERROR: Unable to write print data");

            tcsetattr(device_fd, TCSADRAIN, &origopts);

@@ -731,21 +712,19 @@ main(int  argc,				/* I - Number of command-line arguments (6 or 7) */
 * 'list_devices()' - List all serial devices.
 */

-static void
+void
 list_devices(void)
 {
-#if defined(__hpux) || defined(__sgi) || defined(__sun) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) || defined(__FreeBSD_kernel__)
+#if defined(__hpux) || defined(__sgi) || defined(__sun) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
  static char	*funky_hex = "0123456789abcdefghijklmnopqrstuvwxyz";
 					/* Funky hex numbering used for some *
 					 * devices                           */
-#endif /* __hpux || __sgi || __sun || __FreeBSD__ || __OpenBSD__ || __FreeBSD_kernel__ */
-
+#endif /* __hpux || __sgi || __sun || __FreeBSD__ || __OpenBSD__ */

 #ifdef __linux
  int			i, j;		/* Looping vars */
  int			fd;		/* File descriptor */
  char			device[255];	/* Device filename */
-  char			info[255];	/* Device info/description */
 #  ifdef TIOCGSERIAL
  struct serial_struct	serinfo;	/* serial port info */
 #  endif /* TIOCGSERIAL */
@@ -780,35 +759,24 @@ list_devices(void)

      close(fd);

-      snprintf(info, sizeof(info),
-	       _cupsLangString(cupsLangDefault(), _("Serial Port #%d")), i + 1);
-
 #  if defined(_ARCH_PPC) || defined(powerpc) || defined(__powerpc)
-      printf("serial serial:%s?baud=230400 \"Unknown\" \"%s\"\n", device, info);
+      printf("serial serial:%s?baud=230400 \"Unknown\" \"Serial Port #%d\"\n",
+             device, i + 1);
 #  else
-      printf("serial serial:%s?baud=115200 \"Unknown\" \"%s\"\n", device, info);
+      printf("serial serial:%s?baud=115200 \"Unknown\" \"Serial Port #%d\"\n",
+             device, i + 1);
 #  endif /* _ARCH_PPC || powerpc || __powerpc */
    }
  }

  for (i = 0; i < 16; i ++)
  {
-    snprintf(info, sizeof(info),
-	     _cupsLangString(cupsLangDefault(), _("USB Serial Port #%d")),
-	     i + 1);
-
    sprintf(device, "/dev/usb/ttyUSB%d", i);
    if ((fd = open(device, O_WRONLY | O_NOCTTY | O_NDELAY)) >= 0)
    {
      close(fd);
-      printf("serial serial:%s?baud=230400 \"Unknown\" \"%s\"\n", device, info);
-    }
-
-    sprintf(device, "/dev/ttyUSB%d", i);
-    if ((fd = open(device, O_WRONLY | O_NOCTTY | O_NDELAY)) >= 0)
-    {
-      close(fd);
-      printf("serial serial:%s?baud=230400 \"Unknown\" \"%s\"\n", device, info);
+      printf("serial serial:%s?baud=230400 \"Unknown\" \"USB Serial Port #%d\"\n",
+             device, i + 1);
    }
  }

@@ -820,9 +788,9 @@ list_devices(void)
      if ((fd = open(device, O_WRONLY | O_NOCTTY | O_NDELAY)) >= 0)
      {
        close(fd);
-
        printf("serial serial:%s?baud=115200 \"Unknown\" "
-	       "\"Equinox ESP %d Port #%d\"\n", device, i, j + 1);
+	       "\"Equinox ESP %d Port #%d\"\n",
+               device, i, j + 1);
      }
    }
  }
@@ -925,9 +893,8 @@ list_devices(void)
 	}
      }
 #elif defined(__sun)
-  int		i, j, n;		/* Looping vars */
-  char		device[255];		/* Device filename */
-  char		info[255];		/* Device info/description */
+  int		i, j, n;	/* Looping vars */
+  char		device[255];	/* Device filename */


 /*
@@ -937,18 +904,14 @@ list_devices(void)
  for (i = 0; i < 26; i ++)
  {
    sprintf(device, "/dev/cua/%c", 'a' + i);
-    if (!access(device, 0))
-    {
-      snprintf(info, sizeof(info),
-	       _cupsLangString(cupsLangDefault(), _("Serial Port #%d")), i + 1);
-
+    if (access(device, 0) == 0)
 #  ifdef B115200
-      printf("serial serial:%s?baud=115200 \"Unknown\" \"%s\"\n", device, info);
+      printf("serial serial:%s?baud=115200 \"Unknown\" \"Serial Port #%d\"\n",
             device, i + 1);
 #  else
-      printf("serial serial:%s?baud=38400 \"Unknown\" \"%s\"\n", device, info);
+      printf("serial serial:%s?baud=38400 \"Unknown\" \"Serial Port #%d\"\n",
+             device, i + 1);
 #  endif /* B115200 */
-    }
  }

 /*
@@ -1044,11 +1007,10 @@ list_devices(void)
      printf("serial serial:%s?baud=38400 \"Unknown\" \"Serial Port #%d\"\n",
             device, i + 1);
  }
-#elif defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) || defined(__FreeBSD_kernel__)
-  int	i, j;				/* Looping vars */
-  int	fd;				/* File descriptor */
-  char	device[255];			/* Device filename */
-  char	info[255];			/* Device info/description */
+#elif defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
+  int	i, j;		/* Looping vars */
+  int	fd;		/* File descriptor */
+  char	device[255];	/* Device filename */


 /*
@@ -1061,11 +1023,8 @@ list_devices(void)
    if ((fd = open(device, O_WRONLY | O_NOCTTY | O_NDELAY)) >= 0)
    {
      close(fd);
-
-      snprintf(info, sizeof(info),
-	       _cupsLangString(cupsLangDefault(), _("Serial Port #%d")), i + 1);
-
-      printf("serial serial:%s?baud=115200 \"Unknown\" \"%s\"\n", device, info);
+      printf("serial serial:%s?baud=115200 \"Unknown\" \"Standard Serial Port #%d\"\n",
+             device, i + 1);
    }
  }

@@ -1139,10 +1098,9 @@ list_devices(void)
    }
  }
 #elif defined(__NetBSD__)
-  int	i, j;				/* Looping vars */
-  int	fd;				/* File descriptor */
-  char	device[255];			/* Device filename */
-  char	info[255];			/* Device info/description */
+  int	i, j;		/* Looping vars */
+  int	fd;		/* File descriptor */
+  char	device[255];	/* Device filename */


 /*
@@ -1155,11 +1113,8 @@ list_devices(void)
    if ((fd = open(device, O_WRONLY | O_NOCTTY | O_NDELAY)) >= 0)
    {
      close(fd);
-
-      snprintf(info, sizeof(info),
-	       _cupsLangString(cupsLangDefault(), _("Serial Port #%d")), i + 1);
-
-      printf("serial serial:%s?baud=115200 \"Unknown\" \"%s\"\n", device, info);
+      printf("serial serial:%s?baud=115200 \"Unknown\" \"Serial Port #%d\"\n",
+             device, i + 1);
    }
  }

@@ -1262,59 +1217,6 @@ list_devices(void)
 }


-/*
- * 'side_cb()' - Handle side-channel requests...
- */
-
-static void
-side_cb(int print_fd,			/* I - Print file */
-        int device_fd,			/* I - Device file */
-	int use_bc)			/* I - Using back-channel? */
-{
-  cups_sc_command_t	command;	/* Request command */
-  cups_sc_status_t	status;		/* Request/response status */
-  char			data[2048];	/* Request/response data */
-  int			datalen;	/* Request/response data size */
-
-
-  datalen = sizeof(data);
-
-  if (cupsSideChannelRead(&command, &status, data, &datalen, 1.0))
-  {
-    _cupsLangPuts(stderr,
-                  _("WARNING: Failed to read side-channel request!\n"));
-    return;
-  }
-
-  switch (command)
-  {
-    case CUPS_SC_CMD_DRAIN_OUTPUT :
-        if (backendDrainOutput(print_fd, device_fd))
-	  status = CUPS_SC_STATUS_IO_ERROR;
-	else if (tcdrain(device_fd))
-	  status = CUPS_SC_STATUS_IO_ERROR;
-	else
-	  status = CUPS_SC_STATUS_OK;
-
-	datalen = 0;
-        break;
-
-    case CUPS_SC_CMD_GET_BIDI :
-	status  = CUPS_SC_STATUS_OK;
-        data[0] = use_bc;
-        datalen = 1;
-        break;
-
-    default :
-        status  = CUPS_SC_STATUS_NOT_IMPLEMENTED;
-	datalen = 0;
-	break;
-  }
-
-  cupsSideChannelWrite(command, status, data, datalen, 1.0);
-}
-
-
 /*
 * End of "$Id$".
 */
@@ -1,707 +0,0 @@
-/*
- * "$Id$"
- *
- *   SNMP supplies functions for the Common UNIX Printing System (CUPS).
- *
- *   Copyright 2008 by Apple Inc.
- *
- *   These coded instructions, statements, and computer programs are the
- *   property of Apple Inc. and are protected by Federal copyright
- *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
- *   "LICENSE" which should have been included with this file.  If this
- *   file is missing or damaged, see the license at "http://www.cups.org/".
- *
- *   This file is subject to the Apple OS-Developed Software exception.
- *
- * Contents:
- *
- *   backendSNMPSupplies()   - Get the current supplies for a device.
- *   backend_init_supplies() - Initialize the supplies list.
- *   backend_walk_cb()       - Interpret the supply value responses...
- */
-
-/*
- * Include necessary headers.
- */
-
-#include "backend-private.h"
-#include <cups/array.h>
-
-
-/*
- * Local constants...
- */
-
-#define CUPS_MAX_SUPPLIES	32	/* Maximum number of supplies for a printer */
-
-
-/*
- * Local structures...
- */
-
-typedef struct
-{
-  char	name[CUPS_SNMP_MAX_STRING],	/* Name of supply */
-	color[8];			/* Color: "#RRGGBB" or "none" */
-  int	colorant,			/* Colorant index */
-	type,				/* Supply type */
-	max_capacity,			/* Maximum capacity */
-	level;				/* Current level value */
-} backend_supplies_t;
-
-
-/*
- * Local globals...
- */
-
-static http_addr_t	current_addr;	/* Current address */
-static int		num_supplies = 0;
-					/* Number of supplies found */
-static backend_supplies_t supplies[CUPS_MAX_SUPPLIES];
-					/* Supply information */
-
-static const int	hrDeviceDescr[] =
-			{ CUPS_OID_hrDeviceDescr, 1, -1 };
-					/* Device description OID */
-static const int	hrPrinterStatus[] =
-			{ CUPS_OID_hrPrinterStatus, 1, -1 };
-					/* Current state OID */
-static const int	hrPrinterDetectedErrorState[] =
-			{ CUPS_OID_hrPrinterDetectedErrorState, 1, -1 };
-					/* Current printer state bits OID */
-static const int	prtMarkerColorantValue[] =
-			{ CUPS_OID_prtMarkerColorantValue, -1 },
-					/* Colorant OID */
-			prtMarkerColorantValueOffset =
-			(sizeof(prtMarkerColorantValue) /
-			 sizeof(prtMarkerColorantValue[0]));
-					/* Offset to colorant index */
-static const int	prtMarkerLifeCount[] =
-			{ CUPS_OID_prtMarkerLifeCount, 1, 1, -1 };
-					/* Page counter OID */
-static const int	prtMarkerSuppliesEntry[] =
-			{ CUPS_OID_prtMarkerSuppliesEntry, -1 };
-					/* Supplies OID */
-static const int	prtMarkerSuppliesColorantIndex[] =
-			{ CUPS_OID_prtMarkerSuppliesColorantIndex, -1 },
-					/* Colorant index OID */
-			prtMarkerSuppliesColorantIndexOffset =
-			(sizeof(prtMarkerSuppliesColorantIndex) /
-			 sizeof(prtMarkerSuppliesColorantIndex[0]));
-			 		/* Offset to supply index */
-static const int	prtMarkerSuppliesDescription[] =
-			{ CUPS_OID_prtMarkerSuppliesDescription, -1 },
-					/* Description OID */
-			prtMarkerSuppliesDescriptionOffset =
-			(sizeof(prtMarkerSuppliesDescription) /
-			 sizeof(prtMarkerSuppliesDescription[0]));
-			 		/* Offset to supply index */
-static const int	prtMarkerSuppliesLevel[] =
-			{ CUPS_OID_prtMarkerSuppliesLevel, -1 },
-					/* Level OID */
-			prtMarkerSuppliesLevelOffset =
-			(sizeof(prtMarkerSuppliesLevel) /
-			 sizeof(prtMarkerSuppliesLevel[0]));
-			 		/* Offset to supply index */
-static const int	prtMarkerSuppliesMaxCapacity[] =
-			{ CUPS_OID_prtMarkerSuppliesMaxCapacity, -1 },
-					/* Max capacity OID */
-			prtMarkerSuppliesMaxCapacityOffset =
-			(sizeof(prtMarkerSuppliesMaxCapacity) /
-			 sizeof(prtMarkerSuppliesMaxCapacity[0]));
-			 		/* Offset to supply index */
-static const int	prtMarkerSuppliesType[] =
-			{ CUPS_OID_prtMarkerSuppliesType, -1 },
-					/* Type OID */
-			prtMarkerSuppliesTypeOffset =
-			(sizeof(prtMarkerSuppliesType) /
-			 sizeof(prtMarkerSuppliesType[0]));
-			 		/* Offset to supply index */
-
-
-/*
- * Local functions...
- */
-
-static void	backend_init_supplies(int snmp_fd, http_addr_t *addr);
-static void	backend_walk_cb(cups_snmp_t *packet, void *data);
-
-
-/*
- * 'backendSNMPSupplies()' - Get the current supplies for a device.
- */
-
-int					/* O - 0 on success, -1 on error */
-backendSNMPSupplies(
-    int         snmp_fd,		/* I - SNMP socket */
-    http_addr_t *addr,			/* I - Printer address */
-    int         *page_count,		/* O - Page count */
-    int         *printer_state)		/* O - Printer state */
-{
-  if (!httpAddrEqual(addr, &current_addr))
-    backend_init_supplies(snmp_fd, addr);
-  else if (num_supplies > 0)
-    _cupsSNMPWalk(snmp_fd, &current_addr, CUPS_SNMP_VERSION_1,
-		 _cupsSNMPDefaultCommunity(), prtMarkerSuppliesLevel, 0.5,
-		 backend_walk_cb, NULL);
-
-  if (page_count)
-    *page_count = -1;
-
-  if (printer_state)
-    *printer_state = -1;
-
-  if (num_supplies > 0)
-  {
-    int		i;			/* Looping var */
-    char	value[CUPS_MAX_SUPPLIES * 4],
-					/* marker-levels value string */
-		*ptr;			/* Pointer into value string */
-    cups_snmp_t	packet;			/* SNMP response packet */
-
-
-   /*
-    * Generate the marker-levels value string...
-    */
-
-    for (i = 0, ptr = value; i < num_supplies; i ++, ptr += strlen(ptr))
-    {
-      if (i)
-        *ptr++ = ',';
-
-      if (supplies[i].max_capacity > 0)
-        sprintf(ptr, "%d", 100 * supplies[i].level / supplies[i].max_capacity);
-      else
-        strcpy(ptr, "-1");
-    }
-
-    fprintf(stderr, "ATTR: marker-levels=%s\n", value);
-
-   /*
-    * Get the current printer status bits...
-    */
-
-    if (!_cupsSNMPWrite(snmp_fd, addr, CUPS_SNMP_VERSION_1,
-                       _cupsSNMPDefaultCommunity(), CUPS_ASN1_GET_REQUEST, 1,
-                       hrPrinterDetectedErrorState))
-      return (-1);
-
-    if (!_cupsSNMPRead(snmp_fd, &packet, 0.5) ||
-        packet.object_type != CUPS_ASN1_OCTET_STRING)
-      return (-1);
-
-    i = ((packet.object_value.string[0] & 255) << 8) |
-        (packet.object_value.string[1] & 255);
-
-    if (i & CUPS_TC_lowPaper)
-      fputs("STATE: +media-low-report\n", stderr);
-    else
-      fputs("STATE: -media-low-report\n", stderr);
-
-    if (i & (CUPS_TC_noPaper | CUPS_TC_inputTrayEmpty))
-      fputs("STATE: +media-empty-warning\n", stderr);
-    else
-      fputs("STATE: -media-empty-warning\n", stderr);
-
-    if (i & CUPS_TC_lowToner)
-      fputs("STATE: +toner-low-report\n", stderr);
-    else
-      fputs("STATE: -toner-low-report\n", stderr);
-
-    if (i & CUPS_TC_noToner)
-      fputs("STATE: +toner-empty-warning\n", stderr);
-    else
-      fputs("STATE: -toner-empty-warning\n", stderr);
-
-    if (i & CUPS_TC_doorOpen)
-      fputs("STATE: +door-open-report\n", stderr);
-    else
-      fputs("STATE: -door-open-report\n", stderr);
-
-    if (i & CUPS_TC_jammed)
-      fputs("STATE: +media-jam-warning\n", stderr);
-    else
-      fputs("STATE: -media-jam-warning\n", stderr);
-
-    if (i & CUPS_TC_offline)
-      fputs("STATE: +offline-report\n", stderr);
-    else
-      fputs("STATE: -offline-report\n", stderr);
-
-    if (i & (CUPS_TC_serviceRequested | CUPS_TC_overduePreventMaint))
-      fputs("STATE: +service-needed-warning\n", stderr);
-    else
-      fputs("STATE: -service-needed-warning\n", stderr);
-
-    if (i & CUPS_TC_inputTrayMissing)
-      fputs("STATE: +input-tray-missing-warning\n", stderr);
-    else
-      fputs("STATE: -input-tray-missing-warning\n", stderr);
-
-    if (i & CUPS_TC_outputTrayMissing)
-      fputs("STATE: +output-tray-missing-warning\n", stderr);
-    else
-      fputs("STATE: -output-tray-missing-warning\n", stderr);
-
-    if (i & CUPS_TC_markerSupplyMissing)
-      fputs("STATE: +marker-supply-missing-warning\n", stderr);
-    else
-      fputs("STATE: -marker-supply-missing-warning\n", stderr);
-
-    if (i & CUPS_TC_outputNearFull)
-      fputs("STATE: +output-area-almost-full-report\n", stderr);
-    else
-      fputs("STATE: -output-area-almost-full-report\n", stderr);
-
-    if (i & CUPS_TC_outputFull)
-      fputs("STATE: +output-area-full-warning\n", stderr);
-    else
-      fputs("STATE: -output-area-full-warning\n", stderr);
-
-   /*
-    * Get the current printer state...
-    */
-
-    if (printer_state)
-    {
-      if (!_cupsSNMPWrite(snmp_fd, addr, CUPS_SNMP_VERSION_1,
-			 _cupsSNMPDefaultCommunity(), CUPS_ASN1_GET_REQUEST, 1,
-			 hrPrinterStatus))
-	return (-1);
-
-      if (!_cupsSNMPRead(snmp_fd, &packet, 0.5) ||
-	  packet.object_type != CUPS_ASN1_INTEGER)
-	return (-1);
-
-      *printer_state = packet.object_value.integer;
-    }
-
-   /*
-    * Get the current page count...
-    */
-
-    if (page_count)
-    {
-      if (!_cupsSNMPWrite(snmp_fd, addr, CUPS_SNMP_VERSION_1,
-			 _cupsSNMPDefaultCommunity(), CUPS_ASN1_GET_REQUEST, 1,
-			 prtMarkerLifeCount))
-	return (-1);
-
-      if (!_cupsSNMPRead(snmp_fd, &packet, 0.5) ||
-	  packet.object_type != CUPS_ASN1_COUNTER)
-	return (-1);
-
-      *page_count = packet.object_value.counter;
-    }
-
-    return (0);
-  }
-  else
-    return (-1);
-}
-
-
-/*
- * 'backend_init_supplies()' - Initialize the supplies list.
- */
-
-static void
-backend_init_supplies(
-    int         snmp_fd,		/* I - SNMP socket */
-    http_addr_t *addr)			/* I - Printer address */
-{
-  int		i,			/* Looping var */
-		type;			/* Current marker type */
-  cups_file_t	*cachefile;		/* Cache file */
-  const char	*cachedir;		/* CUPS_CACHEDIR value */
-  char		addrstr[1024],		/* Address string */
-		cachefilename[1024],	/* Cache filename */
-		description[CUPS_SNMP_MAX_STRING],
-					/* Device description string */
-		value[CUPS_MAX_SUPPLIES * (CUPS_SNMP_MAX_STRING * 2 + 3)],
-					/* Value string */
-		*ptr,			/* Pointer into value string */
-		*name_ptr;		/* Pointer into name string */
-  cups_snmp_t	packet;			/* SNMP response packet */
-  ppd_file_t	*ppd;			/* PPD file for this queue */
-  ppd_attr_t	*ppdattr;		/* cupsSNMPSupplies attribute */
-  static const char * const types[] =	/* Supply types */
-		{
-		  "other",
-		  "unknown",
-		  "toner",
-		  "wasteToner",
-		  "ink",
-		  "inkCartridge",
-		  "inkRibbon",
-		  "wasteInk",
-		  "opc",
-		  "developer",
-		  "fuserOil",
-		  "solidWax",
-		  "ribbonWax",
-		  "wasteWax",
-		  "fuser",
-		  "coronaWire",
-		  "fuserOilWick",
-		  "cleanerUnit",
-		  "fuserCleaningPad",
-		  "transferUnit",
-		  "tonerCartridge",
-		  "fuserOiler",
-		  "water",
-		  "wasteWater",
-		  "glueWaterAdditive",
-		  "wastePaper",
-		  "bindingSupply",
-		  "bandingSupply",
-		  "stitchingWire",
-		  "shrinkWrap",
-		  "paperWrap",
-		  "staples",
-		  "inserts",
-		  "covers"
-		};
-
-
- /*
-  * Reset state information...
-  */
-
-  current_addr = *addr;
-  num_supplies = -1;
-
-  memset(supplies, 0, sizeof(supplies));
-
- /*
-  * See if we should be getting supply levels via SNMP...
-  */
-
-  if ((ppd = ppdOpenFile(getenv("PPD"))) != NULL &&
-      (ppdattr = ppdFindAttr(ppd, "cupsSNMPSupplies", NULL)) != NULL &&
-      ppdattr->value && strcasecmp(ppdattr->value, "true"))
-  {
-    ppdClose(ppd);
-    return;
-  }
-
-  ppdClose(ppd);
-
- /*
-  * Get the device description...
-  */
-
-  if (!_cupsSNMPWrite(snmp_fd, addr, CUPS_SNMP_VERSION_1,
-		     _cupsSNMPDefaultCommunity(), CUPS_ASN1_GET_REQUEST, 1,
-		     hrDeviceDescr))
-    return;
-
-  if (!_cupsSNMPRead(snmp_fd, &packet, 0.5) ||
-      packet.object_type != CUPS_ASN1_OCTET_STRING)
-  {
-    strlcpy(description, "Unknown", sizeof(description));
-    num_supplies = 0;
-  }
-  else
-    strlcpy(description, packet.object_value.string, sizeof(description));
-
- /*
-  * See if we have already queried this device...
-  */
-
-  httpAddrString(addr, addrstr, sizeof(addrstr));
-
-  if ((cachedir = getenv("CUPS_CACHEDIR")) == NULL)
-    cachedir = CUPS_CACHEDIR;
-
-  snprintf(cachefilename, sizeof(cachefilename), "%s/%s.snmp", cachedir,
-           addrstr);
-
-  if ((cachefile = cupsFileOpen(cachefilename, "r")) != NULL)
-  {
-   /*
-    * Yes, read the cache file:
-    *
-    *     1 num_supplies
-    *     device description
-    *     supply structures...
-    */
-
-    if (cupsFileGets(cachefile, value, sizeof(value)))
-    {
-      if (sscanf(value, "1 %d", &num_supplies) == 1 &&
-          num_supplies <= CUPS_MAX_SUPPLIES &&
-          cupsFileGets(cachefile, value, sizeof(value)))
-      {
-        if ((ptr = value + strlen(value) - 1) >= value && *ptr == '\n')
-	  *ptr = '\n';
-
-        if (!strcmp(description, value))
-	  cupsFileRead(cachefile, (char *)supplies,
-	               num_supplies * sizeof(backend_supplies_t));
-        else
-	  num_supplies = -1;
-      }
-      else
-        num_supplies = -1;
-    }
-
-    cupsFileClose(cachefile);
-  }
-
- /*
-  * If the cache information isn't correct, scan for supplies...
-  */
-
-  if (num_supplies < 0)
-  {
-   /*
-    * Walk the printer configuration information...
-    */
-
-    _cupsSNMPWalk(snmp_fd, &current_addr, CUPS_SNMP_VERSION_1,
-		 _cupsSNMPDefaultCommunity(), prtMarkerSuppliesEntry, 0.5,
-		 backend_walk_cb, NULL);
-  }
-
- /*
-  * Save the cached information...
-  */
-
-  if (num_supplies < 0)
-    num_supplies = 0;
-
-  if ((cachefile = cupsFileOpen(cachefilename, "w")) != NULL)
-  {
-    cupsFilePrintf(cachefile, "1 %d\n", num_supplies);
-    cupsFilePrintf(cachefile, "%s\n", description);
-
-    if (num_supplies > 0)
-      cupsFileWrite(cachefile, (char *)supplies,
-                    num_supplies * sizeof(backend_supplies_t));
-
-    cupsFileClose(cachefile);
-  }
-
-  if (num_supplies <= 0)
-    return;
-
- /*
-  * Get the colors...
-  */
-
-  for (i = 0; i < num_supplies; i ++)
-    strcpy(supplies[i].color, "none");
-
-  _cupsSNMPWalk(snmp_fd, &current_addr, CUPS_SNMP_VERSION_1,
-               _cupsSNMPDefaultCommunity(), prtMarkerColorantValue, 0.5,
-	       backend_walk_cb, NULL);
-
- /*
-  * Output the marker-colors attribute...
-  */
-
-  for (i = 0, ptr = value; i < num_supplies; i ++, ptr += strlen(ptr))
-  {
-    if (i)
-      *ptr++ = ',';
-
-    strcpy(ptr, supplies[i].color);
-  }
-
-  fprintf(stderr, "ATTR: marker-colors=%s\n", value);
-
- /*
-  * Output the marker-names attribute...
-  */
-
-  for (i = 0, ptr = value; i < num_supplies; i ++)
-  {
-    if (i)
-      *ptr++ = ',';
-
-    *ptr++ = '\"';
-    for (name_ptr = supplies[i].name; *name_ptr;)
-    {
-      if (*name_ptr == '\\' || *name_ptr == '\"')
-        *ptr++ = '\\';
-
-      *ptr++ = *name_ptr++;
-    }
-    *ptr++ = '\"';
-  }
-
-  *ptr = '\0';
-
-  fprintf(stderr, "ATTR: marker-names=%s\n", value);
-
- /*
-  * Output the marker-types attribute...
-  */
-
-  for (i = 0, ptr = value; i < num_supplies; i ++, ptr += strlen(ptr))
-  {
-    if (i)
-      *ptr++ = ',';
-
-    type = supplies[i].type;
-
-    if (type < CUPS_TC_other || type > CUPS_TC_covers)
-      strcpy(ptr, "unknown");
-    else
-      strcpy(ptr, types[type - CUPS_TC_other]);
-  }
-
-  fprintf(stderr, "ATTR: marker-types=%s\n", value);
-}
-
-
-/*
- * 'backend_walk_cb()' - Interpret the supply value responses...
- */
-
-static void
-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] =
-  {					/* Standard color names */
-    { "black",   "#000000" },
-    { "blue",    "#0000FF" },
-    { "cyan",    "#00FFFF" },
-    { "green",   "#00FF00" },
-    { "magenta", "#FF00FF" },
-    { "red",     "#FF0000" },
-    { "white",   "#FFFFFF" },
-    { "yellow",  "#FFFF00" }
-  };
-
-
-  (void)data;
-
-  if (_cupsSNMPIsOIDPrefixed(packet, prtMarkerColorantValue) &&
-      packet->object_type == CUPS_ASN1_OCTET_STRING)
-  {
-   /*
-    * Get colorant...
-    */
-
-    i = packet->object_name[prtMarkerColorantValueOffset];
-
-    fprintf(stderr, "DEBUG2: prtMarkerColorantValue.1.%d = \"%s\"\n", i,
-            packet->object_value.string);
-
-    for (j = 0; j < num_supplies; j ++)
-      if (supplies[j].colorant == i)
-      {
-	for (k = 0; k < (int)(sizeof(colors) / sizeof(colors[0])); k ++)
-	  if (!strcmp(colors[k][0], packet->object_value.string))
-	  {
-	    strcpy(supplies[j].color, colors[k][1]);
-	    break;
-	  }
-      }
-  }
-  else if (_cupsSNMPIsOIDPrefixed(packet, prtMarkerSuppliesColorantIndex))
-  {
-   /*
-    * Get colorant index...
-    */
-
-    i = packet->object_name[prtMarkerSuppliesColorantIndexOffset];
-    if (i < 1 || i > CUPS_MAX_SUPPLIES ||
-        packet->object_type != CUPS_ASN1_INTEGER)
-      return;
-
-    fprintf(stderr, "DEBUG2: prtMarkerSuppliesColorantIndex.1.%d = %d\n", i,
-            packet->object_value.integer);
-
-    if (i > num_supplies)
-      num_supplies = i;
-
-    supplies[i - 1].colorant = packet->object_value.integer;
-  }
-  else if (_cupsSNMPIsOIDPrefixed(packet, prtMarkerSuppliesDescription))
-  {
-   /*
-    * Get supply name/description...
-    */
-
-    i = packet->object_name[prtMarkerSuppliesDescriptionOffset];
-    if (i < 1 || i > CUPS_MAX_SUPPLIES ||
-        packet->object_type != CUPS_ASN1_OCTET_STRING)
-      return;
-
-    fprintf(stderr, "DEBUG2: prtMarkerSuppliesDescription.1.%d = \"%s\"\n", i,
-            packet->object_value.string);
-
-    if (i > num_supplies)
-      num_supplies = i;
-
-    strlcpy(supplies[i - 1].name, packet->object_value.string,
-            sizeof(supplies[0].name));
-  }
-  else if (_cupsSNMPIsOIDPrefixed(packet, prtMarkerSuppliesLevel))
-  {
-   /*
-    * Get level...
-    */
-
-    i = packet->object_name[prtMarkerSuppliesLevelOffset];
-    if (i < 1 || i > CUPS_MAX_SUPPLIES ||
-        packet->object_type != CUPS_ASN1_INTEGER)
-      return;
-
-    fprintf(stderr, "DEBUG2: prtMarkerSuppliesLevel.1.%d = %d\n", i,
-            packet->object_value.integer);
-
-    if (i > num_supplies)
-      num_supplies = i;
-
-    supplies[i - 1].level = packet->object_value.integer;
-  }
-  else if (_cupsSNMPIsOIDPrefixed(packet, prtMarkerSuppliesMaxCapacity))
-  {
-   /*
-    * Get max capacity...
-    */
-
-    i = packet->object_name[prtMarkerSuppliesMaxCapacityOffset];
-    if (i < 1 || i > CUPS_MAX_SUPPLIES ||
-        packet->object_type != CUPS_ASN1_INTEGER)
-      return;
-
-    fprintf(stderr, "DEBUG2: prtMarkerSuppliesMaxCapacity.1.%d = %d\n", i,
-            packet->object_value.integer);
-
-    if (i > num_supplies)
-      num_supplies = i;
-
-    supplies[i - 1].max_capacity = packet->object_value.integer;
-  }
-  else if (_cupsSNMPIsOIDPrefixed(packet, prtMarkerSuppliesType))
-  {
-   /*
-    * Get marker type...
-    */
-
-    i = packet->object_name[prtMarkerSuppliesTypeOffset];
-    if (i < 1 || i > CUPS_MAX_SUPPLIES ||
-        packet->object_type != CUPS_ASN1_INTEGER)
-      return;
-
-    fprintf(stderr, "DEBUG2: prtMarkerSuppliesType.1.%d = %d\n", i,
-            packet->object_value.integer);
-
-    if (i > num_supplies)
-      num_supplies = i;
-
-    supplies[i - 1].type = packet->object_value.integer;
-  }
-}
-
-
-/*
- * End of "$Id$".
- */
@@ -3,21 +3,29 @@
 *
 *   AppSocket backend for the Common UNIX Printing System (CUPS).
 *
- *   Copyright 2007-2008 by Apple Inc.
- *   Copyright 1997-2007 by Easy Software Products, all rights reserved.
+ *   Copyright 1997-2006 by Easy Software Products, all rights reserved.
 *
 *   These coded instructions, statements, and computer programs are the
- *   property of Apple Inc. and are protected by Federal copyright
- *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   property of Easy Software Products and are protected by Federal
+ *   copyright law.  Distribution and use rights are outlined in the file
 *   "LICENSE" which should have been included with this file.  If this
- *   file is missing or damaged, see the license at "http://www.cups.org/".
+ *   file is missing or damaged please contact Easy Software Products
+ *   at:
+ *
+ *       Attn: CUPS Licensing Information
+ *       Easy Software Products
+ *       44141 Airport View Drive, Suite 204
+ *       Hollywood, Maryland 20636 USA
+ *
+ *       Voice: (301) 373-9600
+ *       EMail: cups-info@cups.org
+ *         WWW: http://www.cups.org
 *
 *   This file is subject to the Apple OS-Developed Software exception.
 *
 * Contents:
 *
- *   main()    - Send a file to the printer or server.
- *   wait_bc() - Wait for back-channel data...
+ *   main() - Send a file to the printer or server.
 */

 /*
@@ -42,13 +50,6 @@
 #endif /* WIN32 */


-/*
- * Local functions...
- */
-
-static int	wait_bc(int device_fd, int secs);
-
-
 /*
 * 'main()' - Send a file to the printer or server.
 *
@@ -61,36 +62,27 @@ int					/* O - Exit status */
 main(int  argc,				/* I - Number of command-line arguments (6 or 7) */
     char *argv[])			/* I - Command-line arguments */
 {
-  const char	*device_uri;		/* Device URI */
  char		method[255],		/* Method in URI */
 		hostname[1024],		/* Hostname */
 		username[255],		/* Username info (not used) */
 		resource[1024],		/* Resource info (not used) */
 		*options,		/* Pointer to options */
-		*name,			/* Name of option */
-		*value,			/* Value of option */
-		sep;			/* Option separator */
+		name[255],		/* Name of option */
+		value[255],		/* Value of option */
+		*ptr;			/* Pointer into name or value */
  int		print_fd;		/* Print file */
  int		copies;			/* Number of copies to print */
-  time_t	start_time,		/* Time of first connect */
-		current_time,		/* Current time */
-		wait_time;		/* Time to wait before shutting down socket */
-  int		recoverable;		/* Recoverable error shown? */
-  int		contimeout;		/* Connection timeout */
  int		waiteof;		/* Wait for end-of-file? */
  int		port;			/* Port number */
  char		portname[255];		/* Port name */
  int		delay;			/* Delay for retries... */
  int		device_fd;		/* AppSocket */
  int		error;			/* Error code (if any) */
-  http_addrlist_t *addrlist,		/* Address list */
-		*addr;			/* Connected address */
-  char		addrname[256];		/* Address name */
-  int		snmp_fd,		/* SNMP socket */
-		start_count,		/* Page count via SNMP at start */
-		page_count,		/* Page count via SNMP */
-		have_supplies;		/* Printer supports supply levels? */
+  http_addrlist_t *addrlist;		/* Address list */
  ssize_t	tbytes;			/* Total number of bytes written */
+  struct timeval timeout;		/* Timeout for select() */
+  fd_set	input;			/* Input set for select() */
+  ssize_t	bc_bytes;		/* Number of back-channel bytes read */
 #if defined(HAVE_SIGACTION) && !defined(HAVE_SIGSET)
  struct sigaction action;		/* Actions for POSIX signals */
 #endif /* HAVE_SIGACTION && !HAVE_SIGSET */
@@ -122,15 +114,13 @@ main(int  argc,				/* I - Number of command-line arguments (6 or 7) */

  if (argc == 1)
  {
-    printf("network socket \"Unknown\" \"%s\"\n",
-           _cupsLangString(cupsLangDefault(), _("AppSocket/HP JetDirect")));
+    puts("network socket \"Unknown\" \"AppSocket/HP JetDirect\"");
    return (CUPS_BACKEND_OK);
  }
  else if (argc < 6 || argc > 7)
  {
-    _cupsLangPrintf(stderr,
-                    _("Usage: %s job-id user title copies options [file]\n"),
-                    argv[0]);
+    fprintf(stderr, "Usage: %s job-id user title copies options [file]\n",
+            argv[0]);
    return (CUPS_BACKEND_FAILED);
  }

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

    if ((print_fd = open(argv[6], O_RDONLY)) < 0)
    {
-      _cupsLangPrintf(stderr,
-                      _("ERROR: Unable to open print file \"%s\": %s\n"),
-                      argv[6], strerror(errno));
+      perror("ERROR: unable to open print file");
      return (CUPS_BACKEND_FAILED);
    }

@@ -165,10 +153,7 @@ main(int  argc,				/* I - Number of command-line arguments (6 or 7) */
  * Extract the hostname and port number from the URI...
  */

-  if ((device_uri = cupsBackendDeviceURI(argv)) == NULL)
-    return (CUPS_BACKEND_FAILED);
-
-  httpSeparateURI(HTTP_URI_CODING_ALL, device_uri,
+  httpSeparateURI(HTTP_URI_CODING_ALL, cupsBackendDeviceURI(argv),
                  method, sizeof(method), username, sizeof(username),
 		  hostname, sizeof(hostname), &port,
 		  resource, sizeof(resource));
@@ -180,8 +165,7 @@ main(int  argc,				/* I - Number of command-line arguments (6 or 7) */
  * Get options, if any...
  */

-  waiteof    = 1;
-  contimeout = 7 * 24 * 60 * 60;
+  waiteof = 1;

  if ((options = strchr(resource, '?')) != NULL)
  {
@@ -202,30 +186,29 @@ main(int  argc,				/* I - Number of command-line arguments (6 or 7) */
      * Get the name...
      */

-      name = options;
+      for (ptr = name; *options && *options != '=';)
+        if (ptr < (name + sizeof(name) - 1))
+          *ptr++ = *options++;
+      *ptr = '\0';

-      while (*options && *options != '=' && *options != '+' && *options != '&')
-        options ++;
-
-      if ((sep = *options) != '\0')
-        *options++ = '\0';
-
-      if (sep == '=')
+      if (*options == '=')
      {
       /*
        * Get the value...
 	*/

-        value = options;
+        options ++;

-	while (*options && *options != '+' && *options != '&')
+	for (ptr = value; *options && *options != '+' && *options != '&';)
+          if (ptr < (value + sizeof(value) - 1))
+            *ptr++ = *options++;
+	*ptr = '\0';
+
+	if (*options == '+' || *options == '&')
 	  options ++;
-
-        if (*options)
-	  *options++ = '\0';
      }
      else
-        value = (char *)"";
+        value[0] = '\0';

     /*
      * Process the option...
@@ -240,15 +223,6 @@ main(int  argc,				/* I - Number of command-line arguments (6 or 7) */
        waiteof = !value[0] || !strcasecmp(value, "on") ||
 		  !strcasecmp(value, "yes") || !strcasecmp(value, "true");
      }
-      else if (!strcasecmp(name, "contimeout"))
-      {
-       /*
-        * Set the connection timeout...
-	*/
-
-	if (atoi(value) > 0)
-	  contimeout = atoi(value);
-      }
    }
  }

@@ -256,27 +230,22 @@ main(int  argc,				/* I - Number of command-line arguments (6 or 7) */
  * Then try to connect to the remote host...
  */

-  recoverable = 0;
-  start_time  = time(NULL);
-
  sprintf(portname, "%d", port);

  if ((addrlist = httpAddrGetList(hostname, AF_UNSPEC, portname)) == NULL)
  {
-    _cupsLangPrintf(stderr, _("ERROR: Unable to locate printer \'%s\'!\n"),
-                    hostname);
+    fprintf(stderr, "ERROR: Unable to locate printer \'%s\'!\n", hostname);
    return (CUPS_BACKEND_STOP);
  }

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

  fputs("STATE: +connecting-to-device\n", stderr);

  for (delay = 5;;)
  {
-    if ((addr = httpAddrConnect(addrlist, &device_fd)) == NULL)
+    if (!httpAddrConnect(addrlist, &device_fd))
    {
      error     = errno;
      device_fd = -1;
@@ -290,9 +259,8 @@ main(int  argc,				/* I - Number of command-line arguments (6 or 7) */
 	* available printer in the class.
 	*/

-        _cupsLangPuts(stderr,
-	              _("INFO: Unable to contact printer, queuing on next "
-			"printer in class...\n"));
+        fprintf(stderr, "INFO: Unable to connect to \"%s\", queuing on next printer in class...\n",
+		hostname);

       /*
        * Sleep 5 seconds to keep the job from requeuing too rapidly...
@@ -306,19 +274,9 @@ main(int  argc,				/* I - Number of command-line arguments (6 or 7) */
      if (error == ECONNREFUSED || error == EHOSTDOWN ||
          error == EHOSTUNREACH)
      {
-        if (contimeout && (time(NULL) - start_time) > contimeout)
-	{
-	  _cupsLangPuts(stderr, _("ERROR: Printer not responding!\n"));
-	  return (CUPS_BACKEND_FAILED);
-	}
-
-        recoverable = 1;
-
-	_cupsLangPrintf(stderr,
-			_("WARNING: recoverable: Network host \'%s\' is busy; "
-			  "will retry in %d seconds...\n"),
-			hostname, delay);
-
+	fprintf(stderr,
+	        "INFO: Network host \'%s\' is busy; will retry in %d seconds...\n",
+                hostname, delay);
 	sleep(delay);

 	if (delay < 30)
@@ -326,13 +284,7 @@ main(int  argc,				/* I - Number of command-line arguments (6 or 7) */
      }
      else
      {
-        recoverable = 1;
-
-        _cupsLangPrintf(stderr, "DEBUG: Connection error: %s\n",
-	                strerror(errno));
-	_cupsLangPuts(stderr,
-	              _("ERROR: recoverable: Unable to connect to printer; "
-		        "will retry in 30 seconds...\n"));
+	perror("ERROR: Unable to connect to printer (retrying in 30 seconds)");
 	sleep(30);
      }
    }
@@ -340,44 +292,7 @@ main(int  argc,				/* I - Number of command-line arguments (6 or 7) */
      break;
  }

-  if (recoverable)
-  {
-   /*
-    * If we've shown a recoverable error make sure the printer proxies
-    * have a chance to see the recovered message. Not pretty but
-    * necessary for now...
-    */
-
-    fputs("INFO: recovered: \n", stderr);
-    sleep(5);
-  }
-
  fputs("STATE: -connecting-to-device\n", stderr);
-  _cupsLangPuts(stderr, _("INFO: Connected to printer...\n"));
-
-#ifdef AF_INET6
-  if (addr->addr.addr.sa_family == AF_INET6)
-    fprintf(stderr, "DEBUG: Connected to [%s]:%d (IPv6)...\n", 
-	    httpAddrString(&addr->addr, addrname, sizeof(addrname)),
-	    ntohs(addr->addr.ipv6.sin6_port));
-  else
-#endif /* AF_INET6 */
-    if (addr->addr.addr.sa_family == AF_INET)
-      fprintf(stderr, "DEBUG: Connected to %s:%d (IPv4)...\n",
-	      httpAddrString(&addr->addr, addrname, sizeof(addrname)),
-	      ntohs(addr->addr.ipv4.sin_port));
-
- /*
-  * See if the printer supports SNMP...
-  */
-
-  if ((snmp_fd = _cupsSNMPOpen(addr->addr.addr.sa_family)) >= 0)
-  {
-    have_supplies = !backendSNMPSupplies(snmp_fd, &(addr->addr), &start_count,
-                                         NULL);
-  }
-  else
-    have_supplies = start_count = 0;

 /*
  * Print everything...
@@ -395,51 +310,56 @@ main(int  argc,				/* I - Number of command-line arguments (6 or 7) */
      lseek(print_fd, 0, SEEK_SET);
    }

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

    if (print_fd != 0 && tbytes >= 0)
-      _cupsLangPrintf(stderr,
-#ifdef HAVE_LONG_LONG
-		      _("INFO: Sent print file, %lld bytes...\n"),
-#else
-		      _("INFO: Sent print file, %ld bytes...\n"),
-#endif /* HAVE_LONG_LONG */
-		      CUPS_LLCAST tbytes);
+      fprintf(stderr, "INFO: Sent print file, " CUPS_LLFMT " bytes...\n",
+	      CUPS_LLCAST tbytes);
  }

- /*
-  * Wait up to 5 seconds to get any pending back-channel data...
-  */
-
-  wait_time = time(NULL) + 5;
-  while (wait_time >= time(&current_time))
-    if (wait_bc(device_fd, wait_time - current_time) <= 0)
-      break;
-
  if (waiteof)
  {
   /*
    * Shutdown the socket and wait for the other end to finish...
    */

-    _cupsLangPuts(stderr,
-                  _("INFO: Print file sent, waiting for printer to finish...\n"));
+    fputs("INFO: Print file sent, waiting for printer to finish...\n", stderr);

    shutdown(device_fd, 1);

-    while (wait_bc(device_fd, 90) > 0);
+    for (;;)
+    {
+     /*
+      * Wait a maximum of 90 seconds for backchannel data or a closed
+      * connection...
+      */
+
+      timeout.tv_sec  = 90;
+      timeout.tv_usec = 0;
+
+      FD_ZERO(&input);
+      FD_SET(device_fd, &input);
+
+      if (select(device_fd + 1, &input, NULL, NULL, &timeout) > 0)
+      {
+       /*
+	* Grab the data coming back and spit it out to stderr...
+	*/
+
+	if ((bc_bytes = read(device_fd, resource, sizeof(resource))) > 0)
+	{
+	  fprintf(stderr, "DEBUG: Received %d bytes of back-channel data!\n",
+		  (int)bc_bytes);
+	  cupsBackChannelWrite(resource, bc_bytes, 1.0);
+	}
+	else
+	  break;
+      }
+      else
+	break;
+    }
  }

- /*
-  * Collect the final page count as needed...
-  */
-
-  if (have_supplies && 
-      !backendSNMPSupplies(snmp_fd, &(addr->addr), &page_count, NULL) &&
-      page_count > start_count)
-    fprintf(stderr, "PAGE: total %d\n", page_count - start_count);
-
 /*
  * Close the socket connection...
  */
@@ -456,56 +376,12 @@ main(int  argc,				/* I - Number of command-line arguments (6 or 7) */
    close(print_fd);

  if (tbytes >= 0)
-    _cupsLangPuts(stderr, _("INFO: Ready to print.\n"));
+    fputs("INFO: Ready to print.\n", stderr);

  return (tbytes < 0 ? CUPS_BACKEND_FAILED : CUPS_BACKEND_OK);
 }


-/*
- * 'wait_bc()' - Wait for back-channel data...
- */
-
-static int				/* O - # bytes read or -1 on error */
-wait_bc(int device_fd,			/* I - Socket */
-        int secs)			/* I - Seconds to wait */
-{
-  struct timeval timeout;		/* Timeout for select() */
-  fd_set	input;			/* Input set for select() */
-  ssize_t	bytes;			/* Number of back-channel bytes read */
-  char		buffer[1024];		/* Back-channel buffer */
-
-
- /*
-  * Wait up to "secs" seconds for backchannel data...
-  */
-
-  timeout.tv_sec  = secs;
-  timeout.tv_usec = 0;
-
-  FD_ZERO(&input);
-  FD_SET(device_fd, &input);
-
-  if (select(device_fd + 1, &input, NULL, NULL, &timeout) > 0)
-  {
-   /*
-    * Grab the data coming back and spit it out to stderr...
-    */
-
-    if ((bytes = read(device_fd, buffer, sizeof(buffer))) > 0)
-    {
-      fprintf(stderr, "DEBUG: Received %d bytes of back-channel data!\n",
-	      (int)bytes);
-      cupsBackChannelWrite(buffer, bytes, 1.0);
-    }
-
-    return (bytes);
-  }
-  else
-    return (-1);
-}
-
-
 /*
 * End of "$Id$".
 */
@@ -4,20 +4,28 @@
 *   IEEE-1284 support functions test program for the Common UNIX Printing
 *   System (CUPS).
 *
- *   Copyright 2007 by Apple Inc.
 *   Copyright 1997-2006 by Easy Software Products, all rights reserved.
 *
 *   These coded instructions, statements, and computer programs are the
- *   property of Apple Inc. and are protected by Federal copyright
- *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   property of Easy Software Products and are protected by Federal
+ *   copyright law.  Distribution and use rights are outlined in the file
 *   "LICENSE" which should have been included with this file.  If this
- *   file is missing or damaged, see the license at "http://www.cups.org/".
+ *   file is missing or damaged please contact Easy Software Products
+ *   at:
+ *
+ *       Attn: CUPS Licensing Information
+ *       Easy Software Products
+ *       44141 Airport View Drive, Suite 204
+ *       Hollywood, Maryland 20636 USA
+ *
+ *       Voice: (301) 373-9600
+ *       EMail: cups-info@cups.org
+ *         WWW: http://www.cups.org
 *
 *   This file is subject to the Apple OS-Developed Software exception.
 *
 * Contents:
 *
- *   main() - Test the device-ID functions.
 */

 /*
@@ -34,6 +42,7 @@
 #  include <fcntl.h>
 #endif /* WIN32 */

+#define DEBUG
 #include "ieee1284.c"


@@ -1,391 +0,0 @@
-/*
- * "$Id$"
- *
- *   Backend test program for the Common UNIX Printing System (CUPS).
- *
- *   Copyright 2007-2008 by Apple Inc.
- *   Copyright 1997-2005 by Easy Software Products, all rights reserved.
- *
- *   These coded instructions, statements, and computer programs are the
- *   property of Apple Inc. and are protected by Federal copyright
- *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
- *   "LICENSE" which should have been included with this file.  If this
- *   file is missing or damaged, see the license at "http://www.cups.org/".
- *
- *   This file is subject to the Apple OS-Developed Software exception.
- *
- * Contents:
- *
- *   main()  - Run the named backend.
- *   usage() - Show usage information.
- */
-
-/*
- * Include necessary headers.
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <cups/string.h>
-#include <cups/cups.h>
-#include <cups/sidechannel.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <errno.h>
-#include <sys/wait.h>
-
-
-/*
- * Local functions...
- */
-
-static void	usage(void);
-
-
-/*
- * 'main()' - Run the named backend.
- *
- * Usage:
- *
- *    betest [-s] [-t] device-uri job-id user title copies options [file]
- */
-
-int					/* O - Exit status */
-main(int  argc,				/* I - Number of command-line args */
-     char *argv[])			/* I - Command-line arguments */
-{
-  int		first_arg,		/* First argument for backend */
-		do_query = 0,		/* Do PostScript query? */
-		do_side_tests = 0,	/* Test side-channel ops? */
-		do_trickle = 0;		/* Trickle data to backend */
-  char		scheme[255],		/* Scheme in URI == backend */
-		backend[1024];		/* Backend path */
-  const char	*serverbin;		/* CUPS_SERVERBIN environment variable */
-  int		back_fds[2],		/* Back-channel pipe */
-		side_fds[2],		/* Side-channel socket */
-		data_fds[2],		/* Data pipe */
-		pid,			/* Process ID */
-		status;			/* Exit status */
-
-
- /*
-  * See if we have side-channel tests to do...
-  */
-
-  for (first_arg = 1;
-       argv[first_arg] && argv[first_arg][0] == '-';
-       first_arg ++)
-    if (!strcmp(argv[first_arg], "-ps"))
-      do_query = 1;
-    else if (!strcmp(argv[first_arg], "-s"))
-      do_side_tests = 1;
-    else if (!strcmp(argv[first_arg], "-t"))
-      do_trickle = 1;
-    else
-      usage();
-
-  argc -= first_arg;
-  if (argc < 6 || argc > 7 || (argc == 7 && do_trickle))
-    usage();
-
- /*
-  * Extract the scheme from the device-uri - that's the program we want to
-  * execute.
-  */
-
-  if (sscanf(argv[first_arg], "%254[^:]", scheme) != 1)
-  {
-    fputs("testbackend: Bad device-uri - no colon!\n", stderr);
-    return (1);
-  }
-
-  if (!access(scheme, X_OK))
-    strlcpy(backend, scheme, sizeof(backend));
-  else
-  {
-    if ((serverbin = getenv("CUPS_SERVERBIN")) == NULL)
-      serverbin = CUPS_SERVERBIN;
-
-    snprintf(backend, sizeof(backend), "%s/backend/%s", serverbin, scheme);
-    if (access(backend, X_OK))
-    {
-      fprintf(stderr, "testbackend: Unknown device scheme \"%s\"!\n", scheme);
-      return (1);
-    }
-  }
-
- /*
-  * Create the back-channel pipe and side-channel socket...
-  */
-
-  open("/dev/null", O_WRONLY);		/* Make sure fd 3 and 4 are used */
-  open("/dev/null", O_WRONLY);
-
-  pipe(back_fds);
-  fcntl(back_fds[0], F_SETFL, fcntl(back_fds[0], F_GETFL) | O_NONBLOCK);
-  fcntl(back_fds[1], F_SETFL, fcntl(back_fds[1], F_GETFL) | O_NONBLOCK);
-
-  socketpair(AF_LOCAL, SOCK_STREAM, 0, side_fds);
-  fcntl(side_fds[0], F_SETFL, fcntl(side_fds[0], F_GETFL) | O_NONBLOCK);
-  fcntl(side_fds[1], F_SETFL, fcntl(side_fds[1], F_GETFL) | O_NONBLOCK);
-
- /*
-  * Execute the trickle process as needed...
-  */
-
-  if (do_trickle || do_query)
-  {
-    pipe(data_fds);
-
-    if ((pid = fork()) == 0)
-    {
-     /*
-      * Trickle/query child comes here...  Rearrange file descriptors so that
-      * FD 
-      */
-
-      close(0);
-      open("/dev/null", O_RDONLY);
-
-      close(1);
-      dup(data_fds[1]);
-      close(data_fds[0]);
-      close(data_fds[1]);
-
-      close(3);
-      dup(back_fds[0]);
-      close(back_fds[0]);
-      close(back_fds[1]);
-
-      close(4);
-      dup(side_fds[0]);
-      close(side_fds[0]);
-      close(side_fds[1]);
-
-      if (do_trickle)
-      {
-       /*
-	* Write 10 spaces, 1 per second...
-	*/
-
-	int i;				/* Looping var */
-
-	for (i = 0; i < 10; i ++)
-	{
-	  write(1, " ", 1);
-	  sleep(1);
-	}
-      }
-      else
-      {
-       /*
-        * Do a simple PostScript query job to get the default page size.
-	*/
-
-        char	buffer[1024];		/* Buffer for response data */
-	ssize_t	bytes;			/* Number of bytes of response data */
-        static const char *ps_query =	/* PostScript query file */
-		"%!\n"
-		"save\n"
-		"currentpagedevice /PageSize get aload pop\n"
-		"2 copy gt {exch} if\n"
-		"(Unknown)\n"
-		"19 dict\n"
-		"dup [612 792] (Letter) put\n"
-		"dup [612 1008] (Legal) put\n"
-		"dup [612 935] (w612h935) put\n"
-		"dup [522 756] (Executive) put\n"
-		"dup [595 842] (A4) put\n"
-		"dup [420 595] (A5) put\n"
-		"dup [499 709] (ISOB5) put\n"
-		"dup [516 728] (B5) put\n"
-		"dup [612 936] (w612h936) put\n"
-		"dup [284 419] (Postcard) put\n"
-		"dup [419.5 567] (DoublePostcard) put\n"
-		"dup [558 774] (w558h774) put\n"
-		"dup [553 765] (w553h765) put\n"
-		"dup [522 737] (w522h737) put\n"
-		"dup [499 709] (EnvISOB5) put\n"
-		"dup [297 684] (Env10) put\n"
-		"dup [459 649] (EnvC5) put\n"
-		"dup [312 624] (EnvDL) put\n"
-		"dup [279 540] (EnvMonarch) put\n"
-		"{ exch aload pop 4 index sub abs 5 le exch\n"
-		"  5 index sub abs 5 le and\n"
-		"  {exch pop exit} {pop} ifelse\n"
-		"} bind forall\n"
-		"= flush pop pop\n"
-		"restore\n"
-		"\004";
-
-
-        write(1, ps_query, strlen(ps_query));
-	write(2, "DEBUG: START\n", 13);
-        while ((bytes = cupsBackChannelRead(buffer, sizeof(buffer), 30.0)) > 0)
-	  write(2, buffer, bytes);
-	write(2, "\nDEBUG: END\n", 12);
-      }
-
-      exit(0);
-    }
-    else if (pid < 0)
-    {
-      perror("testbackend: Unable to fork");
-      return (1);
-    }
-  }
-  else
-    data_fds[0] = data_fds[1] = -1;
-
- /*
-  * Execute the backend...
-  */
-
-  if ((pid = fork()) == 0)
-  {
-   /*
-    * Child comes here...
-    */
-
-    if (do_trickle || do_query)
-    {
-      close(0);
-      dup(data_fds[0]);
-      close(data_fds[0]);
-      close(data_fds[1]);
-    }
-
-    close(3);
-    dup(back_fds[1]);
-    close(back_fds[0]);
-    close(back_fds[1]);
-
-    close(4);
-    dup(side_fds[1]);
-    close(side_fds[0]);
-    close(side_fds[1]);
-
-    execv(backend, argv + first_arg);
-    fprintf(stderr, "textbackend: Unable to execute \"%s\": %s\n", backend,
-            strerror(errno));
-    return (errno);
-  }
-  else if (pid < 0)
-  {
-    perror("testbackend: Unable to fork");
-    return (1);
-  }
-
- /*
-  * Parent comes here, setup back and side channel file descriptors...
-  */
-
-  if (do_trickle || do_query)
-  {
-    close(data_fds[0]);
-    close(data_fds[1]);
-  }
-
-  close(3);
-  dup(back_fds[0]);
-  close(back_fds[0]);
-  close(back_fds[1]);
-
-  close(4);
-  dup(side_fds[0]);
-  close(side_fds[0]);
-  close(side_fds[1]);
-
- /*
-  * Do side-channel tests as needed, then wait for the backend...
-  */
-
-  if (do_side_tests)
-  {
-    int			length;		/* Length of buffer */
-    char		buffer[2049];	/* Buffer for reponse */
-    cups_sc_status_t	scstatus;	/* Status of side-channel command */
-    static const char * const statuses[] =
-    {
-      "CUPS_SC_STATUS_NONE",		/* No status */
-      "CUPS_SC_STATUS_OK",		/* Operation succeeded */
-      "CUPS_SC_STATUS_IO_ERROR",	/* An I/O error occurred */
-      "CUPS_SC_STATUS_TIMEOUT",		/* The backend did not respond */
-      "CUPS_SC_STATUS_NO_RESPONSE",	/* The device did not respond */
-      "CUPS_SC_STATUS_BAD_MESSAGE",	/* The command/response message was invalid */
-      "CUPS_SC_STATUS_TOO_BIG",		/* Response too big */
-      "CUPS_SC_STATUS_NOT_IMPLEMENTED"	/* Command not implemented */
-    };
-
-
-    sleep(2);
-
-    length   = 0;
-    scstatus = cupsSideChannelDoRequest(CUPS_SC_CMD_DRAIN_OUTPUT, buffer,
-                                        &length, 5.0);
-    printf("CUPS_SC_CMD_DRAIN_OUTPUT returned %s\n", statuses[scstatus]);
-
-    length   = 1;
-    scstatus = cupsSideChannelDoRequest(CUPS_SC_CMD_GET_BIDI, buffer,
-                                        &length, 5.0);
-    printf("CUPS_SC_CMD_GET_BIDI returned %s, %d\n", statuses[scstatus], buffer[0]);
-
-    length   = sizeof(buffer) - 1;
-    scstatus = cupsSideChannelDoRequest(CUPS_SC_CMD_GET_DEVICE_ID, buffer,
-                                        &length, 5.0);
-    buffer[length] = '\0';
-    printf("CUPS_SC_CMD_GET_DEVICE_ID returned %s, \"%s\"\n",
-           statuses[scstatus], buffer);
-
-    length   = 1;
-    scstatus = cupsSideChannelDoRequest(CUPS_SC_CMD_GET_STATE, buffer,
-                                        &length, 5.0);
-    printf("CUPS_SC_CMD_GET_STATE returned %s, %02X\n", statuses[scstatus],
-           buffer[0] & 255);
-
-    length   = sizeof(buffer);
-    scstatus = cupsSideChannelSNMPGet(".1.3.6.1.2.1.43.10.2.1.4.1.1", buffer,
-                                      &length, 5.0);
-    printf("CUPS_SC_CMD_SNMP_GET returned %s, %s\n", statuses[scstatus],
-           buffer);
-
-    length   = 0;
-    scstatus = cupsSideChannelDoRequest(CUPS_SC_CMD_SOFT_RESET, buffer,
-                                        &length, 5.0);
-    printf("CUPS_SC_CMD_SOFT_RESET returned %s\n", statuses[scstatus]);
-  }
-
-  while (wait(&status) != pid);
-
-  if (status)
-  {
-    if (WIFEXITED(status))
-      printf("%s exited with status %d!\n", backend, WEXITSTATUS(status));
-    else
-      printf("%s crashed with signal %d!\n", backend, WTERMSIG(status));
-  }
-
- /*
-  * Exit accordingly...
-  */
-
-  return (status != 0);
-}
-
-
-/*
- * 'usage()' - Show usage information.
- */
-
-static void
-usage(void)
-{
-  fputs("Usage: testbackend [-ps] [-s] [-t] device-uri job-id user title copies "
-        "options [file]\n", stderr);
-  exit(1);
-}
-
-
-/*
- * End of "$Id$".
- */
@@ -1,83 +0,0 @@
-/*
- * "$Id$"
- *
- *   SNMP supplies test program for the Common UNIX Printing System (CUPS).
- *
- *   Copyright 2008 by Apple Inc.
- *
- *   These coded instructions, statements, and computer programs are the
- *   property of Apple Inc. and are protected by Federal copyright
- *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
- *   "LICENSE" which should have been included with this file.  If this
- *   file is missing or damaged, see the license at "http://www.cups.org/".
- *
- *   This file is subject to the Apple OS-Developed Software exception.
- *
- * Contents:
- *
- *   main() - Show the supplies state of a printer.
- */
-
-/*
- * Include necessary headers.
- */
-
-#include "backend-private.h"
-
-
-/*
- * 'main()' - Show the supplies state of a printer.
- */
-
-int					/* O - Exit status */
-main(int  argc,				/* I - Number of command-line args */
-     char *argv[])			/* I - Command-line arguments */
-{
-  http_addrlist_t	*host;		/* Host addresses */
-  int			snmp_fd;	/* SNMP socket */
-  int			page_count,	/* Current page count */
-			printer_state;	/* Current printer state */
-
-
-  if (argc != 2)
-  {
-    puts("Usage: testsupplies ip-or-hostname");
-    return (1);
-  }
-
-  if ((host = httpAddrGetList(argv[1], AF_UNSPEC, "9100")) == NULL)
-  {
-    perror(argv[1]);
-    return (1);
-  }
-
-  if ((snmp_fd = _cupsSNMPOpen(host->addr.addr.sa_family)) < 0)
-  {
-    perror(argv[1]);
-    return (1);
-  }
-
-  for (;;)
-  {
-    fputs("backendSNMPSupplies: ", stdout);
-
-    if (backendSNMPSupplies(snmp_fd, &(host->addr), &page_count,
-                            &printer_state))
-    {
-      puts("FAIL");
-      return (1);
-    }
-
-    printf("backendSNMPSupplies: %s (page_count=%d, printer_state=%d)\n",
-	   page_count < 0 || printer_state < CUPS_TC_other ||
-	       printer_state > CUPS_TC_warmup ? "FAIL" : "PASS",
-	   page_count, printer_state);
-
-    sleep(5);
-  }
-}
-
-
-/*
- * End of "$Id$".
- */
@@ -1,819 +0,0 @@
-/*
- * "$Id$"
- *
- *   Libusb interface code for the Common UNIX Printing System (CUPS).
- *
- *   Copyright 2007-2008 by Apple Inc.
- *
- *   These coded instructions, statements, and computer programs are the
- *   property of Apple Inc. and are protected by Federal copyright
- *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
- *   which should have been included with this file.  If this file is
- *   file is missing or damaged, see the license at "http://www.cups.org/".
- *
- * Contents:
- *
- *   list_devices()    - List the available printers.
- *   print_device()    - Print a file to a USB device.
- *   close_device()    - Close the connection to the USB printer.
- *   find_device()     - Find or enumerate USB printers.
- *   get_device_id()   - Get the IEEE-1284 device ID for the printer.
- *   list_cb()         - List USB printers for discovery.
- *   make_device_uri() - Create a device URI for a USB printer.
- *   open_device()     - Open a connection to the USB printer.
- *   print_cb()        - Find a USB printer for printing.
- *   side_cb()         - Handle side-channel requests.
- */
-
-/*
- * Include necessary headers...
- */
-
-#include <usb.h>
-#include <poll.h>
-
-
-/*
- * Local types...
- */
-
-typedef struct usb_printer_s		/**** USB Printer Data ****/
-{
-  struct usb_device	*device;	/* Device info */
-  int			conf,		/* Configuration */
-			iface,		/* Interface */
-			altset,		/* Alternate setting */
-			write_endp,	/* Write endpoint */
-			read_endp;	/* Read endpoint */
-  struct usb_dev_handle	*handle;	/* Open handle to device */
-} usb_printer_t;
-
-typedef int (*usb_cb_t)(usb_printer_t *, const char *, const char *,
-                        const void *);
-
-
-/*
- * Local functions...
- */
-
-static int		close_device(usb_printer_t *printer);
-static usb_printer_t	*find_device(usb_cb_t cb, const void *data);
-static int		get_device_id(usb_printer_t *printer, char *buffer,
-			              size_t bufsize);
-static int		list_cb(usb_printer_t *printer, const char *device_uri,
-			        const char *device_id, const void *data);
-static char		*make_device_uri(usb_printer_t *printer,
-			                 const char *device_id,
-					 char *uri, size_t uri_size);
-static int		open_device(usb_printer_t *printer, int verbose);
-static int		print_cb(usb_printer_t *printer, const char *device_uri,
-			         const char *device_id, const void *data);
-static ssize_t		side_cb(usb_printer_t *printer, int print_fd);
-
-
-/*
- * 'list_devices()' - List the available printers.
- */
-
-void
-list_devices(void)
-{
-  fputs("DEBUG: list_devices\n", stderr);
-  find_device(list_cb, NULL);
-}
-
-
-/*
- * 'print_device()' - Print a file to a USB device.
- */
-
-int					/* O - Exit status */
-print_device(const char *uri,		/* I - Device URI */
-             const char *hostname,	/* I - Hostname/manufacturer */
-             const char *resource,	/* I - Resource/modelname */
-	     char       *options,	/* I - Device options/serial number */
-	     int        print_fd,	/* I - File descriptor to print */
-	     int        copies,		/* I - Copies to print */
-	     int	argc,		/* I - Number of command-line arguments (6 or 7) */
-	     char	*argv[])	/* I - Command-line arguments */
-{
-  usb_printer_t	*printer;		/* Printer */
-  ssize_t	bytes,			/* Bytes read/written */
-		tbytes;			/* Total bytes written */
-  char		buffer[8192];		/* Print data buffer */
-  struct sigaction action;		/* Actions for POSIX signals */
-  struct pollfd	pfds[2];		/* Poll descriptors */
-
-
-  fputs("DEBUG: print_device\n", stderr);
-
- /*
-  * Connect to the printer...
-  */
-
-  while ((printer = find_device(print_cb, uri)) == NULL)
-  {
-    _cupsLangPuts(stderr,
-		  _("INFO: Waiting for printer to become available...\n"));
-    sleep(5);
-  }
-
-
- /*
-  * If we are printing data from a print driver on stdin, ignore SIGTERM
-  * so that the driver can finish out any page data, e.g. to eject the
-  * current page.  We only do this for stdin printing as otherwise there
-  * is no way to cancel a raw print job...
-  */
-
-  if (!print_fd)
-  {
-    memset(&action, 0, sizeof(action));
-
-    sigemptyset(&action.sa_mask);
-    action.sa_handler = SIG_IGN;
-    sigaction(SIGTERM, &action, NULL);
-  }
-
-  tbytes = 0;
-
-  pfds[0].fd     = print_fd;
-  pfds[0].events = POLLIN;
-  pfds[1].fd     = CUPS_SC_FD;
-  pfds[1].events = POLLIN;
-
-  while (copies > 0 && tbytes >= 0)
-  {
-    copies --;
-
-    if (print_fd != 0)
-    {
-      fputs("PAGE: 1 1\n", stderr);
-      lseek(print_fd, 0, SEEK_SET);
-    }
-
-   /*
-    * TODO: Add back-channel support, along with better write error handling.
-    */
-
-    if (poll(pfds, 2, -1) > 0)
-    {
-      if (pfds[0].revents & POLLIN)
-      {
-	if ((bytes = read(print_fd, buffer, sizeof(buffer))) > 0)
-	{
-	  while (usb_bulk_write(printer->handle, printer->write_endp, buffer,
-	                        bytes, 45000) < 0)
-	  {
-	    _cupsLangPrintf(stderr,
-			    _("ERROR: Unable to write %d bytes to printer!\n"),
-			    (int)bytes);
-	    tbytes = -1;
-	    break;
-	  }
-
-	  tbytes += bytes;
-	}
-	else if (bytes < 0 && errno != EAGAIN && errno != EINTR)
-	  break;
-      }
-
-      if (pfds[1].revents & POLLIN)
-        tbytes += side_cb(printer, print_fd);
-    }
-  }
-
- /*
-  * Close our connection and return...
-  */
-
-  close_device(printer);
-
-  return (CUPS_BACKEND_OK);
-}
-
-
-/*
- * 'close_device()' - Close the connection to the USB printer.
- */
-
-static int				/* I - 0 on success, -1 on failure */
-close_device(usb_printer_t *printer)	/* I - Printer */
-{
-  if (printer->handle)
-  {
-   /*
-    * Release interfaces before closing so that we know all data is written
-    * to the device...
-    */
-
-    int number = printer->device->config[printer->conf].
-                     interface[printer->iface].
-		     altsetting[printer->altset].bInterfaceNumber;
-    usb_release_interface(printer->handle, number);
-
-    if (number != 0)
-      usb_release_interface(printer->handle, 0);
-
-   /*
-    * Close the interface and return...
-    */
-
-    usb_close(printer->handle);
-    printer->handle = NULL;
-  }
-
-  return (0);
-}
-
-
-/*
- * 'find_device()' - Find or enumerate USB printers.
- */
-
-static usb_printer_t *			/* O - Found printer */
-find_device(usb_cb_t   cb,		/* I - Callback function */
-            const void *data)		/* I - User data for callback */
-{
-  struct usb_bus	*bus;		/* Current bus */
-  struct usb_device	*device;	/* Current device */
-  struct usb_config_descriptor *confptr;/* Pointer to current configuration */
-  struct usb_interface	*ifaceptr;	/* Pointer to current interface */
-  struct usb_interface_descriptor *altptr;
-					/* Pointer to current alternate setting */
-  struct usb_endpoint_descriptor *endpptr;
-					/* Pointer to current endpoint */
-  int			conf,		/* Current configuration */
-			iface,		/* Current interface */
-			altset,		/* Current alternate setting */
-			protocol,	/* Current protocol */
-			endp,		/* Current endpoint */
-			read_endp,	/* Current read endpoint */
-			write_endp;	/* Current write endpoint */
-  char			device_id[1024],/* IEEE-1284 device ID */
-			device_uri[1024];
-					/* Device URI */
-  static usb_printer_t	printer;	/* Current printer */
-
-
- /*
-  * Initialize libusb...
-  */
-
-  usb_init();
-  fprintf(stderr, "DEBUG: usb_find_busses=%d\n", usb_find_busses());
-  fprintf(stderr, "DEBUG: usb_find_devices=%d\n", usb_find_devices());
-
- /*
-  * Then loop through the devices it found...
-  */
-
-  for (bus = usb_get_busses(); bus; bus = bus->next)
-    for (device = bus->devices; device; device = device->next)
-    {
-     /*
-      * Ignore devices with no configuration data and anything that is not
-      * a printer...
-      */
-
-      if (!device->config || !device->descriptor.idVendor ||
-          !device->descriptor.idProduct)
-	continue;
-
-      for (conf = 0, confptr = device->config;
-           conf < device->descriptor.bNumConfigurations;
-	   conf ++, confptr ++)
-        for (iface = 0, ifaceptr = confptr->interface;
-	     iface < confptr->bNumInterfaces;
-	     iface ++, ifaceptr ++)
-        {
-	 /*
-	  * Some printers offer multiple interfaces...
-	  */
-
-          protocol   = 0;
-
-	  for (altset = 0, altptr = ifaceptr->altsetting;
-	       altset < ifaceptr->num_altsetting;
-	       altset ++, altptr ++)
-          {
-	   /*
-	    * Currently we only support unidirectional and bidirectional
-	    * printers.  Future versions of this code will support the
-	    * 1284.4 (packet mode) protocol as well.
-	    */
-
-	    if (altptr->bInterfaceClass != USB_CLASS_PRINTER ||
-	        altptr->bInterfaceSubClass != 1 ||
-		(altptr->bInterfaceProtocol != 1 &&	/* Unidirectional */
-		 altptr->bInterfaceProtocol != 2) ||	/* Bidirectional */
-		altptr->bInterfaceProtocol < protocol)
-	      continue;
-
-	    read_endp  = -1;
-	    write_endp = -1;
-
-	    for (endp = 0, endpptr = altptr->endpoint;
-	         endp < altptr->bNumEndpoints;
-		 endp ++, endpptr ++)
-              if ((endpptr->bmAttributes & USB_ENDPOINT_TYPE_MASK) ==
-	              USB_ENDPOINT_TYPE_BULK)
-	      {
-	        if (endpptr->bEndpointAddress & USB_ENDPOINT_DIR_MASK)
-		  read_endp = endp;
-		else
-		  write_endp = endp;
-	      }
-
-            if (write_endp >= 0)
-	    {
-	     /*
-	      * Save the best match so far...
-	      */
-
-              protocol           = altptr->bInterfaceProtocol;
-	      printer.altset     = altset;
-	      printer.write_endp = write_endp;
-	      printer.read_endp  = read_endp;
-	    }
-	  }
-
-	  if (protocol > 0)
-	  {
-	    printer.device = device;
-	    printer.conf   = conf;
-	    printer.iface  = iface;
-	    printer.handle = NULL;
-
-            if (!open_device(&printer, data != NULL))
-	    {
-	      if (!get_device_id(&printer, device_id, sizeof(device_id)))
-	      {
-                make_device_uri(&printer, device_id, device_uri,
-		                sizeof(device_uri));
-
-	        if ((*cb)(&printer, device_uri, device_id, data))
-		{
-		  printer.read_endp  = printer.device->config[printer.conf].
-				           interface[printer.iface].
-					   altsetting[printer.altset].
-					   endpoint[printer.read_endp].
-					   bEndpointAddress;
-		  printer.write_endp = printer.device->config[printer.conf].
-					   interface[printer.iface].
-					   altsetting[printer.altset].
-					   endpoint[printer.write_endp].
-					   bEndpointAddress;
-		  return (&printer);
-		}
-              }
-
-              close_device(&printer);
-	    }
-	  }
-	}
-    }
-
- /*
-  * If we get this far without returning, then we haven't found a printer
-  * to print to...
-  */
-
-  return (NULL);
-}
-
-
-/*
- * 'get_device_id()' - Get the IEEE-1284 device ID for the printer.
- */
-
-static int				/* O - 0 on success, -1 on error */
-get_device_id(usb_printer_t *printer,	/* I - Printer */
-              char          *buffer,	/* I - String buffer */
-              size_t        bufsize)	/* I - Number of bytes in buffer */
-{
-  int	length;				/* Length of device ID */
-
-
-  if (usb_control_msg(printer->handle,
-                      USB_TYPE_CLASS | USB_ENDPOINT_IN | USB_RECIP_INTERFACE,
-		      0, printer->conf, printer->iface,
-		      buffer, bufsize, 5000) < 0)
-  {
-    *buffer = '\0';
-    return (-1);
-  }
-
- /*
-  * Extract the length of the device ID string from the first two
-  * bytes.  The 1284 spec says the length is stored MSB first...
-  */
-
-  length = (((unsigned)buffer[0] & 255) << 8) +
-	   ((unsigned)buffer[1] & 255);
-
- /*
-  * Check to see if the length is larger than our buffer; first
-  * assume that the vendor incorrectly implemented the 1284 spec,
-  * and then limit the length to the size of our buffer...
-  */
-
-  if (length > (bufsize - 2))
-    length = (((unsigned)buffer[1] & 255) << 8) +
-	     ((unsigned)buffer[0] & 255);
-
-  if (length > (bufsize - 2))
-    length = bufsize - 2;
-
- /*
-  * Copy the device ID text to the beginning of the buffer and
-  * nul-terminate.
-  */
-
-  memmove(buffer, buffer + 2, length);
-  buffer[length] = '\0';
-
-  return (0);
-}
-
-
-/*
- * 'list_cb()' - List USB printers for discovery.
- */
-
-static int				/* O - 0 to continue, 1 to stop */
-list_cb(usb_printer_t *printer,		/* I - Printer */
-        const char    *device_uri,	/* I - Device URI */
-        const char    *device_id,	/* I - IEEE-1284 device ID */
-        const void    *data)		/* I - User data (not used) */
-{
-  char	make_model[1024];		/* Make and model */
-
-
- /*
-  * Get the device URI and make/model strings...
-  */
-
-  backendGetMakeModel(device_id, make_model, sizeof(make_model));
-
- /*
-  * Report the printer...
-  */
-
-  cupsBackendReport("direct", device_uri, make_model, make_model, device_id,
-                    NULL);
-
- /*
-  * Keep going...
-  */
-
-  return (0);
-}
-
-
-/*
- * 'make_device_uri()' - Create a device URI for a USB printer.
- */
-
-static char *				/* O - Device URI */
-make_device_uri(
-    usb_printer_t *printer,		/* I - Printer */
-    const char    *device_id,		/* I - IEEE-1284 device ID */
-    char          *uri,			/* I - Device URI buffer */
-    size_t        uri_size)		/* I - Size of device URI buffer */
-{
-  char		options[1024];		/* Device URI options */
-  int		num_values;		/* Number of 1284 parameters */
-  cups_option_t	*values;		/* 1284 parameters */
-  const char	*mfg,			/* Manufacturer */
-		*mdl,			/* Model */
-		*des,			/* Description */
-		*sern;			/* Serial number */
-  char		tempmfg[256],		/* Temporary manufacturer string */
-		tempsern[256],		/* Temporary serial number string */
-		*tempptr;		/* Pointer into temp string */
-
-
- /*
-  * Get the make, model, and serial numbers...
-  */
-
-  num_values = _ppdGet1284Values(device_id, &values);
-
-  if ((sern = cupsGetOption("SERIALNUMBER", num_values, values)) == NULL)
-    if ((sern = cupsGetOption("SERN", num_values, values)) == NULL)
-      if ((sern = cupsGetOption("SN", num_values, values)) == NULL)
-      {
-       /*
-        * Try getting the serial number from the device itself...
-	*/
-
-        int length = usb_get_string_simple(printer->handle,
-	                                   printer->device->descriptor.
-					       iSerialNumber,
-				           tempsern, sizeof(tempsern) - 1);
-        if (length > 0)
-	{
-	  tempsern[length] = '\0';
-	  sern             = tempsern;
-	}
-      }
-
-  if ((mfg = cupsGetOption("MANUFACTURER", num_values, values)) == NULL)
-    mfg = cupsGetOption("MFG", num_values, values);
-
-  if ((mdl = cupsGetOption("MODEL", num_values, values)) == NULL)
-    mdl = cupsGetOption("MDL", num_values, values);
-
-#ifdef __APPLE__
- /*
-  * To maintain compatibility with the original IOKit-based backend on Mac OS X,
-  * don't map manufacturer names...
-  */
-
-  if (!mfg)
-
-#else
- /*
-  * To maintain compatibility with the original character device backend on
-  * Linux and *BSD, map manufacturer names...
-  */
-
-  if (mfg)
-  {
-    if (!strcasecmp(mfg, "Hewlett-Packard"))
-      mfg = "HP";
-    else if (!strcasecmp(mfg, "Lexmark International"))
-      mfg = "Lexmark";
-  }
-  else
-#endif /* __APPLE__ */
-  {
-   /*
-    * No manufacturer?  Use the model string or description...
-    */
-
-    if (mdl)
-      _ppdNormalizeMakeAndModel(mdl, tempmfg, sizeof(tempmfg));
-    else if ((des = cupsGetOption("DESCRIPTION", num_values, values)) != NULL ||
-             (des = cupsGetOption("DES", num_values, values)) != NULL)
-      _ppdNormalizeMakeAndModel(des, tempmfg, sizeof(tempmfg));
-    else
-      strlcpy(tempmfg, "Unknown", sizeof(tempmfg));
-
-    if ((tempptr = strchr(tempmfg, ' ')) != NULL)
-      *tempptr = '\0';
-
-    mfg = tempmfg;
-  }
-
- /*
-  * Generate the device URI from the manufacturer, model, serial number,
-  * and interface number...
-  */
-
-  if (sern)
-  {
-    if (printer->iface > 0)
-      snprintf(options, sizeof(options), "?serial=%s&interface=%d", sern,
-               printer->iface);
-    else
-      snprintf(options, sizeof(options), "?serial=%s", sern);
-  }
-  else if (printer->iface > 0)
-    snprintf(options, sizeof(options), "?interface=%d", printer->iface);
-  else
-    options[0] = '\0';
-
-  httpAssembleURIf(HTTP_URI_CODING_ALL, uri, uri_size, "usb", NULL, mfg, 0,
-		   "/%s%s", mdl, options);
-
-  cupsFreeOptions(num_values, values);
-
-  return (uri);
-}
-
-
-/*
- * 'open_device()' - Open a connection to the USB printer.
- */
-
-static int				/* O - 0 on success, -1 on error */
-open_device(usb_printer_t *printer,	/* I - Printer */
-            int           verbose)	/* I - Update connecting-to-device state? */
-{
-  int	number;				/* Configuration/interface/altset numbers */
-
-
- /*
-  * Return immediately if we are already connected...
-  */
-
-  if (printer->handle)
-    return (0);
-
- /*
-  * Try opening the printer...
-  */
-
-  if ((printer->handle = usb_open(printer->device)) == NULL)
-    return (-1);
-
- /*
-  * Then set the desired configuration...
-  */
-
-  if (verbose)
-    fputs("STATE: +connecting-to-device\n", stderr);
-
-  number = printer->device->config[printer->conf].bConfigurationValue;
-
-  if (usb_set_configuration(printer->handle, number) < 0)
-  {
-   /*
-    * If the set fails, chances are that the printer only supports a
-    * single configuration.  Technically these printers don't conform to
-    * the USB printer specification, but otherwise they'll work...
-    */
-
-    if (errno != EBUSY)
-      fprintf(stderr, "DEBUG: Failed to set configuration %d for %04x:%04x\n",
-              number, printer->device->descriptor.idVendor,
-	      printer->device->descriptor.idProduct);
-  }
-
- /*
-  * Claim interfaces as needed...
-  */
-
-  number = printer->device->config[printer->conf].interface[printer->iface].
-               altsetting[printer->altset].bInterfaceNumber;
-  while (usb_claim_interface(printer->handle, number) < 0)
-  {
-    if (errno != EBUSY)
-      fprintf(stderr, "DEBUG: Failed to claim interface %d for %04x:%04x: %s\n",
-              number, printer->device->descriptor.idVendor,
-	      printer->device->descriptor.idProduct, strerror(errno));
-
-    goto error;
-  }
-
-  if (number != 0)
-    while (usb_claim_interface(printer->handle, 0) < 0)
-    {
-      if (errno != EBUSY)
-	fprintf(stderr, "DEBUG: Failed to claim interface 0 for %04x:%04x: %s\n",
-		printer->device->descriptor.idVendor,
-		printer->device->descriptor.idProduct, strerror(errno));
-
-      goto error;
-    }
-
- /*
-  * Set alternate setting...
-  */
-
-  number = printer->device->config[printer->conf].interface[printer->iface].
-               altsetting[printer->altset].bAlternateSetting;
-  while (usb_set_altinterface(printer->handle, number) < 0)
-  {
-    if (errno != EBUSY)
-      fprintf(stderr,
-              "DEBUG: Failed to set alternate interface %d for %04x:%04x: %s\n",
-              number, printer->device->descriptor.idVendor,
-	      printer->device->descriptor.idProduct, strerror(errno));
-
-    goto error;
-  }
-
-  if (verbose)
-    fputs("STATE: -connecting-to-device\n", stderr);
-
-  return (0);
-
- /*
-  * If we get here, there was a hard error...
-  */
-
-  error:
-
-  if (verbose)
-    fputs("STATE: -connecting-to-device\n", stderr);
-
-  usb_close(printer->handle);
-  printer->handle = NULL;
-
-  return (-1);
-}
-
-
-/*
- * 'print_cb()' - Find a USB printer for printing.
- */
-
-static int				/* O - 0 to continue, 1 to stop (found) */
-print_cb(usb_printer_t *printer,	/* I - Printer */
-         const char    *device_uri,	/* I - Device URI */
-         const char    *device_id,	/* I - IEEE-1284 device ID */
-         const void    *data)		/* I - User data (make, model, S/N) */
-{
-  return (!strcmp((char *)data, device_uri));
-}
-
-
-/*
- * 'side_cb()' - Handle side-channel requests.
- */
-
-static ssize_t				/* O - Number of bytes written */
-side_cb(usb_printer_t *printer,		/* I - Printer */
-        int           print_fd)		/* I - File to print */
-{
-  ssize_t		bytes,		/* Bytes read/written */
-			tbytes;		/* Total bytes written */
-  char			buffer[8192];	/* Print data buffer */
-  struct pollfd		pfd;		/* Poll descriptor */
-  cups_sc_command_t	command;	/* Request command */
-  cups_sc_status_t	status;		/* Request/response status */
-  char			data[2048];	/* Request/response data */
-  int			datalen;	/* Request/response data size */
-
-
-  tbytes  = 0;
-  datalen = sizeof(data);
-
-  if (cupsSideChannelRead(&command, &status, data, &datalen, 1.0))
-  {
-    _cupsLangPuts(stderr, _("WARNING: Failed to read side-channel request!\n"));
-    return (0);
-  }
-
-  switch (command)
-  {
-    case CUPS_SC_CMD_DRAIN_OUTPUT :
-	pfd.fd     = print_fd;
-	pfd.events = POLLIN;
-
-	while (poll(&pfd, 1, 1000) > 0)
-	{
-	  if ((bytes = read(print_fd, buffer, sizeof(buffer))) > 0)
-	  {
-	    while (usb_bulk_write(printer->handle, printer->write_endp, buffer,
-				  bytes, 5000) < 0)
-	    {
-	      _cupsLangPrintf(stderr,
-			      _("ERROR: Unable to write %d bytes to printer!\n"),
-			      (int)bytes);
-	      tbytes = -1;
-	      break;
-	    }
-
-	    tbytes += bytes;
-	  }
-	  else if (bytes < 0 && errno != EAGAIN && errno != EINTR)
-	    break;
-        }
-
-        if (tbytes < 0)
-	  status = CUPS_SC_STATUS_IO_ERROR;
-	else
-	  status = CUPS_SC_STATUS_OK;
-
-	datalen = 0;
-        break;
-
-    case CUPS_SC_CMD_GET_BIDI :
-	status  = CUPS_SC_STATUS_OK;
-        data[0] = 0;			/* TODO: Change to 1 when read supported */
-        datalen = 1;
-        break;
-
-    case CUPS_SC_CMD_GET_DEVICE_ID :
-	if (get_device_id(printer, data, sizeof(data)))
-        {
-	  status  = CUPS_SC_STATUS_IO_ERROR;
-	  datalen = 0;
-	}
-	else
-        {
-	  status  = CUPS_SC_STATUS_OK;
-	  datalen = strlen(data);
-	}
-        break;
-
-    default :
-        status  = CUPS_SC_STATUS_NOT_IMPLEMENTED;
-	datalen = 0;
-	break;
-  }
-
-  cupsSideChannelWrite(command, status, data, datalen, 1.0);
-
-  return (tbytes);
-}
-
-
-/*
- * End of "$Id$".
- */
-
@@ -5,14 +5,23 @@
 *
 *   This file is included from "usb.c" when compiled on UNIX/Linux.
 *
- *   Copyright 2007-2008 by Apple Inc.
- *   Copyright 1997-2007 by Easy Software Products, all rights reserved.
+ *   Copyright 1997-2006 by Easy Software Products, all rights reserved.
 *
 *   These coded instructions, statements, and computer programs are the
- *   property of Apple Inc. and are protected by Federal copyright
- *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   property of Easy Software Products and are protected by Federal
+ *   copyright law.  Distribution and use rights are outlined in the file
 *   "LICENSE" which should have been included with this file.  If this
- *   file is missing or damaged, see the license at "http://www.cups.org/".
+ *   file is missing or damaged please contact Easy Software Products
+ *   at:
+ *
+ *       Attn: CUPS Licensing Information
+ *       Easy Software Products
+ *       44141 Airport View Drive, Suite 204
+ *       Hollywood, Maryland 20636 USA
+ *
+ *       Voice: (301) 373-9600
+ *       EMail: cups-info@cups.org
+ *         WWW: http://www.cups.org
 *
 *   This file is subject to the Apple OS-Developed Software exception.
 *
@@ -21,13 +30,13 @@
 *   print_device() - Print a file to a USB device.
 *   list_devices() - List all USB devices.
 *   open_device()  - Open a USB device...
- *   side_cb()      - Handle side-channel requests...
 */

 /*
 * Include necessary headers.
 */

+#include "ieee1284.c"
 #include <sys/select.h>


@@ -35,9 +44,7 @@
 * Local functions...
 */

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


 /*
@@ -48,7 +55,7 @@ int					/* O - Exit status */
 print_device(const char *uri,		/* I - Device URI */
             const char *hostname,	/* I - Hostname/manufacturer */
             const char *resource,	/* I - Resource/modelname */
-	     char       *options,	/* I - Device options/serial number */
+	     const char *options,	/* I - Device options/serial number */
 	     int        print_fd,	/* I - File descriptor to print */
 	     int        copies,		/* I - Copies to print */
 	     int	argc,		/* I - Number of command-line arguments (6 or 7) */
@@ -71,36 +78,13 @@ print_device(const char *uri,		/* I - Device URI */

  do
  {
-#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
   /*
-    * *BSD's ulpt driver currently does not support the
-    * back-channel, incorrectly returns data ready on a select(),
-    * and locks up on read()...
+    * Disable backchannel data when printing to Canon USB printers - apparently
+    * Canon printers will return the IEEE-1284 device ID over and over and over
+    * when they get a read request...
    */

-    use_bc = 0;
-
-#elif defined(__sun)
-   /*
-    * CUPS STR #3028: Solaris' usbprn driver apparently does not support
-    * select() or poll(), so we can't support backchannel...
-    */
-
-    use_bc = 0;
-
-#else
-   /*
-    * Disable backchannel data when printing to Brother, Canon, or
-    * Minolta USB printers - apparently these printers will return
-    * the IEEE-1284 device ID over and over and over when they get
-    * a read request...
-    */
-
-    use_bc = strcasecmp(hostname, "Brother") &&
-             strcasecmp(hostname, "Canon") &&
-             strncasecmp(hostname, "Konica", 6) &&
-             strncasecmp(hostname, "Minolta", 7);
-#endif /* __FreeBSD__ || __NetBSD__ || __OpenBSD__ || __DragonFly__ */
+    use_bc = strcasecmp(hostname, "Canon") != 0;

    if ((device_fd = open_device(uri, &use_bc)) == -1)
    {
@@ -113,9 +97,8 @@ print_device(const char *uri,		/* I - Device URI */
 	* available printer in the class.
 	*/

-        _cupsLangPuts(stderr,
-	              _("INFO: Unable to contact printer, queuing on next "
-			"printer in class...\n"));
+        fputs("INFO: Unable to open USB device, queuing on next printer in class...\n",
+	      stderr);

       /*
        * Sleep 5 seconds to keep the job from requeuing too rapidly...
@@ -128,23 +111,19 @@ print_device(const char *uri,		/* I - Device URI */

      if (errno == EBUSY)
      {
-        _cupsLangPuts(stderr,
-	              _("INFO: Printer busy; will retry in 10 seconds...\n"));
-	sleep(10);
+        fputs("INFO: USB port busy; will retry in 30 seconds...\n", stderr);
+	sleep(30);
      }
      else if (errno == ENXIO || errno == EIO || errno == ENOENT ||
               errno == ENODEV)
      {
-        _cupsLangPuts(stderr,
-	              _("INFO: Printer not connected; will retry in 30 "
-		        "seconds...\n"));
+        fputs("INFO: Printer not connected; will retry in 30 seconds...\n", stderr);
 	sleep(30);
      }
      else
      {
-	_cupsLangPrintf(stderr,
-	                _("ERROR: Unable to open device file \"%s\": %s\n"),
-			resource, strerror(errno));
+	fprintf(stderr, "ERROR: Unable to open USB device \"%s\": %s\n",
+	        uri, strerror(errno));
 	return (CUPS_BACKEND_FAILED);
      }
    }
@@ -181,26 +160,11 @@ print_device(const char *uri,		/* I - Device URI */
      lseek(print_fd, 0, SEEK_SET);
    }

-#ifdef __sun
-   /*
-    * CUPS STR #3028: Solaris' usbprn driver apparently does not support
-    * select() or poll(), so we can't support the sidechannel either...
-    */
-
-    tbytes = backendRunLoop(print_fd, device_fd, -1, NULL, use_bc, NULL);
-
-#else
-    tbytes = backendRunLoop(print_fd, device_fd, -1, NULL, use_bc, side_cb);
-#endif /* __sun */
+    tbytes = backendRunLoop(print_fd, device_fd, use_bc);

    if (print_fd != 0 && tbytes >= 0)
-      _cupsLangPrintf(stderr,
-#ifdef HAVE_LONG_LONG
-		      _("INFO: Sent print file, %lld bytes...\n"),
-#else
-		      _("INFO: Sent print file, %ld bytes...\n"),
-#endif /* HAVE_LONG_LONG */
-		      CUPS_LLCAST tbytes);
+      fprintf(stderr, "INFO: Sent print file, " CUPS_LLFMT " bytes...\n",
+	      CUPS_LLCAST tbytes);
  }

 /*
@@ -221,53 +185,44 @@ void
 list_devices(void)
 {
 #ifdef __linux
-  int	i;				/* Looping var */
-  int	fd;				/* File descriptor */
-  char	device[255],			/* Device filename */
-	device_id[1024],		/* Device ID string */
-	device_uri[1024],		/* Device URI string */
-	make_model[1024];		/* Make and model */
+  int	i;			/* Looping var */
+  int	fd;			/* File descriptor */
+  char	format[255],		/* Format for device filename */
+	device[255],		/* Device filename */
+	device_id[1024],	/* Device ID string */
+	device_uri[1024],	/* Device URI string */
+	make_model[1024];	/* Make and model */


 /*
-  * Try to open each USB device...
+  * First figure out which USB printer filename to use...
+  */
+
+  if (!access("/dev/usblp0", 0))
+    strcpy(format, "/dev/usblp%d");
+  else if (!access("/dev/usb/usblp0", 0))
+    strcpy(format, "/dev/usb/usblp%d");
+  else
+    strcpy(format, "/dev/usb/lp%d");
+
+ /*
+  * Then open each USB device...
  */

  for (i = 0; i < 16; i ++)
  {
-   /*
-    * Linux has a long history of changing the standard filenames used
-    * for USB printer devices.  We get the honor of trying them all...
-    */
+    sprintf(device, format, i);

-    sprintf(device, "/dev/usblp%d", i);
-
-    if ((fd = open(device, O_RDWR | O_EXCL)) < 0)
+    if ((fd = open(device, O_RDWR | O_EXCL)) >= 0)
    {
-      if (errno != ENOENT)
-	continue;
+      if (!backendGetDeviceID(fd, device_id, sizeof(device_id),
+                              make_model, sizeof(make_model),
+			      "usb", device_uri, sizeof(device_uri)))
+	printf("direct %s \"%s\" \"%s USB #%d\" \"%s\"\n", device_uri,
+	       make_model, make_model, i + 1, device_id);

-      sprintf(device, "/dev/usb/lp%d", i);
-
-      if ((fd = open(device, O_RDWR | O_EXCL)) < 0)
-      {
-	if (errno != ENOENT)
-	  continue;
-
-	sprintf(device, "/dev/usb/usblp%d", i);
-
-    	if ((fd = open(device, O_RDWR | O_EXCL)) < 0)
-	  continue;
-      }
+      close(fd);
    }
-
-    if (!backendGetDeviceID(fd, device_id, sizeof(device_id),
-                            make_model, sizeof(make_model),
-			    "usb", device_uri, sizeof(device_uri)))
-      cupsBackendReport("direct", device_uri, make_model, make_model,
-                        device_id, NULL);
-
-    close(fd);
  }
 #elif defined(__sgi)
 #elif defined(__sun) && defined(ECPPIOC_GETDEVID)
@@ -292,15 +247,15 @@ list_devices(void)
      if (!backendGetDeviceID(fd, device_id, sizeof(device_id),
                              make_model, sizeof(make_model),
 			      "usb", device_uri, sizeof(device_uri)))
-	cupsBackendReport("direct", device_uri, make_model, make_model,
-			  device_id, NULL);
+	printf("direct %s \"%s\" \"%s USB #%d\" \"%s\"\n", device_uri,
+	       make_model, make_model, i + 1, device_id);

      close(fd);
    }
  }
 #elif defined(__hpux)
 #elif defined(__osf)
-#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) || defined(__FreeBSD_kernel__)
+#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
  int   i;                      /* Looping var */
  char  device[255];            /* Device filename */

@@ -323,7 +278,7 @@ list_devices(void)
 * 'open_device()' - Open a USB device...
 */

-static int				/* O - File descriptor or -1 on error */
+int					/* O - File descriptor or -1 on error */
 open_device(const char *uri,		/* I - Device URI */
            int        *use_bc)		/* O - Set to 0 for unidirectional */
 {
@@ -354,41 +309,35 @@ open_device(const char *uri,		/* I - Device URI */

    int		i;			/* Looping var */
    int		busy;			/* Are any ports busy? */
-    char	device[255],		/* Device filename */
+    char	format[255],		/* Format for device filename */
+		device[255],		/* Device filename */
 		device_id[1024],	/* Device ID string */
 		make_model[1024],	/* Make and model */
 		device_uri[1024];	/* Device URI string */


   /*
-    * Find the correct USB device...
+    * First figure out which USB printer filename to use...
    */

-    for (;;)
+    if (!access("/dev/usblp0", 0))
+      strcpy(format, "/dev/usblp%d");
+    else if (!access("/dev/usb/usblp0", 0))
+      strcpy(format, "/dev/usb/usblp%d");
+    else
+      strcpy(format, "/dev/usb/lp%d");
+
+   /*
+    * Then find the correct USB device...
+    */
+
+    do
    {
      for (busy = 0, i = 0; i < 16; i ++)
      {
-       /*
-	* Linux has a long history of changing the standard filenames used
-	* for USB printer devices.  We get the honor of trying them all...
-	*/
+	sprintf(device, format, i);

-	sprintf(device, "/dev/usblp%d", i);
-
-	if ((fd = open(device, O_RDWR | O_EXCL)) < 0 && errno == ENOENT)
-	{
-	  sprintf(device, "/dev/usb/lp%d", i);
-
-	  if ((fd = open(device, O_RDWR | O_EXCL)) < 0 && errno == ENOENT)
-	  {
-	    sprintf(device, "/dev/usb/usblp%d", i);
-
-    	    if ((fd = open(device, O_RDWR | O_EXCL)) < 0 && errno == ENOENT)
-	      continue;
-	  }
-	}
-
-	if (fd >= 0)
+	if ((fd = open(device, O_RDWR | O_EXCL)) >= 0)
 	{
 	  backendGetDeviceID(fd, device_id, sizeof(device_id),
                             make_model, sizeof(make_model),
@@ -413,8 +362,7 @@ open_device(const char *uri,		/* I - Device URI */
 	  * Yes, return this file descriptor...
 	  */

-	  fprintf(stderr, "DEBUG: Printer using device file \"%s\"...\n",
-		  device);
+	  fprintf(stderr, "DEBUG: Printer using device file \"%s\"...\n", device);

 	  return (fd);
 	}
@@ -433,11 +381,21 @@ open_device(const char *uri,		/* I - Device URI */
      */

      if (busy)
-	_cupsLangPuts(stderr,
-	              _("INFO: Printer busy; will retry in 5 seconds...\n"));
-
-      sleep(5);
+      {
+	fputs("INFO: USB printer is busy; will retry in 5 seconds...\n",
+	      stderr);
+	sleep(5);
+      }
    }
+    while (busy);
+
+   /*
+    * Couldn't find the printer, return "no such device or address"...
+    */
+
+    errno = ENODEV;
+
+    return (-1);
  }
 #elif defined(__sun) && defined(ECPPIOC_GETDEVID)
  {
@@ -517,8 +475,8 @@ open_device(const char *uri,		/* I - Device URI */

      if (busy)
      {
-	_cupsLangPuts(stderr,
-	              _("INFO: Printer is busy; will retry in 5 seconds...\n"));
+	fputs("INFO: USB printer is busy; will retry in 5 seconds...\n",
+	      stderr);
 	sleep(5);
      }
    }
@@ -534,12 +492,7 @@ open_device(const char *uri,		/* I - Device URI */
  }
 #else
  {
-    if (*use_bc)
-      fd = open(uri + 4, O_RDWR | O_EXCL);
-    else
-      fd = -1;
-
-    if (fd < 0)
+    if ((fd = open(uri + 4, O_RDWR | O_EXCL)) < 0)
    {
      fd      = open(uri + 4, O_WRONLY | O_EXCL);
      *use_bc = 0;
@@ -556,79 +509,6 @@ open_device(const char *uri,		/* I - Device URI */
 }


-/*
- * 'side_cb()' - Handle side-channel requests...
- */
-
-static void
-side_cb(int         print_fd,		/* I - Print file */
-        int         device_fd,		/* I - Device file */
-        int         snmp_fd,		/* I - SNMP socket (unused) */
-	http_addr_t *addr,		/* I - Device address (unused) */
-	int         use_bc)		/* I - Using back-channel? */
-{
-  cups_sc_command_t	command;	/* Request command */
-  cups_sc_status_t	status;		/* Request/response status */
-  char			data[2048];	/* Request/response data */
-  int			datalen;	/* Request/response data size */
-
-
-  (void)snmp_fd;
-  (void)addr;
-
-  datalen = sizeof(data);
-
-  if (cupsSideChannelRead(&command, &status, data, &datalen, 1.0))
-  {
-    _cupsLangPuts(stderr, _("WARNING: Failed to read side-channel request!\n"));
-    return;
-  }
-
-  switch (command)
-  {
-    case CUPS_SC_CMD_DRAIN_OUTPUT :
-        if (backendDrainOutput(print_fd, device_fd))
-	  status = CUPS_SC_STATUS_IO_ERROR;
-	else if (tcdrain(device_fd))
-	  status = CUPS_SC_STATUS_IO_ERROR;
-	else
-	  status = CUPS_SC_STATUS_OK;
-
-	datalen = 0;
-        break;
-
-    case CUPS_SC_CMD_GET_BIDI :
-	status  = CUPS_SC_STATUS_OK;
-        data[0] = use_bc;
-        datalen = 1;
-        break;
-
-    case CUPS_SC_CMD_GET_DEVICE_ID :
-        memset(data, 0, sizeof(data));
-
-        if (backendGetDeviceID(device_fd, data, sizeof(data) - 1,
-	                       NULL, 0, NULL, NULL, 0))
-        {
-	  status  = CUPS_SC_STATUS_NOT_IMPLEMENTED;
-	  datalen = 0;
-	}
-	else
-        {
-	  status  = CUPS_SC_STATUS_OK;
-	  datalen = strlen(data);
-	}
-        break;
-
-    default :
-        status  = CUPS_SC_STATUS_NOT_IMPLEMENTED;
-	datalen = 0;
-	break;
-  }
-
-  cupsSideChannelWrite(command, status, data, datalen, 1.0);
-}
-
-
 /*
 * End of "$Id$".
 */
@@ -3,14 +3,23 @@
 *
 *   USB port backend for the Common UNIX Printing System (CUPS).
 *
- *   Copyright 2007-2008 by Apple Inc.
- *   Copyright 1997-2007 by Easy Software Products, all rights reserved.
+ *   Copyright 1997-2006 by Easy Software Products, all rights reserved.
 *
 *   These coded instructions, statements, and computer programs are the
- *   property of Apple Inc. and are protected by Federal copyright
- *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   property of Easy Software Products and are protected by Federal
+ *   copyright law.  Distribution and use rights are outlined in the file
 *   "LICENSE" which should have been included with this file.  If this
- *   file is missing or damaged, see the license at "http://www.cups.org/".
+ *   file is missing or damaged please contact Easy Software Products
+ *   at:
+ *
+ *       Attn: CUPS Licensing Information
+ *       Easy Software Products
+ *       44141 Airport View Drive, Suite 204
+ *       Hollywood, Maryland 20636 USA
+ *
+ *       Voice: (301) 373-9600
+ *       EMail: cups-info@cups.org
+ *         WWW: http://www.cups.org
 *
 *   This file is subject to the Apple OS-Developed Software exception.
 *
@@ -30,7 +39,13 @@
 #  include <ApplicationServices/ApplicationServices.h>
 #endif /* __APPLE__ */

-#include "backend-private.h"
+#include <cups/backend.h>
+#include <cups/cups.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <errno.h>
+#include <cups/string.h>
+#include <signal.h>

 #ifdef WIN32
 #  include <io.h>
@@ -47,7 +62,7 @@

 void	list_devices(void);
 int	print_device(const char *uri, const char *hostname,
-	             const char *resource, char *options,
+	             const char *resource, const char *options,
 		     int print_fd, int copies, int argc, char *argv[]);


@@ -55,11 +70,9 @@ int	print_device(const char *uri, const char *hostname,
 * Include the vendor-specific USB implementation...
 */

-#ifdef HAVE_USB_H
-#  include "usb-libusb.c"
-#elif defined(__APPLE__)
+#ifdef __APPLE__
 #  include "usb-darwin.c"
-#elif defined(__linux) || defined(__sun) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) || defined(__FreeBSD_kernel__)
+#elif defined(__linux) || defined(__sun) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
 #  include "usb-unix.c"
 #else
 /*
@@ -94,7 +107,7 @@ int					/* O - Exit status */
 print_device(const char *uri,		/* I - Device URI */
             const char *hostname,	/* I - Hostname/manufacturer */
             const char *resource,	/* I - Resource/modelname */
-	     char       *options,	/* I - Device options/serial number */
+	     const char *options,	/* I - Device options/serial number */
 	     int        print_fd,	/* I - File descriptor to print */
 	     int        copies,		/* I - Copies to print */
 	     int	argc,		/* I - Number of command-line arguments (6 or 7) */
@@ -179,9 +192,7 @@ main(int  argc,				/* I - Number of command-line arguments (6 or 7) */
  }
  else if (argc < 6 || argc > 7)
  {
-    _cupsLangPrintf(stderr,
-                    _("Usage: %s job-id user title copies options [file]\n"),
-                    argv[0]);
+    fputs("Usage: usb job-id user title copies options [file]\n", stderr);
    return (CUPS_BACKEND_FAILED);
  }

@@ -196,9 +207,7 @@ main(int  argc,				/* I - Number of command-line arguments (6 or 7) */
 		      hostname, sizeof(hostname), &port,
 		      resource, sizeof(resource)) < HTTP_URI_OK)
  {
-    _cupsLangPuts(stderr,
-                  _("ERROR: No device URI found in argv[0] or in DEVICE_URI "
-	            "environment variable!\n"));
+    fputs("ERROR: No device URI found in argv[0] or in DEVICE_URI environment variable!\n", stderr);
    return (1);
  }

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

    if ((print_fd = open(argv[6], O_RDONLY)) < 0)
    {
-      _cupsLangPrintf(stderr, _("ERROR: Unable to open print file %s - %s\n"),
-                      argv[6], strerror(errno));
+      fprintf(stderr, "ERROR: unable to open print file %s - %s\n",
+              argv[6], strerror(errno));
      return (CUPS_BACKEND_FAILED);
    }

@@ -1,16 +1,16 @@
-# DO NOT DELETE THIS LINE -- make depend depends on it.
+# DO NOT DELETE

-lpc.o: ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/versioning.h
+lpc.o: ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/md5.h
 lpc.o: ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
 lpc.o: ../cups/i18n.h ../cups/transcode.h ../cups/debug.h ../cups/string.h
 lpc.o: ../config.h
 lpq.o: ../cups/string.h ../config.h ../cups/cups.h ../cups/ipp.h
-lpq.o: ../cups/http.h ../cups/versioning.h ../cups/ppd.h ../cups/array.h
+lpq.o: ../cups/http.h ../cups/md5.h ../cups/ppd.h ../cups/array.h
 lpq.o: ../cups/file.h ../cups/language.h ../cups/i18n.h ../cups/transcode.h
 lpq.o: ../cups/debug.h
 lpr.o: ../cups/string.h ../config.h ../cups/cups.h ../cups/ipp.h
-lpr.o: ../cups/http.h ../cups/versioning.h ../cups/ppd.h ../cups/array.h
+lpr.o: ../cups/http.h ../cups/md5.h ../cups/ppd.h ../cups/array.h
 lpr.o: ../cups/file.h ../cups/language.h ../cups/i18n.h ../cups/transcode.h
-lprm.o: ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/versioning.h
+lprm.o: ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/md5.h
 lprm.o: ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
 lprm.o: ../cups/i18n.h ../cups/transcode.h ../cups/string.h ../config.h
@@ -3,19 +3,27 @@
 #
 #   Berkeley commands makefile for the Common UNIX Printing System (CUPS).
 #
-#   Copyright 2007-2008 by Apple Inc.
 #   Copyright 1997-2006 by Easy Software Products, all rights reserved.
 #
 #   These coded instructions, statements, and computer programs are the
-#   property of Apple Inc. and are protected by Federal copyright
-#   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
-#   which should have been included with this file.  If this file is
-#   file is missing or damaged, see the license at "http://www.cups.org/".
+#   property of Easy Software Products and are protected by Federal
+#   copyright law.  Distribution and use rights are outlined in the file
+#   "LICENSE.txt" which should have been included with this file.  If this
+#   file is missing or damaged please contact Easy Software Products
+#   at:
+#
+#       Attn: CUPS Licensing Information
+#       Easy Software Products
+#       44141 Airport View Drive, Suite 204
+#       Hollywood, Maryland 20636 USA
+#
+#       Voice: (301) 373-9600
+#       EMail: cups-info@cups.org
+#         WWW: http://www.cups.org
 #

 include ../Makedefs

-
 TARGETS	=	lpc lpq lpr lprm
 OBJS	=	lpc.o lpq.o lpr.o lprm.o

@@ -27,20 +35,6 @@ OBJS	=	lpc.o lpq.o lpr.o lprm.o
 all:	$(TARGETS)


-#
-# Make library targets...
-#
-
-libs:
-
-
-#
-# Make unit tests...
-#
-
-unittests:
-
-
 #
 # Clean all object files...
 #
@@ -61,47 +55,13 @@ depend:
 # Install all targets...
 #

-install:	all install-data install-headers install-libs install-exec
-
-
-#
-# Install data files...
-#
-
-install-data:
-
-
-#
-# Install programs...
-#
-
-install-exec:
+install:	all
 	$(INSTALL_DIR) -m 755 $(BINDIR)
 	$(INSTALL_BIN) lpq $(BINDIR)
 	$(INSTALL_BIN) lpr $(BINDIR)
 	$(INSTALL_BIN) lprm $(BINDIR)
 	$(INSTALL_DIR) -m 755 $(SBINDIR)
 	$(INSTALL_BIN) lpc $(SBINDIR)
-	if test "x$(SYMROOT)" != "x"; then \
-		$(INSTALL_DIR) $(SYMROOT); \
-		for file in $(TARGETS); do \
-			cp $$file $(SYMROOT); \
-		done \
-	fi
-
-
-#
-# Install headers...
-#
-
-install-headers:
-
-
-#
-# Install libraries...
-#
-
-install-libs:


 #
@@ -3,14 +3,23 @@
 *
 *   "lpc" command for the Common UNIX Printing System (CUPS).
 *
- *   Copyright 2007 by Apple Inc.
 *   Copyright 1997-2006 by Easy Software Products.
 *
 *   These coded instructions, statements, and computer programs are the
- *   property of Apple Inc. and are protected by Federal copyright
- *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
- *   which should have been included with this file.  If this file is
- *   file is missing or damaged, see the license at "http://www.cups.org/".
+ *   property of Easy Software Products and are protected by Federal
+ *   copyright law.  Distribution and use rights are outlined in the file
+ *   "LICENSE.txt" which should have been included with this file.  If this
+ *   file is missing or damaged please contact Easy Software Products
+ *   at:
+ *
+ *       Attn: CUPS Licensing Information
+ *       Easy Software Products
+ *       44141 Airport View Drive, Suite 204
+ *       Hollywood, Maryland 20636 USA
+ *
+ *       Voice: (301) 373-9600
+ *       EMail: cups-info@cups.org
+ *         WWW: http://www.cups.org
 *
 * Contents:
 *
@@ -228,8 +237,11 @@ show_status(http_t     *http,		/* I - HTTP connection to server */
            const char *dests)		/* I - Destinations */
 {
  ipp_t		*request,		/* IPP Request */
-		*response;		/* IPP Response */
-  ipp_attribute_t *attr;		/* Current attribute */
+		*response,		/* IPP Response */
+		*jobs;			/* IPP Get Jobs response */
+  ipp_attribute_t *attr,		/* Current attribute */
+		*jattr;			/* Current job attribute */
+  cups_lang_t	*language;		/* Default language */
  char		*printer,		/* Printer name */
 		*device,		/* Device URI */
                *delimiter;		/* Char search result */
@@ -239,13 +251,14 @@ show_status(http_t     *http,		/* I - HTTP connection to server */
  const char	*dptr,			/* Pointer into destination list */
 		*ptr;			/* Pointer into printer name */
  int		match;			/* Non-zero if this job matches */
+  char		printer_uri[HTTP_MAX_URI];
+					/* Printer URI */
  static const char *requested[] =	/* Requested attributes */
 		{
-		  "device-uri",
-		  "printer-is-accepting-jobs",
 		  "printer-name",
+		  "device-uri",
 		  "printer-state",
-		  "queued-job-count"
+		  "printer-is-accepting-jobs"
 		};


@@ -262,7 +275,18 @@ show_status(http_t     *http,		/* I - HTTP connection to server */
  *    attributes-natural-language
  */

-  request = ippNewRequest(CUPS_GET_PRINTERS);
+  request = ippNew();
+
+  request->request.op.operation_id = CUPS_GET_PRINTERS;
+  request->request.op.request_id   = 1;
+
+  language = cupsLangDefault();
+
+  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_CHARSET,
+               "attributes-charset", NULL, cupsLangEncoding(language));
+
+  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_LANGUAGE,
+               "attributes-natural-language", NULL, language->language);

  ippAddStrings(request, IPP_TAG_OPERATION, IPP_TAG_KEYWORD,
                "requested-attributes", sizeof(requested) / sizeof(requested[0]),
@@ -305,21 +329,21 @@ show_status(http_t     *http,		/* I - HTTP connection to server */

      while (attr != NULL && attr->group_tag == IPP_TAG_PRINTER)
      {
+        if (!strcmp(attr->name, "printer-name") &&
+	    attr->value_tag == IPP_TAG_NAME)
+	  printer = attr->values[0].string.text;
+
        if (!strcmp(attr->name, "device-uri") &&
 	    attr->value_tag == IPP_TAG_URI)
 	  device = attr->values[0].string.text;
-        else if (!strcmp(attr->name, "printer-is-accepting-jobs") &&
-	         attr->value_tag == IPP_TAG_BOOLEAN)
-	  accepting = attr->values[0].boolean;
-        else if (!strcmp(attr->name, "printer-name") &&
-	         attr->value_tag == IPP_TAG_NAME)
-	  printer = attr->values[0].string.text;
-        else if (!strcmp(attr->name, "printer-state") &&
-	         attr->value_tag == IPP_TAG_ENUM)
+
+        if (!strcmp(attr->name, "printer-state") &&
+	    attr->value_tag == IPP_TAG_ENUM)
 	  pstate = (ipp_pstate_t)attr->values[0].integer;
-        else if (!strcmp(attr->name, "queued-job-count") &&
-	         attr->value_tag == IPP_TAG_INTEGER)
-	  jobcount = attr->values[0].integer;
+
+        if (!strcmp(attr->name, "printer-is-accepting-jobs") &&
+	    attr->value_tag == IPP_TAG_BOOLEAN)
+	  accepting = attr->values[0].boolean;

        attr = attr->next;
      }
@@ -371,8 +395,7 @@ show_status(http_t     *http,		/* I - HTTP connection to server */
 	       *ptr != '\0' && *dptr != '\0' && *ptr == *dptr;
 	       ptr ++, dptr ++);

-          if (*ptr == '\0' && (*dptr == '\0' || *dptr == ',' ||
-	                       isspace(*dptr & 255)))
+          if (*ptr == '\0' && (*dptr == '\0' || *dptr == ',' || isspace(*dptr & 255)))
 	  {
 	    match = 1;
 	    break;
@@ -398,6 +421,53 @@ show_status(http_t     *http,		/* I - HTTP connection to server */

      if (match)
      {
+       /*
+	* Build an IPP_GET_JOBS request, which requires the following
+	* attributes:
+	*
+	*    attributes-charset
+	*    attributes-natural-language
+	*    printer-uri
+	*    limit
+	*/
+
+	request = ippNew();
+
+	request->request.op.operation_id = IPP_GET_JOBS;
+	request->request.op.request_id   = 1;
+
+	language = cupsLangDefault();
+
+	ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_CHARSET,
+                     "attributes-charset", NULL,
+		     cupsLangEncoding(language));
+
+	ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_LANGUAGE,
+                     "attributes-natural-language", NULL,
+		     language->language);
+
+        httpAssembleURIf(HTTP_URI_CODING_ALL, printer_uri, sizeof(printer_uri),
+	                 "ipp", NULL, "localhost", 631, "/printers/%s",
+			 printer);
+	ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI,
+	             "printer-uri", NULL, printer_uri);
+
+	ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_KEYWORD,
+	             "requested-attributes", NULL, "job-id");
+
+        if ((jobs = cupsDoRequest(http, request, "/")) != NULL)
+	{
+	 /*
+	  * Grab the number of jobs for the printer.
+	  */
+
+	  for (jattr = jobs->attrs; jattr != NULL; jattr = jattr->next)
+	    if (jattr->name && !strcmp(jattr->name, "job-id"))
+	      jobcount ++;
+
+          ippDelete(jobs);
+	}
+
       /*
        * Display it...
 	*/
@@ -3,14 +3,23 @@
 *
 *   "lpq" command for the Common UNIX Printing System (CUPS).
 *
- *   Copyright 2007-2008 by Apple Inc.
 *   Copyright 1997-2006 by Easy Software Products.
 *
 *   These coded instructions, statements, and computer programs are the
- *   property of Apple Inc. and are protected by Federal copyright
- *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
- *   which should have been included with this file.  If this file is
- *   file is missing or damaged, see the license at "http://www.cups.org/".
+ *   property of Easy Software Products and are protected by Federal
+ *   copyright law.  Distribution and use rights are outlined in the file
+ *   "LICENSE.txt" which should have been included with this file.  If this
+ *   file is missing or damaged please contact Easy Software Products
+ *   at:
+ *
+ *       Attn: CUPS Licensing Information
+ *       Easy Software Products
+ *       44141 Airport View Drive, Suite 204
+ *       Hollywood, Maryland 20636 USA
+ *
+ *       Voice: (301) 373-9600
+ *       EMail: cups-info@cups.org
+ *         WWW: http://www.cups.org
 *
 * Contents:
 *
@@ -355,8 +364,8 @@ show_jobs(const char *command,		/* I - Command name */
 		};


-  DEBUG_printf(("show_jobs(http=%p, dest=%p, user=%p, id=%d, longstatus%d)\n",
-                http, dest, user, id, longstatus));
+  DEBUG_printf(("show_jobs(%08x, %08x, %08x, %d, %d)\n", http, dest, user, id,
+                longstatus));

  if (http == NULL)
    return (0);
@@ -3,18 +3,28 @@
 *
 *   "lpr" command for the Common UNIX Printing System (CUPS).
 *
- *   Copyright 2007-2008 by Apple Inc.
- *   Copyright 1997-2007 by Easy Software Products.
+ *   Copyright 1997-2006 by Easy Software Products.
 *
 *   These coded instructions, statements, and computer programs are the
- *   property of Apple Inc. and are protected by Federal copyright
- *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
- *   which should have been included with this file.  If this file is
- *   file is missing or damaged, see the license at "http://www.cups.org/".
+ *   property of Easy Software Products and are protected by Federal
+ *   copyright law.  Distribution and use rights are outlined in the file
+ *   "LICENSE.txt" which should have been included with this file.  If this
+ *   file is missing or damaged please contact Easy Software Products
+ *   at:
+ *
+ *       Attn: CUPS Licensing Information
+ *       Easy Software Products
+ *       44141 Airport View Drive, Suite 204
+ *       Hollywood, Maryland 20636 USA
+ *
+ *       Voice: (301) 373-9600
+ *       EMail: cups-info@cups.org
+ *         WWW: http://www.cups.org
 *
 * Contents:
 *
- *   main() - Parse options and send files for printing.
+ *   main()       - Parse options and send files for printing.
+ *   sighandler() - Signal catcher for when we print from stdin...
 */

 /*
@@ -29,6 +39,25 @@
 #include <cups/cups.h>
 #include <cups/i18n.h>

+#ifndef WIN32
+#  include <unistd.h>
+#  include <signal.h>
+
+
+/*
+ * Local functions.
+ */
+
+void	sighandler(int);
+#endif /* !WIN32 */
+
+
+/*
+ * Globals...
+ */
+
+char	tempfile[1024];		/* Temporary file for printing from stdin */
+

 /*
 * 'main()' - Parse options and send files for printing.
@@ -48,18 +77,28 @@ main(int  argc,				/* I - Number of command-line arguments */
  int		num_copies;		/* Number of copies per file */
  int		num_files;		/* Number of files to print */
  const char	*files[1000];		/* Files to print */
-  cups_dest_t	*dest;			/* Selected destination */
+  int		num_dests;		/* Number of destinations */
+  cups_dest_t	*dests,			/* Destinations */
+		*dest;			/* Selected destination */
  int		num_options;		/* Number of options */
  cups_option_t	*options;		/* Options */
  int		deletefile;		/* Delete file after print? */
  char		buffer[8192];		/* Copy buffer */
+  ssize_t	bytes;			/* Bytes copied */
+  off_t		filesize;		/* Size of temp file */
+  int		temp;			/* Temporary file descriptor */
+#if defined(HAVE_SIGACTION) && !defined(HAVE_SIGSET)
+  struct sigaction action;		/* Signal action */
+  struct sigaction oldaction;		/* Old signal action */
+#endif /* HAVE_SIGACTION && !HAVE_SIGSET */


  _cupsSetLocale(argv);

  deletefile  = 0;
  printer     = NULL;
-  dest        = NULL;
+  num_dests   = 0;
+  dests       = NULL;
  num_options = 0;
  options     = NULL;
  num_files   = 0;
@@ -170,11 +209,11 @@ main(int  argc,				/* I - Number of command-line arguments */
 	    break;

 	case 'l' : /* Literal/raw */
-            num_options = cupsAddOption("raw", "true", num_options, &options);
+            num_options = cupsAddOption("raw", "", num_options, &options);
 	    break;

 	case 'p' : /* Prettyprint */
-            num_options = cupsAddOption("prettyprint", "true", num_options,
+            num_options = cupsAddOption("prettyprint", "", num_options,
 	                                &options);
 	    break;

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

 	      snprintf(email, sizeof(email), "mailto:%s@%s", cupsUser(),
 	               httpGetHostname(NULL, buffer, sizeof(buffer)));
-	      num_options = cupsAddOption("notify-recipient-uri", email,
+	      num_options = cupsAddOption("notify-recipient", email,
 	                                  num_options, &options);
 	    }
 	    break;
@@ -228,7 +267,10 @@ main(int  argc,				/* I - Number of command-line arguments */
            if ((instance = strrchr(printer, '/')) != NULL)
 	      *instance++ = '\0';

-            if ((dest = cupsGetNamedDest(NULL, printer, instance)) != NULL)
+	    if (num_dests == 0)
+	      num_dests = cupsGetDests(&dests);
+
+            if ((dest = cupsGetDest(printer, instance, num_dests, dests)) != NULL)
 	    {
 	      for (j = 0; j < dest->num_options; j ++)
 	        if (cupsGetOption(dest->options[j].name, num_options,
@@ -322,7 +364,10 @@ main(int  argc,				/* I - Number of command-line arguments */

  if (printer == NULL)
  {
-    if ((dest = cupsGetNamedDest(NULL, NULL, NULL)) != NULL)
+    if (num_dests == 0)
+      num_dests = cupsGetDests(&dests);
+
+    if ((dest = cupsGetDest(NULL, NULL, num_dests, dests)) != NULL)
    {
      printer = dest->name;

@@ -351,7 +396,7 @@ main(int  argc,				/* I - Number of command-line arguments */
    else
      val = "LPDEST";

-    if (printer && !cupsGetNamedDest(NULL, printer, NULL))
+    if (printer && !cupsGetDest(printer, NULL, num_dests, dests))
      _cupsLangPrintf(stderr,
                      _("%s: Error - %s environment variable names "
 		        "non-existent destination \"%s\"!\n"),
@@ -382,38 +427,72 @@ main(int  argc,				/* I - Number of command-line arguments */
        unlink(files[i]);
    }
  }
-  else if ((job_id = cupsCreateJob(CUPS_HTTP_DEFAULT, printer,
-                                   title ? title : "(stdin)",
-                                   num_options, options)) > 0)
+  else
  {
-    http_status_t	status;		/* Write status */
-    const char		*format;	/* Document format */
-    ssize_t		bytes;		/* Bytes read */
+    num_files = 1;

+#ifndef WIN32
+#  if defined(HAVE_SIGSET)
+    sigset(SIGHUP, sighandler);
+    if (sigset(SIGINT, sighandler) == SIG_IGN)
+      sigset(SIGINT, SIG_IGN);
+    sigset(SIGTERM, sighandler);
+#  elif defined(HAVE_SIGACTION)
+    memset(&action, 0, sizeof(action));
+    action.sa_handler = sighandler;

-    if (cupsGetOption("raw", num_options, options))
-      format = CUPS_FORMAT_RAW;
-    else if ((format = cupsGetOption("document-format", num_options,
-                                     options)) == NULL)
-      format = CUPS_FORMAT_AUTO;
+    sigaction(SIGHUP, &action, NULL);
+    sigaction(SIGINT, NULL, &oldaction);
+    if (oldaction.sa_handler != SIG_IGN)
+      sigaction(SIGINT, &action, NULL);
+    sigaction(SIGTERM, &action, NULL);
+#  else
+    signal(SIGHUP, sighandler);
+    if (signal(SIGINT, sighandler) == SIG_IGN)
+      signal(SIGINT, SIG_IGN);
+    signal(SIGTERM, sighandler);
+#  endif
+#endif /* !WIN32 */

-    status = cupsStartDocument(CUPS_HTTP_DEFAULT, printer, job_id, NULL,
-                               format, 1);
-
-    while (status == HTTP_CONTINUE &&
-           (bytes = read(0, buffer, sizeof(buffer))) > 0)
-      status = cupsWriteRequestData(CUPS_HTTP_DEFAULT, buffer, bytes);
-
-    if (status != HTTP_CONTINUE)
+    if ((temp = cupsTempFd(tempfile, sizeof(tempfile))) < 0)
    {
      _cupsLangPrintf(stderr,
-		      _("%s: Error - unable to queue from stdin - %s\n"),
-		      argv[0], httpStatus(status));
+                      _("%s: Error - unable to create temporary file "
+		        "\"%s\" - %s\n"),
+        	      argv[0], tempfile, strerror(errno));
      return (1);
    }

-    if (cupsFinishDocument(CUPS_HTTP_DEFAULT, printer) != IPP_OK)
-      job_id = 0;
+    while ((bytes = read(0, buffer, sizeof(buffer))) > 0)
+      if (write(temp, buffer, bytes) < 0)
+      {
+	_cupsLangPrintf(stderr,
+	                _("%s: Error - unable to write to temporary file "
+			  "\"%s\" - %s\n"),
+        		argv[0], tempfile, strerror(errno));
+        close(temp);
+        unlink(tempfile);
+	return (1);
+      }
+
+    filesize = lseek(temp, 0, SEEK_CUR);
+    close(temp);
+
+    if (filesize <= 0)
+    {
+      _cupsLangPrintf(stderr,
+                      _("%s: Error - stdin is empty, so no job has been sent.\n"),
+		      argv[0]);
+      unlink(tempfile);
+      return (1);
+    }
+
+    if (title)
+      job_id = cupsPrintFile(printer, tempfile, title, num_options, options);
+    else
+      job_id = cupsPrintFile(printer, tempfile, "(stdin)", num_options, options);
+
+    unlink(tempfile);
  }

  if (job_id < 1)
@@ -426,6 +505,29 @@ main(int  argc,				/* I - Number of command-line arguments */
 }


+#ifndef WIN32
+/*
+ * 'sighandler()' - Signal catcher for when we print from stdin...
+ */
+
+void
+sighandler(int s)			/* I - Signal number */
+{
+ /*
+  * Remove the temporary file we're using to print from stdin...
+  */
+
+  unlink(tempfile);
+
+ /*
+  * Exit...
+  */
+
+  exit(s);
+}
+#endif /* !WIN32 */
+
+
 /*
 * End of "$Id$".
 */
@@ -3,14 +3,23 @@
 *
 *   "lprm" command for the Common UNIX Printing System (CUPS).
 *
- *   Copyright 2007 by Apple Inc.
 *   Copyright 1997-2006 by Easy Software Products.
 *
 *   These coded instructions, statements, and computer programs are the
- *   property of Apple Inc. and are protected by Federal copyright
- *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
- *   which should have been included with this file.  If this file is
- *   file is missing or damaged, see the license at "http://www.cups.org/".
+ *   property of Easy Software Products and are protected by Federal
+ *   copyright law.  Distribution and use rights are outlined in the file
+ *   "LICENSE.txt" which should have been included with this file.  If this
+ *   file is missing or damaged please contact Easy Software Products
+ *   at:
+ *
+ *       Attn: CUPS Licensing Information
+ *       Easy Software Products
+ *       44141 Airport View Drive, Suite 204
+ *       Hollywood, Maryland 20636 USA
+ *
+ *       Voice: (301) 373-9600
+ *       EMail: cups-info@cups.org
+ *         WWW: http://www.cups.org
 *
 * Contents:
 *
@@ -37,13 +46,19 @@ int				/* O - Exit status */
 main(int  argc,			/* I - Number of command-line arguments */
     char *argv[])		/* I - Command-line arguments */
 {
+  http_t	*http;		/* HTTP connection to server */
  int		i;		/* Looping var */
  int		job_id;		/* Job ID */
-  const char	*name;		/* Destination printer */
+  const char	*dest;		/* Destination printer */
  char		*instance;	/* Pointer to instance name */
-  cups_dest_t	*dest,		/* Destination */
+  char		uri[1024];	/* Printer or job URI */
+  ipp_t		*request;	/* IPP request */
+  ipp_t		*response;	/* IPP response */
+  ipp_op_t	op;		/* Operation */
+  int		num_dests;	/* Number of destinations */
+  cups_dest_t	*dests,		/* Destinations */
 		*defdest;	/* Default destination */
-  int		did_cancel;	/* Did we cancel something? */
+  http_encryption_t encryption;	/* Encryption? */


  _cupsSetLocale(argv);
@@ -52,9 +67,26 @@ main(int  argc,			/* I - Number of command-line arguments */
  * Setup to cancel individual print jobs...
  */

-  did_cancel = 0;
-  defdest    = cupsGetNamedDest(CUPS_HTTP_DEFAULT, NULL, NULL);
-  name       = defdest ? defdest->name : NULL;
+  op         = IPP_CANCEL_JOB;
+  job_id     = 0;
+  dest       = NULL;
+  response   = NULL;
+  http       = NULL;
+  encryption = cupsEncryption();
+
+ /*
+  * Open a connection to the server...
+  */
+
+  if ((http = httpConnectEncrypt(cupsServer(), ippPort(), encryption)) == NULL)
+  {
+    _cupsLangPuts(stderr, _("lprm: Unable to contact server!\n"));
+    return (1);
+  }
+
+  num_dests  = cupsGetDests2(http, &dests);
+  defdest    = cupsGetDest(NULL, NULL, num_dests, dests);
+  dest       = defdest ? defdest->name : NULL;

 /*
  * Process command-line arguments...
@@ -66,7 +98,10 @@ main(int  argc,			/* I - Number of command-line arguments */
      {
        case 'E' : /* Encrypt */
 #ifdef HAVE_SSL
-	    cupsSetEncryption(HTTP_ENCRYPT_REQUIRED);
+	    encryption = HTTP_ENCRYPT_REQUIRED;
+
+	    httpEncryption(http, encryption);
+	    cupsSetEncryption(encryption);
 #else
            _cupsLangPrintf(stderr,
 	                    _("%s: Sorry, no encryption support compiled in!\n"),
@@ -76,26 +111,25 @@ main(int  argc,			/* I - Number of command-line arguments */

        case 'P' : /* Cancel jobs on a printer */
 	    if (argv[i][2])
-	      name = argv[i] + 2;
+	      dest = argv[i] + 2;
 	    else
 	    {
 	      i ++;
-	      name = argv[i];
+	      dest = argv[i];
 	    }

-	    if ((instance = strchr(name, '/')) != NULL)
+	    if ((instance = strchr(dest, '/')) != NULL)
 	      *instance = '\0';

-	    if ((dest = cupsGetNamedDest(CUPS_HTTP_DEFAULT, name,
-	                                 NULL)) == NULL)
+	    if (cupsGetDest(dest, NULL, num_dests, dests) == NULL)
 	    {
 	      _cupsLangPrintf(stderr,
 	                      _("%s: Error - unknown destination \"%s\"!\n"),
-			      argv[0], name);
-              goto error;
+			      argv[0], dest);
+              cupsFreeDests(num_dests, dests);
+	      httpClose(http);
+	      return(1);
 	    }
-
-	    cupsFreeDests(1, dest);
 	    break;

        case 'U' : /* Username */
@@ -110,7 +144,7 @@ main(int  argc,			/* I - Number of command-line arguments */
 		                _("%s: Error - expected username after "
 				  "\'-U\' option!\n"),
 		        	argv[0]);
-	        goto error;
+	        return (1);
 	      }

              cupsSetUser(argv[i]);
@@ -130,24 +164,34 @@ main(int  argc,			/* I - Number of command-line arguments */
 		        	_("%s: Error - expected hostname after "
 			          "\'-h\' option!\n"),
 				argv[0]);
-		goto error;
+		return (1);
              }
 	      else
                cupsSetServer(argv[i]);
 	    }

-            if (defdest)
-	      cupsFreeDests(1, defdest);
+            httpClose(http);
+            cupsFreeDests(num_dests, dests);

-	    defdest = cupsGetNamedDest(CUPS_HTTP_DEFAULT, NULL, NULL);
-	    name    = defdest ? defdest->name : NULL;
+	    if ((http = httpConnectEncrypt(cupsServer(), ippPort(),
+	                                   encryption)) == NULL)
+	    {
+	      _cupsLangPuts(stderr, _("lprm: Unable to contact server!\n"));
+	      return (1);
+	    }
+
+	    num_dests  = cupsGetDests2(http, &dests);
+	    defdest    = cupsGetDest(NULL, NULL, num_dests, dests);
+	    dest       = defdest ? defdest->name : NULL;
 	    break;

 	default :
 	    _cupsLangPrintf(stderr,
 	                    _("%s: Error - unknown option \'%c\'!\n"),
 			    argv[0], argv[i][1]);
-            goto error;
+            cupsFreeDests(num_dests, dests);
+	    httpClose(http);
+	    return (1);
      }
    else
    {
@@ -155,17 +199,11 @@ main(int  argc,			/* I - Number of command-line arguments */
      * Cancel a job or printer...
      */

-      if ((dest = cupsGetNamedDest(CUPS_HTTP_DEFAULT, argv[i], NULL)) != NULL)
-        cupsFreeDests(1, dest);
-
-      if (dest)
+      if (isdigit(argv[i][0] & 255) &&
+          cupsGetDest(argv[i], NULL, num_dests, dests) == NULL)
      {
-        name   = argv[i];
-        job_id = 0;
-      }
-      else if (isdigit(argv[i][0] & 255))
-      {
-        name   = NULL;
+        dest   = NULL;
+	op     = IPP_CANCEL_JOB;
        job_id = atoi(argv[i]);
      }
      else if (!strcmp(argv[i], "-"))
@@ -174,23 +212,64 @@ main(int  argc,			/* I - Number of command-line arguments */
        * Cancel all jobs
        */

-        job_id = -1;
+        op = IPP_PURGE_JOBS;
      }
      else
      {
-	_cupsLangPrintf(stderr,
-			_("%s: Error - unknown destination \"%s\"!\n"),
-			argv[0], argv[i]);
-	goto error;
+        dest   = argv[i];
+        job_id = 0;
      }

-      if (cupsCancelJob2(CUPS_HTTP_DEFAULT, name, job_id, 0) != IPP_OK)
+     /*
+      * Build an IPP request, which requires the following
+      * attributes:
+      *
+      *    attributes-charset
+      *    attributes-natural-language
+      *    printer-uri + job-id *or* job-uri
+      *    [requesting-user-name]
+      */
+
+      request = ippNewRequest(op);
+
+      if (dest)
+      {
+        httpAssembleURIf(HTTP_URI_CODING_ALL, uri, sizeof(uri), "ipp", NULL,
+	                 "localhost", 0, "/printers/%s", dest);
+	ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI,
+	             "printer-uri", NULL, uri);
+	ippAddInteger(request, IPP_TAG_OPERATION, IPP_TAG_INTEGER, "job-id",
+	              job_id);
+      }
+      else
+      {
+        sprintf(uri, "ipp://localhost/jobs/%d", job_id);
+	ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, "job-uri", NULL,
+	             uri);
+      }
+
+      ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_NAME,
+                   "requesting-user-name", NULL, cupsUser());
+
+     /*
+      * Do the request and get back a response...
+      */
+
+      if (op == IPP_PURGE_JOBS)
+        response = cupsDoRequest(http, request, "/admin/");
+      else
+        response = cupsDoRequest(http, request, "/jobs/");
+
+      ippDelete(response);
+
+      if (cupsLastError() > IPP_OK_CONFLICT)
      {
        _cupsLangPrintf(stderr, "%s: %s\n", argv[0], cupsLastErrorString());
-	goto error;
-      }

-      did_cancel = 1;
+        cupsFreeDests(num_dests, dests);
+        httpClose(http);
+	return (1);
+      }
    }

 /*
@@ -198,27 +277,19 @@ main(int  argc,			/* I - Number of command-line arguments */
  * (or default) printer...
  */

-  if (!did_cancel && cupsCancelJob2(CUPS_HTTP_DEFAULT, name, 0, 0) != IPP_OK)
+  if (response == NULL)
+    if (!cupsCancelJob(dest, 0))
    {
      _cupsLangPrintf(stderr, "%s: %s\n", argv[0], cupsLastErrorString());
-      goto error;
+      cupsFreeDests(num_dests, dests);
+      httpClose(http);
+      return (1);
    }

-  if (defdest)
-    cupsFreeDests(1, defdest);
+  cupsFreeDests(num_dests, dests);
+  httpClose(http);

  return (0);
-
- /*
-  * If we get here there was an error, so clean up...
-  */
-
-  error:
-
-  if (defdest)
-    cupsFreeDests(1, defdest);
-
-  return (1);
 }


@@ -1,61 +1,57 @@
 # DO NOT DELETE

 help-index.o: cgi-private.h cgi.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
-help-index.o: ../cups/versioning.h ../cups/ppd.h ../cups/array.h
-help-index.o: ../cups/file.h ../cups/language.h ../cups/array.h help-index.h
-help-index.o: ../cups/debug.h ../cups/i18n.h ../cups/transcode.h
-help-index.o: ../cups/string.h ../config.h ../cups/dir.h
+help-index.o: ../cups/md5.h ../cups/ppd.h ../cups/array.h ../cups/file.h
+help-index.o: ../cups/language.h ../cups/array.h help-index.h ../cups/debug.h
+help-index.o: ../cups/i18n.h ../cups/transcode.h ../cups/string.h ../config.h
+help-index.o: ../cups/dir.h
 html.o: cgi-private.h cgi.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
-html.o: ../cups/versioning.h ../cups/ppd.h ../cups/array.h ../cups/file.h
+html.o: ../cups/md5.h ../cups/ppd.h ../cups/array.h ../cups/file.h
 html.o: ../cups/language.h ../cups/array.h help-index.h ../cups/debug.h
 html.o: ../cups/i18n.h ../cups/transcode.h ../cups/string.h ../config.h
 ipp-var.o: cgi-private.h cgi.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
-ipp-var.o: ../cups/versioning.h ../cups/ppd.h ../cups/array.h ../cups/file.h
+ipp-var.o: ../cups/md5.h ../cups/ppd.h ../cups/array.h ../cups/file.h
 ipp-var.o: ../cups/language.h ../cups/array.h help-index.h ../cups/debug.h
 ipp-var.o: ../cups/i18n.h ../cups/transcode.h ../cups/string.h ../config.h
 search.o: cgi-private.h cgi.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
-search.o: ../cups/versioning.h ../cups/ppd.h ../cups/array.h ../cups/file.h
+search.o: ../cups/md5.h ../cups/ppd.h ../cups/array.h ../cups/file.h
 search.o: ../cups/language.h ../cups/array.h help-index.h ../cups/debug.h
 search.o: ../cups/i18n.h ../cups/transcode.h ../cups/string.h ../config.h
 template.o: cgi-private.h cgi.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
-template.o: ../cups/versioning.h ../cups/ppd.h ../cups/array.h ../cups/file.h
+template.o: ../cups/md5.h ../cups/ppd.h ../cups/array.h ../cups/file.h
 template.o: ../cups/language.h ../cups/array.h help-index.h ../cups/debug.h
 template.o: ../cups/i18n.h ../cups/transcode.h ../cups/string.h ../config.h
 var.o: cgi-private.h cgi.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
-var.o: ../cups/versioning.h ../cups/ppd.h ../cups/array.h ../cups/file.h
+var.o: ../cups/md5.h ../cups/ppd.h ../cups/array.h ../cups/file.h
 var.o: ../cups/language.h ../cups/array.h help-index.h ../cups/debug.h
 var.o: ../cups/i18n.h ../cups/transcode.h ../cups/string.h ../config.h
 admin.o: cgi-private.h cgi.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
-admin.o: ../cups/versioning.h ../cups/ppd.h ../cups/array.h ../cups/file.h
+admin.o: ../cups/md5.h ../cups/ppd.h ../cups/array.h ../cups/file.h
 admin.o: ../cups/language.h ../cups/array.h help-index.h ../cups/debug.h
 admin.o: ../cups/i18n.h ../cups/transcode.h ../cups/string.h ../config.h
 admin.o: ../cups/adminutil.h ../cups/cups.h ../cups/file.h
 classes.o: cgi-private.h cgi.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
-classes.o: ../cups/versioning.h ../cups/ppd.h ../cups/array.h ../cups/file.h
+classes.o: ../cups/md5.h ../cups/ppd.h ../cups/array.h ../cups/file.h
 classes.o: ../cups/language.h ../cups/array.h help-index.h ../cups/debug.h
 classes.o: ../cups/i18n.h ../cups/transcode.h ../cups/string.h ../config.h
 help.o: cgi-private.h cgi.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
-help.o: ../cups/versioning.h ../cups/ppd.h ../cups/array.h ../cups/file.h
+help.o: ../cups/md5.h ../cups/ppd.h ../cups/array.h ../cups/file.h
 help.o: ../cups/language.h ../cups/array.h help-index.h ../cups/debug.h
 help.o: ../cups/i18n.h ../cups/transcode.h ../cups/string.h ../config.h
 jobs.o: cgi-private.h cgi.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
-jobs.o: ../cups/versioning.h ../cups/ppd.h ../cups/array.h ../cups/file.h
+jobs.o: ../cups/md5.h ../cups/ppd.h ../cups/array.h ../cups/file.h
 jobs.o: ../cups/language.h ../cups/array.h help-index.h ../cups/debug.h
 jobs.o: ../cups/i18n.h ../cups/transcode.h ../cups/string.h ../config.h
 printers.o: cgi-private.h cgi.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
-printers.o: ../cups/versioning.h ../cups/ppd.h ../cups/array.h ../cups/file.h
+printers.o: ../cups/md5.h ../cups/ppd.h ../cups/array.h ../cups/file.h
 printers.o: ../cups/language.h ../cups/array.h help-index.h ../cups/debug.h
 printers.o: ../cups/i18n.h ../cups/transcode.h ../cups/string.h ../config.h
-testcgi.o: cgi.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
-testcgi.o: ../cups/versioning.h ../cups/ppd.h ../cups/array.h ../cups/file.h
-testcgi.o: ../cups/language.h ../cups/array.h help-index.h
-testhi.o: cgi.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
-testhi.o: ../cups/versioning.h ../cups/ppd.h ../cups/array.h ../cups/file.h
-testhi.o: ../cups/language.h ../cups/array.h help-index.h
+testcgi.o: cgi.h ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/md5.h
+testcgi.o: ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
+testcgi.o: ../cups/array.h help-index.h
+testhi.o: cgi.h ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/md5.h
+testhi.o: ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
+testhi.o: ../cups/array.h help-index.h
 testtemplate.o: cgi.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
-testtemplate.o: ../cups/versioning.h ../cups/ppd.h ../cups/array.h
-testtemplate.o: ../cups/file.h ../cups/language.h ../cups/array.h
-testtemplate.o: help-index.h
-websearch.o: cgi.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
-websearch.o: ../cups/versioning.h ../cups/ppd.h ../cups/array.h
-websearch.o: ../cups/file.h ../cups/language.h ../cups/array.h help-index.h
+testtemplate.o: ../cups/md5.h ../cups/ppd.h ../cups/array.h ../cups/file.h
+testtemplate.o: ../cups/language.h ../cups/array.h help-index.h
@@ -3,55 +3,32 @@
 #
 #   CGI makefile for the Common UNIX Printing System (CUPS).
 #
-#   Copyright 2007-2008 by Apple Inc.
 #   Copyright 1997-2006 by Easy Software Products.
 #
 #   These coded instructions, statements, and computer programs are the
-#   property of Apple Inc. and are protected by Federal copyright
-#   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
-#   which should have been included with this file.  If this file is
-#   file is missing or damaged, see the license at "http://www.cups.org/".
+#   property of Easy Software Products and are protected by Federal
+#   copyright law.  Distribution and use rights are outlined in the file
+#   "LICENSE.txt" which should have been included with this file.  If this
+#   file is missing or damaged please contact Easy Software Products
+#   at:
+#
+#       Attn: CUPS Licensing Information
+#       Easy Software Products
+#       44141 Airport View Drive, Suite 204
+#       Hollywood, Maryland 20636 USA
+#
+#       Voice: (301) 373-9600
+#       EMail: cups-info@cups.org
+#         WWW: http://www.cups.org
 #

 include ../Makedefs

-LIBOBJS	=	\
-		help-index.o \
-		html.o \
-		ipp-var.o \
-		search.o \
-		template.o \
-		var.o
-OBJS	=	\
-		$(LIBOBJS) \
-		admin.o \
-		classes.o \
-		help.o \
-		jobs.o \
-		printers.o \
-		testcgi.o \
-		testhi.o \
-		testtemplate.o \
-		websearch.o
-CGIS	=	\
-		admin.cgi \
-		classes.cgi \
-		help.cgi \
-		jobs.cgi \
-		printers.cgi
-LIBTARGETS =	\
-		libcupscgi.a \
-		$(LIBCUPSCGI) \
-		websearch
-
-UNITTARGETS =	\
-		testcgi \
-		testhi \
-		testtemplate
-
-TARGETS	=	\
-		$(LIBTARGETS) \
-		$(CGIS)
+CGIS	=	admin.cgi classes.cgi help.cgi jobs.cgi printers.cgi
+TARGETS	=	libcgi.a $(CGIS) testcgi testhi testtemplate
+LIBOBJS	=	help-index.o html.o ipp-var.o search.o template.o var.o
+OBJS	=	$(LIBOBJS) admin.o classes.o help.o \
+		jobs.o printers.o testcgi.o testhi.o testtemplate.o


 #
@@ -61,27 +38,12 @@ TARGETS	=	\
 all:	$(TARGETS)


-#
-# Make library targets...
-#
-
-libs:		$(LIBTARGETS) $(UNITTESTS)
-
-
-#
-# Make unit tests...
-#
-
-unittests:	$(UNITTARGETS)
-
-
 #
 # Clean all object files...
 #

 clean:
-	$(RM) $(OBJS) $(TARGETS) $(UNITTARGETS)
-	$(RM) libcupscgi.so libcupscgi.sl libcupscgi.dylib
+	$(RM) $(OBJS) $(TARGETS)


 #
@@ -96,69 +58,11 @@ depend:
 # Install all targets...
 #

-install:	all install-data install-headers install-libs install-exec
-
-
-#
-# Install data files...
-#
-
-install-data:
-
-
-#
-# Install programs...
-#
-
-install-exec:
+install:	all
 	$(INSTALL_DIR) -m 755 $(SERVERBIN)/cgi-bin
 	for file in $(CGIS); do \
 		$(INSTALL_BIN) $$file $(SERVERBIN)/cgi-bin; \
 	done
-	if test "x$(SYMROOT)" != "x"; then \
-		$(INSTALL_DIR) $(SYMROOT); \
-		for file in $(TARGETS); do \
-			cp $$file $(SYMROOT); \
-		done \
-	fi
-
-
-#
-# Install headers...
-#
-
-install-headers:
-	echo Installing header files in $(INCLUDEDIR)/cups...
-	$(INSTALL_DIR) -m 755 $(INCLUDEDIR)/cups
-	$(INSTALL_DATA) cgi.h $(INCLUDEDIR)/cups
-	$(INSTALL_DATA) help-index.h $(INCLUDEDIR)/cups
-
-
-#
-# Install libraries...
-#
-
-install-libs: $(INSTALLSTATIC)
-	echo Installing libraries in $(LIBDIR)...
-	$(INSTALL_DIR) -m 755 $(LIBDIR)
-	$(INSTALL_LIB) $(LIBCUPSCGI) $(LIBDIR)
-	if test $(LIBCUPSCGI) = "libcupscgi.so.1" -o $(LIBCUPSCGI) = "libcupscgi.sl.1"; then \
-		$(RM) $(LIBDIR)/`basename $(LIBCUPSCGI) .1`; \
-		$(LN) $(LIBCUPSCGI) $(LIBDIR)/`basename $(LIBCUPSCGI) .1`; \
-	fi
-	if test $(LIBCUPSCGI) = "libcupscgi.1.dylib"; then \
-		$(RM) $(LIBDIR)/libcupscgi.dylib; \
-		$(LN) $(LIBCUPSCGI) $(LIBDIR)/libcupscgi.dylib; \
-	fi
-	if test "x$(SYMROOT)" != "x"; then \
-		$(INSTALL_DIR) $(SYMROOT); \
-		cp $(LIBCUPSCGI) $(SYMROOT); \
-	fi
-
-installstatic:
-	$(INSTALL_DIR) -m 755 $(LIBDIR)
-	$(INSTALL_LIB) libcupscgi.a $(LIBDIR)
-	$(RANLIB) $(LIBDIR)/libcupscgi.a


 #
@@ -170,93 +74,13 @@ uninstall:
 		$(RM) $(SERVERBIN)/cgi-bin/$$file; \
 	done
 	-$(RMDIR) $(SERVERBIN)/cgi-bin
-	$(RM) $(LIBDIR)/libcupscgi.1.dylib
-	$(RM) $(LIBDIR)/libcupscgi.a
-	$(RM) $(LIBDIR)/libcupscgi.dylib
-	$(RM) $(LIBDIR)/libcupscgi_s.a
-	$(RM) $(LIBDIR)/libcupscgi.sl
-	$(RM) $(LIBDIR)/libcupscgi.sl.1
-	$(RM) $(LIBDIR)/libcupscgi.so
-	$(RM) $(LIBDIR)/libcupscgi.so.1
-	-$(RMDIR) $(LIBDIR)
-	$(RM) $(INCLUDEDIR)/cups/cgi.h
-	$(RM) $(INCLUDEDIR)/cups/help-index.h
-	-$(RMDIR) $(INCLUDEDIR)/cups


 #
-# Automatic API help files...
+# libcgi.a
 #

-apihelp:
-	mxmldoc --section "Programming" \
-		--title "CGI API" \
-		--css ../doc/cups-printable.css \
-		--header api-cgi.header --intro api-cgi.shtml \
-		cgi.h help-index.h $(LIBOBJS:.o=.c) >../doc/help/api-cgi.html
-
-framedhelp:
-	mxmldoc --framed api-cgi \
-		--section "Programming" \
-		--title "CGI API" \
-		--css ../doc/cups-printable.css \
-		--header api-cgi.header --intro api-cgi.shtml \
-		cgi.h help-index.h $(LIBOBJS:.o=.c)
-
-
-#
-# libcupscgi.so.1, libcupscgi.sl.1
-#
-
-libcupscgi.so.1 libcupscgi.sl.1:	$(LIBOBJS)
-	echo Linking $@...
-	$(DSO) $(ARCHFLAGS) $(DSOFLAGS) -o $@ $(LIBOBJS) $(LIBS)
-	$(RM) `basename $@ .1`
-	$(LN) $@ `basename $@ .1`
-
-
-#
-# libcupscgi.1.dylib
-#
-
-libcupscgi.1.dylib:	$(LIBOBJS) libcupscgi.exp
-	echo Linking $@...
-	$(DSO) $(ARCHFLAGS) $(DSOFLAGS) -o $@ \
-		-install_name $(libdir)/$@ \
-		-current_version 1.0.0 \
-		-compatibility_version 1.0.0 \
-		-exported_symbols_list libcupscgi.exp \
-		$(LIBOBJS) $(LIBS)
-	$(RM) libcupscgi.dylib
-	$(LN) $@ libcupscgi.dylib
-
-
-#
-# libcupscgi_s.a
-#
-
-libcupscgi_s.a:	$(LIBOBJS)
-	echo Creating $@...
-	$(DSO) $(DSOFLAGS) -o libcupscgi_s.o $(LIBOBJS) $(LIBS)
-	$(RM) $@
-	$(AR) $(ARFLAGS) $@ libcupscgi_s.o
-
-
-#
-# libcupscgi.la
-#
-
-libcupscgi.la:    $(LIBOBJS)
-	echo Linking $@...
-	$(CC) $(ARCHFLAGS) $(DSOFLAGS) -o $@ $(LIBOBJS:.o=.lo) -rpath $(LIBDIR) \
-		-version-info 1:0 $(LIBS)
-
-
-#
-# libcupscgi.a
-#
-
-libcupscgi.a:	$(LIBOBJS)
+libcgi.a:	$(LIBOBJS)
 	echo Archiving $@...
 	$(RM) $@
 	$(AR) $(ARFLAGS) $@ $(LIBOBJS)
@@ -267,89 +91,75 @@ libcupscgi.a:	$(LIBOBJS)
 # admin.cgi
 #

-admin.cgi:	admin.o ../Makedefs ../cups/$(LIBCUPS) $(LIBCUPSCGI)
+admin.cgi:	admin.o ../Makedefs ../cups/$(LIBCUPS) libcgi.a
 	echo Linking $@...
-	$(CC) $(LDFLAGS) -o $@ admin.o -lcupscgi $(LIBS)
+	$(CC) $(LDFLAGS) -o $@ admin.o libcgi.a $(LIBS)


 #
 # classes.cgi
 #

-classes.cgi:	classes.o ../Makedefs ../cups/$(LIBCUPS) $(LIBCUPSCGI)
+classes.cgi:	classes.o ../Makedefs ../cups/$(LIBCUPS) libcgi.a
 	echo Linking $@...
-	$(CC) $(LDFLAGS) -o $@ classes.o -lcupscgi $(LIBS)
+	$(CC) $(LDFLAGS) -o $@ classes.o libcgi.a $(LIBS)


 #
 # help.cgi
 #

-help.cgi:	help.o ../Makedefs ../cups/$(LIBCUPS) $(LIBCUPSCGI)
+help.cgi:	help.o ../Makedefs libcgi.a
 	echo Linking $@...
-	$(CC) $(LDFLAGS) -o $@ help.o -lcupscgi $(LIBS)
+	$(CC) $(LDFLAGS) -o $@ help.o libcgi.a $(LIBS)


 #
 # jobs.cgi
 #

-jobs.cgi:	jobs.o ../Makedefs ../cups/$(LIBCUPS) $(LIBCUPSCGI)
+jobs.cgi:	jobs.o ../Makedefs ../cups/$(LIBCUPS) libcgi.a
 	echo Linking $@...
-	$(CC) $(LDFLAGS) -o $@ jobs.o -lcupscgi $(LIBS)
+	$(CC) $(LDFLAGS) -o $@ jobs.o libcgi.a $(LIBS)


 #
 # printers.cgi
 #

-printers.cgi:	printers.o ../Makedefs ../cups/$(LIBCUPS) $(LIBCUPSCGI)
+printers.cgi:	printers.o ../Makedefs ../cups/$(LIBCUPS) libcgi.a
 	echo Linking $@...
-	$(CC) $(LDFLAGS) -o $@ printers.o -L. -lcupscgi $(LIBS)
+	$(CC) $(LDFLAGS) -o $@ printers.o libcgi.a $(LIBS)


 #
 # testcgi
 #

-testcgi:	testcgi.o ../Makedefs libcupscgi.a ../cups/libcups.a
+testcgi:	testcgi.o ../Makedefs libcgi.a ../cups/libcups.a
 	echo Linking $@...
-	$(CC) $(ARCHFLAGS) $(LDFLAGS) -o $@ testcgi.o libcupscgi.a \
-		../cups/libcups.a $(COMMONLIBS) $(SSLLIBS) $(LIBZ) $(LIBGSSAPI)
-	echo Testing CGI API...
-	./testcgi
+	$(CC) $(LDFLAGS) -o $@ testcgi.o libcgi.a ../cups/libcups.a \
+		$(COMMONLIBS) $(SSLLIBS) $(LIBZ)


 #
 # testhi
 #

-testhi:	testhi.o ../Makedefs libcupscgi.a ../cups/libcups.a
+testhi:	testhi.o ../Makedefs libcgi.a ../cups/libcups.a
 	echo Linking $@...
-	$(CC) $(ARCHFLAGS) $(LDFLAGS) -o $@ testhi.o libcupscgi.a \
-		../cups/libcups.a $(COMMONLIBS) $(SSLLIBS) $(LIBZ) $(LIBGSSAPI)
-	echo Testing help index API...
-	./testhi
+	$(CC) $(LDFLAGS) -o $@ testhi.o libcgi.a ../cups/libcups.a \
+		$(COMMONLIBS) $(SSLLIBS) $(LIBZ)


 #
 # testtemplate
 #

-testtemplate:	testtemplate.o ../Makedefs libcupscgi.a ../cups/libcups.a
+testtemplate:	testtemplate.o ../Makedefs libcgi.a ../cups/libcups.a
 	echo Linking $@...
-	$(CC) $(LDFLAGS) -o $@ testtemplate.o libcupscgi.a ../cups/libcups.a \
-		$(COMMONLIBS) $(SSLLIBS) $(LIBZ) $(LIBGSSAPI)
-
-
-#
-# websearch
-#
-
-websearch:	websearch.o ../Makedefs libcupscgi.a ../cups/libcups.a
-	echo Linking $@...
-	$(CC) $(ARCHFLAGS) $(LDFLAGS) -o $@ websearch.o libcupscgi.a \
-		../cups/libcups.a $(COMMONLIBS) $(SSLLIBS) $(LIBZ) $(LIBGSSAPI)
+	$(CC) $(LDFLAGS) -o $@ testtemplate.o libcgi.a ../cups/libcups.a \
+		$(COMMONLIBS) $(SSLLIBS) $(LIBZ)


 #
@@ -3,14 +3,23 @@
 *
 *   Private CGI definitions for the Common UNIX Printing System (CUPS).
 *
- *   Copyright 2007 by Apple Inc.
- *   Copyright 1997-2006 by Easy Software Products.
+ *   Copyright 1997-2005 by Easy Software Products.
 *
 *   These coded instructions, statements, and computer programs are the
- *   property of Apple Inc. and are protected by Federal copyright
- *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
- *   which should have been included with this file.  If this file is
- *   file is missing or damaged, see the license at "http://www.cups.org/".
+ *   property of Easy Software Products and are protected by Federal
+ *   copyright law.  Distribution and use rights are outlined in the file
+ *   "LICENSE.txt" which should have been included with this file.  If this
+ *   file is missing or damaged please contact Easy Software Products
+ *   at:
+ *
+ *       Attn: CUPS Licensing Information
+ *       Easy Software Products
+ *       44141 Airport View Drive, Suite 204
+ *       Hollywood, Maryland 20636 USA
+ *
+ *       Voice: (301) 373-9600
+ *       EMail: cups-info@cups.org
+ *         WWW: http://www.cups.org
 */

 /*
@@ -27,7 +36,7 @@
 * Limits...
 */

-#define CUPS_PAGE_MAX	100		/* Maximum items per page */
+#define CUPS_PAGE_MAX	10		/* Maximum items per page */


 /*
@@ -3,14 +3,23 @@
 *
 *   CGI support library definitions.
 *
- *   Copyright 2007-2008 by Apple Inc.
 *   Copyright 1997-2006 by Easy Software Products.
 *
 *   These coded instructions, statements, and computer programs are the
- *   property of Apple Inc. and are protected by Federal copyright
- *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
- *   which should have been included with this file.  If this file is
- *   file is missing or damaged, see the license at "http://www.cups.org/".
+ *   property of Easy Software Products and are protected by Federal
+ *   copyright law.  Distribution and use rights are outlined in the file
+ *   "LICENSE.txt" which should have been included with this file.  If this
+ *   file is missing or damaged please contact Easy Software Products
+ *   at:
+ *
+ *       Attn: CUPS Licensing Information
+ *       Easy Software Products
+ *       44141 Airport View Drive, Suite 204
+ *       Hollywood, Maryland 20636 USA
+ *
+ *       Voice: (301) 373-9600
+ *       EMail: cups-info@cups.org
+ *         WWW: http://www.cups.org
 */

 #ifndef _CUPS_CGI_H_
@@ -59,7 +68,6 @@ extern void		cgiCopyTemplateFile(FILE *out, const char *tmpl);
 extern void		cgiCopyTemplateLang(const char *tmpl);
 extern int		cgiDoSearch(void *search, const char *text);
 extern void		cgiEndHTML(void);
-extern void		cgiEndMultipart(void);
 extern char		*cgiFormEncode(char *dst, const char *src, size_t dstsize);
 extern void		cgiFreeSearch(void *search);
 extern const char	*cgiGetArray(const char *name, int element);
@@ -73,8 +81,6 @@ extern const char	*cgiGetVariable(const char *name);
 extern int		cgiInitialize(void);
 extern int		cgiIsPOST(void);
 extern void		cgiMoveJobs(http_t *http, const char *dest, int job_id);
-extern void		cgiPrintCommand(http_t *http, const char *dest,
-			                const char *command, const char *title);
 extern void		cgiPrintTestPage(http_t *http, const char *dest);
 extern char		*cgiRewriteURL(const char *uri, char *url, int urlsize,
 			               const char *newresource);
@@ -94,7 +100,6 @@ extern void		cgiSetVariable(const char *name, const char *value);
 extern void		cgiShowIPPError(const char *message);
 extern void		cgiShowJobs(http_t *http, const char *dest);
 extern void		cgiStartHTML(const char *title);
-extern void		cgiStartMultipart(void);
 extern const char	*cgiText(const char *message);

 #endif /* !_CUPS_CGI_H_ */
@@ -3,19 +3,27 @@
 *
 *   Class status CGI for the Common UNIX Printing System (CUPS).
 *
- *   Copyright 2007-2008 by Apple Inc.
 *   Copyright 1997-2006 by Easy Software Products.
 *
 *   These coded instructions, statements, and computer programs are the
- *   property of Apple Inc. and are protected by Federal copyright
- *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
- *   which should have been included with this file.  If this file is
- *   file is missing or damaged, see the license at "http://www.cups.org/".
+ *   property of Easy Software Products and are protected by Federal
+ *   copyright law.  Distribution and use rights are outlined in the file
+ *   "LICENSE.txt" which should have been included with this file.  If this
+ *   file is missing or damaged please contact Easy Software Products
+ *   at:
+ *
+ *       Attn: CUPS Licensing Information
+ *       Easy Software Products
+ *       44141 Airport View Drive, Suite 204
+ *       Hollywood, Maryland 20636 USA
+ *
+ *       Voice: (301) 373-9600
+ *       EMail: cups-info@cups.org
+ *         WWW: http://www.cups.org
 *
 * Contents:
 *
 *   main()             - Main entry for CGI.
- *   do_class_op()      - Do a class operation.
 *   show_all_classes() - Show all classes...
 *   show_class()       - Show a single class.
 */
@@ -31,10 +39,8 @@
 * Local functions...
 */

-static void	do_class_op(http_t *http, const char *printer, ipp_op_t op,
-		            const char *title);
-static void	show_all_classes(http_t *http, const char *username);
-static void	show_class(http_t *http, const char *printer);
+void	show_all_classes(http_t *http, const char *username);
+void	show_class(http_t *http, const char *printer);


 /*
@@ -83,9 +89,6 @@ main(int  argc,				/* I - Number of command-line arguments */

    if (!*pclass)
      pclass = NULL;
-
-    if (pclass)
-      cgiSetVariable("PRINTER_NAME", pclass);
  }

 /*
@@ -104,7 +107,7 @@ main(int  argc,				/* I - Number of command-line arguments */
  * Get the default printer...
  */

-  if (!op || !cgiIsPOST())
+  if (!op)
  {
   /*
    * Get the default destination...
@@ -144,40 +147,21 @@ main(int  argc,				/* I - Number of command-line arguments */
    else
      show_class(http, pclass);
  }
-  else if (pclass)
-  {
-    if (!strcmp(op, "start-class"))
-      do_class_op(http, pclass, IPP_RESUME_PRINTER, cgiText(_("Resume Class")));
-    else if (!strcmp(op, "stop-class"))
-      do_class_op(http, pclass, IPP_PAUSE_PRINTER, cgiText(_("Pause Class")));
-    else if (!strcmp(op, "accept-jobs"))
-      do_class_op(http, pclass, CUPS_ACCEPT_JOBS, cgiText(_("Accept Jobs")));
-    else if (!strcmp(op, "reject-jobs"))
-      do_class_op(http, pclass, CUPS_REJECT_JOBS, cgiText(_("Reject Jobs")));
-    else if (!strcmp(op, "purge-jobs"))
-      do_class_op(http, pclass, IPP_PURGE_JOBS, cgiText(_("Purge Jobs")));
-    else if (!strcasecmp(op, "print-test-page"))
-      cgiPrintTestPage(http, pclass);
-    else if (!strcasecmp(op, "move-jobs"))
-      cgiMoveJobs(http, pclass, 0);
-    else
-    {
-     /*
-      * Unknown/bad operation...
-      */
-
-      cgiStartHTML(pclass);
-      cgiCopyTemplateLang("error-op.tmpl");
-      cgiEndHTML();
-    }
-  }
+  else if (!strcasecmp(op, "print-test-page") && pclass)
+    cgiPrintTestPage(http, pclass);
+  else if (!strcasecmp(op, "move-jobs") && pclass)
+    cgiMoveJobs(http, pclass, 0);
  else
  {
   /*
    * Unknown/bad operation...
    */

-    cgiStartHTML(cgiText(_("Classes")));
+    if (pclass)
+      cgiStartHTML(pclass);
+    else
+      cgiStartHTML(cgiText(_("Classes")));
+
    cgiCopyTemplateLang("error-op.tmpl");
    cgiEndHTML();
  }
@@ -196,94 +180,11 @@ main(int  argc,				/* I - Number of command-line arguments */
 }


-/*
- * 'do_class_op()' - Do a class operation.
- */
-
-static void
-do_class_op(http_t      *http,		/* I - HTTP connection */
-            const char	*printer,	/* I - Printer name */
-	    ipp_op_t    op,		/* I - Operation to perform */
-	    const char  *title)		/* I - Title of page */
-{
-  ipp_t		*request;		/* IPP request */
-  char		uri[HTTP_MAX_URI],	/* Printer URI */
-		resource[HTTP_MAX_URI];	/* Path for request */
-
-
- /*
-  * Build a printer request, which requires the following
-  * attributes:
-  *
-  *    attributes-charset
-  *    attributes-natural-language
-  *    printer-uri
-  */
-
-  request = ippNewRequest(op);
-
-  httpAssembleURIf(HTTP_URI_CODING_ALL, uri, sizeof(uri), "ipp", NULL,
-                   "localhost", 0, "/classes/%s", printer);
-  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, "printer-uri",
-               NULL, uri);
-
- /*
-  * Do the request and get back a response...
-  */
-
-  snprintf(resource, sizeof(resource), "/classes/%s", printer);
-  ippDelete(cupsDoRequest(http, request, resource));
-
-  if (cupsLastError() == IPP_NOT_AUTHORIZED)
-  {
-    puts("Status: 401\n");
-    exit(0);
-  }
-  else if (cupsLastError() > IPP_OK_CONFLICT)
-  {
-    cgiStartHTML(title);
-    cgiShowIPPError(_("Unable to do maintenance command:"));
-  }
-  else
-  {
-   /*
-    * Redirect successful updates back to the printer page...
-    */
-
-    char	url[1024],		/* Printer/class URL */
-		refresh[1024];		/* Refresh URL */
-
-
-    cgiRewriteURL(uri, url, sizeof(url), NULL);
-    cgiFormEncode(uri, url, sizeof(uri));
-    snprintf(refresh, sizeof(refresh), "5;URL=%s", uri);
-    cgiSetVariable("refresh_page", refresh);
-
-    cgiStartHTML(title);
-
-    cgiSetVariable("IS_CLASS", "YES");
-
-    if (op == IPP_PAUSE_PRINTER)
-      cgiCopyTemplateLang("printer-stop.tmpl");
-    else if (op == IPP_RESUME_PRINTER)
-      cgiCopyTemplateLang("printer-start.tmpl");
-    else if (op == CUPS_ACCEPT_JOBS)
-      cgiCopyTemplateLang("printer-accept.tmpl");
-    else if (op == CUPS_REJECT_JOBS)
-      cgiCopyTemplateLang("printer-reject.tmpl");
-    else if (op == IPP_PURGE_JOBS)
-      cgiCopyTemplateLang("printer-purge.tmpl");
-  }
-
-  cgiEndHTML();
-}
-
-
 /*
 * 'show_all_classes()' - Show all classes...
 */

-static void
+void
 show_all_classes(http_t     *http,	/* I - Connection to server */
                 const char *user)	/* I - Username */
 {
@@ -297,7 +198,9 @@ show_all_classes(http_t     *http,	/* I - Connection to server */
 			count;		/* Number of classes */
  const char		*var;		/* Form variable */
  void			*search;	/* Search data */
-  char			val[1024];	/* Form variable */
+  char			url[1024],	/* URL for prev/next/this */
+			*urlptr,	/* Position in URL */
+			*urlend;	/* End of URL */


 /*
@@ -333,8 +236,7 @@ show_all_classes(http_t     *http,	/* I - Connection to server */
    * Get a list of matching job objects.
    */

-    if ((var = cgiGetVariable("QUERY")) != NULL &&
-        !cgiGetVariable("CLEAR"))
+    if ((var = cgiGetVariable("QUERY")) != NULL)
      search = cgiCompileSearch(var);
    else
      search = NULL;
@@ -362,8 +264,8 @@ show_all_classes(http_t     *http,	/* I - Connection to server */
    if (first < 0)
      first = 0;

-    sprintf(val, "%d", count);
-    cgiSetVariable("TOTAL", val);
+    sprintf(url, "%d", count);
+    cgiSetVariable("TOTAL", url);

    if ((var = cgiGetVariable("ORDER")) != NULL)
      ascending = !strcasecmp(var, "asc");
@@ -389,18 +291,40 @@ show_all_classes(http_t     *http,	/* I - Connection to server */
    * Save navigation URLs...
    */

-    cgiSetVariable("THISURL", "/classes/");
+    urlend = url + sizeof(url);
+
+    if ((var = cgiGetVariable("QUERY")) != NULL)
+    {
+      strlcpy(url, "/classes/?QUERY=", sizeof(url));
+      urlptr = url + strlen(url);
+
+      cgiFormEncode(urlptr, var, urlend - urlptr);
+      urlptr += strlen(urlptr);
+
+      strlcpy(urlptr, "&", urlend - urlptr);
+      urlptr += strlen(urlptr);
+    }
+    else
+    {
+      strlcpy(url, "/classes/?", sizeof(url));
+      urlptr = url + strlen(url);
+    }
+
+    snprintf(urlptr, urlend - urlptr, "FIRST=%d", first);
+    cgiSetVariable("THISURL", url);

    if (first > 0)
    {
-      sprintf(val, "%d", first - CUPS_PAGE_MAX);
-      cgiSetVariable("PREV", val);
+      snprintf(urlptr, urlend - urlptr, "FIRST=%d&ORDER=%s",
+	       first - CUPS_PAGE_MAX, ascending ? "asc" : "dec");
+      cgiSetVariable("PREVURL", url);
    }

    if ((first + CUPS_PAGE_MAX) < count)
    {
-      sprintf(val, "%d", first + CUPS_PAGE_MAX);
-      cgiSetVariable("NEXT", val);
+      snprintf(urlptr, urlend - urlptr, "FIRST=%d&ORDER=%s",
+	       first + CUPS_PAGE_MAX, ascending ? "asc" : "dec");
+      cgiSetVariable("NEXTURL", url);
    }

   /*
@@ -411,12 +335,12 @@ show_all_classes(http_t     *http,	/* I - Connection to server */

    cgiCopyTemplateLang("classes-header.tmpl");

-    if (count > CUPS_PAGE_MAX)
+    if (count > 0)
      cgiCopyTemplateLang("pager.tmpl");

    cgiCopyTemplateLang("classes.tmpl");

-    if (count > CUPS_PAGE_MAX)
+    if (count > 0)
      cgiCopyTemplateLang("pager.tmpl");

   /*
@@ -443,7 +367,7 @@ show_all_classes(http_t     *http,	/* I - Connection to server */
 * 'show_class()' - Show a single class.
 */

-static void
+void
 show_class(http_t     *http,		/* I - Connection to server */
           const char *pclass)		/* I - Name of class */
 {
@@ -470,7 +394,7 @@ show_class(http_t     *http,		/* I - Connection to server */
  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, "printer-uri", NULL,
               uri);

-  cgiGetAttributes(request, "class.tmpl");
+  cgiGetAttributes(request, "classes.tmpl");

 /*
  * Do the request and get back a response...
@@ -515,7 +439,7 @@ show_class(http_t     *http,		/* I - Connection to server */
    * Show the class status...
    */

-    cgiCopyTemplateLang("class.tmpl");
+    cgiCopyTemplateLang("classes.tmpl");

   /*
    * Show jobs for the specified class...
@@ -1,16 +1,25 @@
 /*
 * "$Id$"
 *
- *   Online help index routines for the Common UNIX Printing System (CUPS).
+ *   On-line help index routines for the Common UNIX Printing System (CUPS).
 *
- *   Copyright 2007-2008 by Apple Inc.
- *   Copyright 1997-2007 by Easy Software Products.
+ *   Copyright 1997-2006 by Easy Software Products.
 *
 *   These coded instructions, statements, and computer programs are the
- *   property of Apple Inc. and are protected by Federal copyright
- *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
- *   which should have been included with this file.  If this file is
- *   file is missing or damaged, see the license at "http://www.cups.org/".
+ *   property of Easy Software Products and are protected by Federal
+ *   copyright law.  Distribution and use rights are outlined in the file
+ *   "LICENSE.txt" which should have been included with this file.  If this
+ *   file is missing or damaged please contact Easy Software Products
+ *   at:
+ *
+ *       Attn: CUPS Licensing Information
+ *       Easy Software Products
+ *       44141 Airport View Drive, Suite 204
+ *       Hollywood, Maryland 20636 USA
+ *
+ *       Voice: (301) 373-9600
+ *       EMail: cups-info@cups.org
+ *         WWW: http://www.cups.org
 *
 * Contents:
 *
@@ -19,16 +28,13 @@
 *   helpLoadIndex()            - Load a help index from disk.
 *   helpSaveIndex()            - Save a help index to disk.
 *   helpSearchIndex()          - Search an index.
- *   help_add_word()            - Add a word to a node.
 *   help_compile_search()      - Convert a search string into a regular expression.
 *   help_delete_node()         - Free all memory used by a node.
- *   help_delete_word()         - Free all memory used by a word.
 *   help_load_directory()      - Load a directory of files into an index.
 *   help_load_file()           - Load a HTML files into an index.
 *   help_new_node()            - Create a new node and add it to an index.
 *   help_sort_nodes_by_name()  - Sort nodes by section, filename, and anchor.
 *   help_sort_nodes_by_score() - Sort nodes by score and text.
- *   help_sort_words()          - Sort words alphabetically.
 */

 /*
@@ -39,118 +45,11 @@
 #include <cups/dir.h>


-/*
- * List of common English words that should not be indexed...
- */
-
-static char		help_common_words[][6] =
-			{
-			  "about",
-			  "all",
-			  "an",
-			  "and",
-			  "are",
-			  "as",
-			  "at",
-			  "be",
-			  "been",
-			  "but",
-			  "by",
-			  "call",
-			  "can",
-			  "come",
-			  "could",
-			  "day",
-			  "did",
-			  "do",
-			  "down",
-			  "each",
-			  "find",
-			  "first",
-			  "for",
-			  "from",
-			  "go",
-			  "had",
-			  "has",
-			  "have",
-			  "he",
-			  "her",
-			  "him",
-			  "his",
-			  "hot",
-			  "how",
-			  "if",
-			  "in",
-			  "is",
-			  "it",
-			  "know",
-			  "like",
-			  "long",
-			  "look",
-			  "make",
-			  "many",
-			  "may",
-			  "more",
-			  "most",
-			  "my",
-			  "no",
-			  "now",
-			  "of",
-			  "on",
-			  "one",
-			  "or",
-			  "other",
-			  "out",
-			  "over",
-			  "said",
-			  "see",
-			  "she",
-			  "side",
-			  "so",
-			  "some",
-			  "sound",
-			  "than",
-			  "that",
-			  "the",
-			  "their",
-			  "them",
-			  "then",
-			  "there",
-			  "these",
-			  "they",
-			  "thing",
-			  "this",
-			  "time",
-			  "to",
-			  "two",
-			  "up",
-			  "use",
-			  "was",
-			  "water",
-			  "way",
-			  "we",
-			  "were",
-			  "what",
-			  "when",
-			  "which",
-			  "who",
-			  "will",
-			  "with",
-			  "word",
-			  "would",
-			  "write",
-			  "you",
-			  "your"
-			};
-
-
 /*
 * Local functions...
 */

-static help_word_t	*help_add_word(help_node_t *n, const char *text);
 static void		help_delete_node(help_node_t *n);
-static void		help_delete_word(help_word_t *w);
 static int		help_load_directory(help_index_t *hi,
 			                    const char *directory,
 					    const char *relative);
@@ -164,7 +63,6 @@ static help_node_t	*help_new_node(const char *filename, const char *anchor,
 				       size_t length);
 static int		help_sort_by_name(help_node_t *p1, help_node_t *p2);
 static int		help_sort_by_score(help_node_t *p1, help_node_t *p2);
-static int		help_sort_words(help_word_t *w1, help_word_t *w2);


 /*
@@ -186,6 +84,9 @@ helpDeleteIndex(help_index_t *hi)	/* I - Help index */
       node;
       node = (help_node_t *)cupsArrayNext(hi->nodes))
  {
+    cupsArrayRemove(hi->nodes, node);
+    cupsArrayRemove(hi->sorted, node);
+
    if (!hi->search)
      help_delete_node(node);
  }
@@ -256,7 +157,6 @@ helpLoadIndex(const char *hifile,	/* I - Index filename */
  size_t	length;			/* Length in bytes */
  int		update;			/* Update? */
  help_node_t	*node;			/* Current node */
-  help_word_t	*word;			/* Current word */


  DEBUG_printf(("helpLoadIndex(hifile=\"%s\", directory=\"%s\")\n",
@@ -292,14 +192,12 @@ helpLoadIndex(const char *hifile,	/* I - Index filename */

    cupsFileLock(fp, 1);

-    if (cupsFileGets(fp, line, sizeof(line)) && !strcmp(line, "HELPV2"))
+    if (cupsFileGets(fp, line, sizeof(line)) && !strcmp(line, "HELPV1"))
    {
     /*
      * Got a valid header line, now read the data lines...
      */

-      node = NULL;
-
      while (cupsFileGets(fp, line, sizeof(line)))
      {
       /*
@@ -307,80 +205,41 @@ helpLoadIndex(const char *hifile,	/* I - Index filename */
 	*
 	*     filename mtime offset length "section" "text"
 	*     filename#anchor offset length "text"
-	*     SP count word
 	*/

-        if (line[0] == ' ')
+	filename = line;
+
+	if ((ptr = strchr(line, ' ')) == NULL)
+          break;
+
+	while (isspace(*ptr & 255))
+          *ptr++ = '\0';
+
+	if ((anchor = strrchr(filename, '#')) != NULL)
 	{
-	 /*
-	  * Read a word in the current node...
-	  */
-
-          if (!node || (ptr = strrchr(line, ' ')) == NULL)
-	    continue;
-
-          if ((word = help_add_word(node, ptr + 1)) != NULL)
-	    word->count = atoi(line + 1);
-        }
+          *anchor++ = '\0';
+	  mtime = 0;
+	}
 	else
+	  mtime = strtol(ptr, &ptr, 10);
+
+	offset = strtoll(ptr, &ptr, 10);
+	length = strtoll(ptr, &ptr, 10);
+
+	while (isspace(*ptr & 255))
+          ptr ++;
+
+        if (!anchor)
 	{
 	 /*
-	  * Add a node...
+	  * Get section...
 	  */

-	  filename = line;
-
-	  if ((ptr = strchr(line, ' ')) == NULL)
-            break;
-
-	  while (isspace(*ptr & 255))
-            *ptr++ = '\0';
-
-	  if ((anchor = strrchr(filename, '#')) != NULL)
-	  {
-            *anchor++ = '\0';
-	    mtime = 0;
-	  }
-	  else
-	    mtime = strtol(ptr, &ptr, 10);
-
-	  offset = strtoll(ptr, &ptr, 10);
-	  length = strtoll(ptr, &ptr, 10);
-
-	  while (isspace(*ptr & 255))
-            ptr ++;
-
-          if (!anchor)
-	  {
-	   /*
-	    * Get section...
-	    */
-
-            if (*ptr != '\"')
-	      break;
-
-            ptr ++;
-	    sectptr = ptr;
-
-            while (*ptr && *ptr != '\"')
-	      ptr ++;
-
-            if (*ptr != '\"')
-	      break;
-
-            *ptr++ = '\0';
-
-            strlcpy(section, sectptr, sizeof(section));
-
-	    while (isspace(*ptr & 255))
-              ptr ++;
-          }
-
          if (*ptr != '\"')
 	    break;

          ptr ++;
-	  text = ptr;
+	  sectptr = ptr;

          while (*ptr && *ptr != '\"')
 	    ptr ++;
@@ -390,14 +249,33 @@ helpLoadIndex(const char *hifile,	/* I - Index filename */

          *ptr++ = '\0';

-	  if ((node = help_new_node(filename, anchor, section, text,
-				    mtime, offset, length)) == NULL)
-            break;
+          strlcpy(section, sectptr, sizeof(section));

-	  node->score = -1;
-
-	  cupsArrayAdd(hi->nodes, node);
+	  while (isspace(*ptr & 255))
+            ptr ++;
        }
+
+        if (*ptr != '\"')
+	  break;
+
+        ptr ++;
+	text = ptr;
+
+        while (*ptr && *ptr != '\"')
+	  ptr ++;
+
+        if (*ptr != '\"')
+	  break;
+
+        *ptr++ = '\0';
+
+	if ((node = help_new_node(filename, anchor, section, text,
+				  mtime, offset, length)) == NULL)
+          break;
+
+	node->score = -1;
+
+	cupsArrayAdd(hi->nodes, node);
      }
    }

@@ -461,7 +339,6 @@ helpSaveIndex(help_index_t *hi,		/* I - Index */
 {
  cups_file_t	*fp;			/* Index file */
  help_node_t	*node;			/* Current node */
-  help_word_t	*word;			/* Current word */


  DEBUG_printf(("helpSaveIndex(hi=%p, hifile=\"%s\")\n", hi, hifile));
@@ -479,7 +356,7 @@ helpSaveIndex(help_index_t *hi,		/* I - Index */

  cupsFileLock(fp, 1);

-  cupsFilePuts(fp, "HELPV2\n");
+  cupsFilePuts(fp, "HELPV1\n");

  for (node = (help_node_t *)cupsArrayFirst(hi->nodes);
       node;
@@ -500,21 +377,11 @@ helpSaveIndex(help_index_t *hi,		/* I - Index */
    else
    {
      if (cupsFilePrintf(fp, "%s %d " CUPS_LLFMT " " CUPS_LLFMT " \"%s\" \"%s\"\n",
-                         node->filename, (int)node->mtime,
+                         node->filename, node->mtime,
                         CUPS_LLCAST node->offset, CUPS_LLCAST node->length,
 			 node->section ? node->section : "", node->text) < 0)
        break;
    }
-
-   /*
-    * Then write the words associated with the node...
-    */
-
-    for (word = (help_word_t *)cupsArrayFirst(node->words);
-         word;
-	 word = (help_word_t *)cupsArrayNext(node->words))
-      if (cupsFilePrintf(fp, " %d %s\n", word->count, word->text) < 0)
-        break;
  }

  cupsFileFlush(fp);
@@ -540,7 +407,6 @@ helpSearchIndex(help_index_t *hi,	/* I - Index */
 {
  help_index_t	*search;		/* Search index */
  help_node_t	*node;			/* Current node */
-  help_word_t	*word;			/* Current word */
  void		*sc;			/* Search context */
  int		matches;		/* Number of matches */

@@ -621,27 +487,16 @@ helpSearchIndex(help_index_t *hi,	/* I - Index */
      continue;
    else if (filename && strcmp(node->filename, filename))
      continue;
-    else
+    else if ((matches = cgiDoSearch(sc, node->text)) > 0)
    {
-      matches = cgiDoSearch(sc, node->text);
+     /*
+      * Found a match, add the node to the search index...
+      */

-      for (word = (help_word_t *)cupsArrayFirst(node->words);
-           word;
-	   word = (help_word_t *)cupsArrayNext(node->words))
-        if (cgiDoSearch(sc, word->text) > 0)
-          matches += word->count;
+      node->score = matches;

-      if (matches > 0)
-      {
-       /*
-	* Found a match, add the node to the search index...
-	*/
-
-	node->score = matches;
-
-	cupsArrayAdd(search->nodes, node);      
-	cupsArrayAdd(search->sorted, node);      
-      }
+      cupsArrayAdd(search->nodes, node);      
+      cupsArrayAdd(search->sorted, node);      
    }

 /*
@@ -658,61 +513,6 @@ helpSearchIndex(help_index_t *hi,	/* I - Index */
 }


-/*
- * 'help_add_word()' - Add a word to a node.
- */
-
-static help_word_t *			/* O - New word */
-help_add_word(help_node_t *n,		/* I - Node */
-              const char  *text)	/* I - Word text */
-{
-  help_word_t	*w,			/* New word */
-		key;			/* Search key */
-
-
-  DEBUG_printf(("help_add_word(n=%p, text=\"%s\")\n", n, text));
-
- /*
-  * Create the words array as needed...
-  */
-
-  if (!n->words)
-    n->words = cupsArrayNew((cups_array_func_t)help_sort_words, NULL);
-
- /*
-  * See if the word is already added...
-  */
-
-  key.text = (char *)text;
-
-  if ((w = (help_word_t *)cupsArrayFind(n->words, &key)) == NULL)
-  {
-   /*
-    * Create a new word...
-    */
-
-    if ((w = calloc(1, sizeof(help_word_t))) == NULL)
-      return (NULL);
-
-    if ((w->text = strdup(text)) == NULL)
-    {
-      free(w);
-      return (NULL);
-    }
-
-    cupsArrayAdd(n->words, w);
-  }
-
- /*
-  * Bump the counter for this word and return it...
-  */
-
-  w->count ++;
-
-  return (w);
-}
-
-
 /*
 * 'help_delete_node()' - Free all memory used by a node.
 */
@@ -720,9 +520,6 @@ help_add_word(help_node_t *n,		/* I - Node */
 static void
 help_delete_node(help_node_t *n)	/* I - Node */
 {
-  help_word_t	*w;			/* Current word */
-
-
  DEBUG_printf(("help_delete_node(n=%p)\n", n));

  if (!n)
@@ -740,36 +537,10 @@ help_delete_node(help_node_t *n)	/* I - Node */
  if (n->text)
    free(n->text);

-  for (w = (help_word_t *)cupsArrayFirst(n->words);
-       w;
-       w = (help_word_t *)cupsArrayNext(n->words))
-    help_delete_word(w);
-
-  cupsArrayDelete(n->words);
-
  free(n);
 }


-/*
- * 'help_delete_word()' - Free all memory used by a word.
- */
-
-static void
-help_delete_word(help_word_t *w)	/* I - Word */
-{
-  DEBUG_printf(("help_delete_word(w=%p)\n", w));
-
-  if (!w)
-    return;
-
-  if (w->text)
-    free(w->text);
-
-  free(w);
-}
-
-
 /*
 * 'help_load_directory()' - Load a directory of files into an index.
 */
@@ -890,15 +661,12 @@ help_load_file(
  cups_file_t	*fp;			/* HTML file */
  help_node_t	*node;			/* Current node */
  char		line[1024],		/* Line from file */
-		temp[1024],		/* Temporary word */
                section[1024],		/* Section */
 		*ptr,			/* Pointer into line */
 		*anchor,		/* Anchor name */
 		*text;			/* Text for anchor */
  off_t		offset;			/* File offset */
  char		quote;			/* Quote character */
-  help_word_t	*word;			/* Current word */
-  int		wordlen;		/* Length of word */


  DEBUG_printf(("help_load_file(hi=%p, filename=\"%s\", relative=\"%s\", mtime=%ld)\n",
@@ -1050,17 +818,6 @@ help_load_file(
 	if (node->text)
 	  free(node->text);

-        if (node->words)
-	{
-	  for (word = (help_word_t *)cupsArrayFirst(node->words);
-	       word;
-	       word = (help_word_t *)cupsArrayNext(node->words))
-	    help_delete_word(word);
-
-	  cupsArrayDelete(node->words);
-	  node->words = NULL;
-	}
-
 	node->section = section[0] ? strdup(section) : NULL;
 	node->text    = strdup(text);
 	node->mtime   = mtime;
@@ -1104,99 +861,9 @@ help_load_file(
      */

      cupsArrayAdd(hi->nodes, node);
-
-      if (!anchor)
-        node = NULL;
      break;
    }

-    if (node)
-    {
-     /*
-      * Scan this line for words...
-      */
-
-      for (ptr = line; *ptr; ptr ++)
-      {
-       /*
-	* Skip HTML stuff...
-	*/
-
-	if (*ptr == '<')
-	{
-          if (!strncmp(ptr, "<!--", 4))
-	  {
-	   /*
-	    * Skip HTML comment...
-	    */
-
-            if ((text = strstr(ptr + 4, "-->")) == NULL)
-	      ptr += strlen(ptr) - 1;
-	    else
-	      ptr = text + 2;
-	  }
-	  else
-	  {
-	   /*
-            * Skip HTML element...
-	    */
-
-            for (ptr ++; *ptr && *ptr != '>'; ptr ++)
-	    {
-	      if (*ptr == '\"' || *ptr == '\'')
-	      {
-		for (quote = *ptr++; *ptr && *ptr != quote; ptr ++);
-
-		if (!*ptr)
-		  ptr --;
-	      }
-	    }
-
-	    if (!*ptr)
-	      ptr --;
-          }
-
-          continue;
-	}
-	else if (*ptr == '&')
-	{
-	 /*
-	  * Skip HTML entity...
-	  */
-
-	  for (ptr ++; *ptr && *ptr != ';'; ptr ++);
-
-	  if (!*ptr)
-	    ptr --;
-
-	  continue;
-	}
-	else if (!isalnum(*ptr & 255))
-          continue;
-
-       /*
-	* Found the start of a word, search until we find the end...
-	*/
-
-	for (text = ptr, ptr ++; *ptr && isalnum(*ptr & 255); ptr ++);
-
-	wordlen = ptr - text;
-
-        memcpy(temp, text, wordlen);
-	temp[wordlen] = '\0';
-
-        ptr --;
-
-	if (wordlen > 1 && !bsearch(temp, help_common_words,
-	                            (sizeof(help_common_words) /
-				     sizeof(help_common_words[0])),
-				    sizeof(help_common_words[0]),
-				    (int (*)(const void *, const void *))
-				        strcasecmp))
-          help_add_word(node, temp);
-      }
-    }
-
   /*
    * Get the offset of the next line...
    */
@@ -1297,7 +964,7 @@ help_sort_by_score(help_node_t *n1,	/* I - First node */
                n2, n2->score, n2->section ? n2->section : "", n2->text));

  if (n1->score != n2->score)
-    return (n2->score - n1->score);
+    return (n1->score - n2->score);

  if (n1->section && !n2->section)
    return (1);
@@ -1311,21 +978,6 @@ help_sort_by_score(help_node_t *n1,	/* I - First node */
 }


-/*
- * 'help_sort_words()' - Sort words alphabetically.
- */
-
-static int				/* O - Difference */
-help_sort_words(help_word_t *w1,	/* I - Second word */
-                help_word_t *w2)	/* I - Second word */
-{
-  DEBUG_printf(("help_sort_words(w1=%p(\"%s\"), w2=%p(\"%s\"))\n",
-                w1, w1->text, w2, w2->text));
-
-  return (strcasecmp(w1->text, w2->text));
-}
-
-
 /*
 * End of "$Id$".
 */
@@ -1,16 +1,25 @@
 /*
 * "$Id$"
 *
- *   Online help index definitions for the Common UNIX Printing System (CUPS).
+ *   On-line help index definitions for the Common UNIX Printing System (CUPS).
 *
- *   Copyright 2007 by Apple Inc.
- *   Copyright 1997-2007 by Easy Software Products.
+ *   Copyright 1997-2006 by Easy Software Products.
 *
 *   These coded instructions, statements, and computer programs are the
- *   property of Apple Inc. and are protected by Federal copyright
- *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
- *   which should have been included with this file.  If this file is
- *   file is missing or damaged, see the license at "http://www.cups.org/".
+ *   property of Easy Software Products and are protected by Federal
+ *   copyright law.  Distribution and use rights are outlined in the file
+ *   "LICENSE.txt" which should have been included with this file.  If this
+ *   file is missing or damaged please contact Easy Software Products
+ *   at:
+ *
+ *       Attn: CUPS Licensing Information
+ *       Easy Software Products
+ *       44141 Airport View Drive, Suite 204
+ *       Hollywood, Maryland 20636 USA
+ *
+ *       Voice: (301) 373-9600
+ *       EMail: cups-info@cups.org
+ *         WWW: http://www.cups.org
 */

 #ifndef _CUPS_HELP_INDEX_H_
@@ -27,26 +36,19 @@
 * Data structures...
 */

-typedef struct help_word_s		/**** Help word structure... ****/
-{
-  int		count;			/* Number of occurrences */
-  char		*text;			/* Word text */
-} help_word_t;
-
-typedef struct help_node_s		/**** Help node structure... ****/
+typedef struct				/**** Help node structure... ****/
 {
  char		*filename;		/* Filename, relative to help dir */
  char		*section;		/* Section name (NULL if none) */
  char		*anchor;		/* Anchor name (NULL if none) */
  char		*text;			/* Text in anchor */
-  cups_array_t	*words;			/* Words after this node */
  time_t	mtime;			/* Last modification time */
  off_t		offset;			/* Offset in file */
  size_t	length;			/* Length in bytes */
  int		score;			/* Search score */
 } help_node_t;

-typedef struct help_index_s		/**** Help index structure ****/
+typedef struct				/**** Help index structure ****/
 {
  int		search;			/* 1 = search index, 0 = normal */
  cups_array_t	*nodes;			/* Nodes sorted by filename */
@@ -1,16 +1,25 @@
 /*
 * "$Id$"
 *
- *   Online help CGI for the Common UNIX Printing System (CUPS).
+ *   On-line help CGI for the Common UNIX Printing System (CUPS).
 *
- *   Copyright 2007-2008 by Apple Inc.
 *   Copyright 1997-2006 by Easy Software Products.
 *
 *   These coded instructions, statements, and computer programs are the
- *   property of Apple Inc. and are protected by Federal copyright
- *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
- *   which should have been included with this file.  If this file is
- *   file is missing or damaged, see the license at "http://www.cups.org/".
+ *   property of Easy Software Products and are protected by Federal
+ *   copyright law.  Distribution and use rights are outlined in the file
+ *   "LICENSE.txt" which should have been included with this file.  If this
+ *   file is missing or damaged please contact Easy Software Products
+ *   at:
+ *
+ *       Attn: CUPS Licensing Information
+ *       Easy Software Products
+ *       44141 Airport View Drive, Suite 204
+ *       Hollywood, Maryland 20636 USA
+ *
+ *       Voice: (301) 373-9600
+ *       EMail: cups-info@cups.org
+ *         WWW: http://www.cups.org
 *
 * Contents:
 *
@@ -86,7 +95,7 @@ main(int  argc,				/* I - Number of command-line arguments */
  {
    perror(filename);

-    cgiStartHTML(cgiText(_("Online Help")));
+    cgiStartHTML(cgiText(_("Help")));
    cgiSetVariable("ERROR", "Unable to load help index!");
    cgiCopyTemplateLang("error.tmpl");
    cgiEndHTML();
@@ -127,7 +136,7 @@ main(int  argc,				/* I - Number of command-line arguments */
    {
      perror(filename);

-      cgiStartHTML(cgiText(_("Online Help")));
+      cgiStartHTML(cgiText(_("Help")));
      cgiSetVariable("ERROR", "Unable to access help file!");
      cgiCopyTemplateLang("error.tmpl");
      cgiEndHTML();
@@ -137,7 +146,7 @@ main(int  argc,				/* I - Number of command-line arguments */

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

    cgiSetVariable("HELPFILE", helpfile);
    cgiSetVariable("HELPTITLE", n->text);
-    cgiSetVariable("TOPIC", n->section);

   /*
    * Send a standard page header...
@@ -168,16 +176,13 @@ main(int  argc,				/* I - Number of command-line arguments */
    * Send a standard page header...
    */

-    cgiStartHTML(cgiText(_("Online Help")));
+    cgiStartHTML(cgiText(_("Help")));
  }

 /*
  * Do a search as needed...
  */

-  if (cgiGetVariable("CLEAR"))
-    cgiSetVariable("QUERY", "");
-
  query = cgiGetVariable("QUERY");
  topic = cgiGetVariable("TOPIC");
  si    = helpSearchIndex(hi, query, topic, helpfile);
@@ -359,10 +364,7 @@ main(int  argc,				/* I - Number of command-line arguments */
  */

  if (!printable)
-  {
-    cgiCopyTemplateLang("help-trailer.tmpl");
    cgiEndHTML();
-  }
  else
    puts("</BODY>\n</HTML>");

@@ -3,23 +3,30 @@
 *
 *   HTML support functions for the Common UNIX Printing System (CUPS).
 *
- *   Copyright 2007-2008 by Apple Inc.
 *   Copyright 1997-2006 by Easy Software Products.
 *
 *   These coded instructions, statements, and computer programs are the
- *   property of Apple Inc. and are protected by Federal copyright
- *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
- *   which should have been included with this file.  If this file is
- *   file is missing or damaged, see the license at "http://www.cups.org/".
+ *   property of Easy Software Products and are protected by Federal
+ *   copyright law.  Distribution and use rights are outlined in the file
+ *   "LICENSE.txt" which should have been included with this file.  If this
+ *   file is missing or damaged please contact Easy Software Products
+ *   at:
+ *
+ *       Attn: CUPS Licensing Information
+ *       Easy Software Products
+ *       44141 Airport View Drive, Suite 204
+ *       Hollywood, Maryland 20636 USA
+ *
+ *       Voice: (301) 373-9600
+ *       EMail: cups-info@cups.org
+ *         WWW: http://www.cups.org
 *
 * Contents:
 *
- *   cgiEndHTML()        - End a HTML page.
- *   cgiEndMultipart()   - End the delivery of a multipart web page.
- *   cgiFormEncode()     - Encode a string as a form variable...
- *   cgiStartHTML()      - Start a HTML page.
- *   cgiStartMultipart() - Start a multipart delivery of a web page...
- *   cgi_null_passwd()   - Return a NULL password for authentication.
+ *   cgiEndHTML()      - End a HTML page.
+ *   cgiFormEncode()   - Encode a string as a form variable...
+ *   cgiStartHTML()    - Start a HTML page.
+ *   cgi_null_passwd() - Return a NULL password for authentication.
 */

 /*
@@ -29,14 +36,6 @@
 #include "cgi-private.h"


-/*
- * Local globals...
- */
-
-static const char	*cgi_multipart = NULL;
-					/* Multipart separator, if any */
-
-
 /*
 * Local functions...
 */
@@ -59,18 +58,6 @@ cgiEndHTML(void)
 }


-/*
- * 'cgiEndMultipart()' - End the delivery of a multipart web page.
- */
-
-void
-cgiEndMultipart(void)
-{
-  if (cgi_multipart)
-    printf("\n%s--\n", cgi_multipart);
-}
-
-
 /*
 * 'cgiFormEncode()' - Encode a string as a form variable...
 */
@@ -166,9 +153,6 @@ cgiStartHTML(const char *title)		/* I - Title of page */
  * Tell the client to expect UTF-8 encoded HTML...
  */

-  if (cgi_multipart)
-    puts(cgi_multipart);
-
  puts("Content-Type: text/html;charset=utf-8\n");

 /*
@@ -182,19 +166,6 @@ cgiStartHTML(const char *title)		/* I - Title of page */
 }


-/*
- * 'cgiStartMultipart()' - Start a multipart delivery of a web page...
- */
-
-void
-cgiStartMultipart(void)
-{
-  puts("MIME-Version: 1.0");
-  puts("Content-Type: multipart/x-mixed-replace; boundary=\"CUPS-MULTIPART\"\n");
-  cgi_multipart = "--CUPS-MULTIPART";
-}
-
-
 /*
 * 'cgi_null_passwd()' - Return a NULL password for authentication.
 */
@@ -3,22 +3,30 @@
 *
 *   CGI <-> IPP variable routines for the Common UNIX Printing System (CUPS).
 *
- *   Copyright 2007-2008 by Apple Inc.
- *   Copyright 1997-2007 by Easy Software Products.
+ *   Copyright 1997-2006 by Easy Software Products.
 *
 *   These coded instructions, statements, and computer programs are the
- *   property of Apple Inc. and are protected by Federal copyright
- *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
- *   which should have been included with this file.  If this file is
- *   file is missing or damaged, see the license at "http://www.cups.org/".
+ *   property of Easy Software Products and are protected by Federal
+ *   copyright law.  Distribution and use rights are outlined in the file
+ *   "LICENSE.txt" which should have been included with this file.  If this
+ *   file is missing or damaged please contact Easy Software Products
+ *   at:
+ *
+ *       Attn: CUPS Licensing Information
+ *       Easy Software Products
+ *       44141 Airport View Drive, Suite 204
+ *       Hollywood, Maryland 20636 USA
+ *
+ *       Voice: (301) 373-9600
+ *       EMail: cups-info@cups.org
+ *         WWW: http://www.cups.org
 *
 * Contents:
 *
- *   cgiGetAttributes()    - Get the list of attributes that are needed by the
- *                           template file.
+ *   cgiGetAttributes()    - Get the list of attributes that are needed
+ *                           by the template file.
 *   cgiGetIPPObjects()    - Get the objects in an IPP response.
 *   cgiMoveJobs()         - Move one or more jobs.
- *   cgiPrintCommand()     - Print a CUPS command job.
 *   cgiPrintTestPage()    - Print a test page.
 *   cgiRewriteURL()       - Rewrite a printer URI into a web browser URL...
 *   cgiSetIPPObjectVars() - Set CGI variables from an IPP object.
@@ -114,7 +122,7 @@ cgiGetAttributes(ipp_t      *request,	/* I - IPP request */
      */

      for (nameptr = name; (ch = getc(in)) != EOF;)
-        if (strchr("}]<>=!~ \t\n", ch))
+        if (strchr("}]<>=! \t\n", ch))
          break;
        else if (nameptr > name && ch == '?')
 	  break;
@@ -159,8 +167,6 @@ cgiGetAttributes(ipp_t      *request,	/* I - IPP request */
    for (i = 0; i < num_attrs; i ++)
      free(attrs[i]);
  }
-
-  fclose(in);
 }


@@ -475,16 +481,10 @@ cgiMoveJobs(http_t     *http,		/* I - Connection to server */

    if (cupsLastError() <= IPP_OK_CONFLICT)
    {
-      const char *path = strstr(job_printer_uri, "/printers/");
-      if (!path)
-        path = strstr(job_printer_uri, "/classes/");
-
-      if (path)
-      {
-        cgiFormEncode(uri, path, sizeof(uri));
-        snprintf(refresh, sizeof(refresh), "2;URL=%s", uri);
-	cgiSetVariable("refresh_page", refresh);
-      }
+      cgiRewriteURL(job_printer_uri, resource, sizeof(resource), NULL);
+      cgiFormEncode(uri, resource, sizeof(uri));
+      snprintf(refresh, sizeof(refresh), "2;URL=%s", uri);
+      cgiSetVariable("refresh_page", refresh);
    }

    if (job_id)
@@ -510,155 +510,6 @@ cgiMoveJobs(http_t     *http,		/* I - Connection to server */
 }


-/*
- * 'cgiPrintCommand()' - Print a CUPS command job.
- */
-
-void
-cgiPrintCommand(http_t     *http,	/* I - Connection to server */
-                const char *dest,	/* I - Destination printer */
-                const char *command,	/* I - Command to send */
-		const char *title)	/* I - Page/job title */
-{
-  int		job_id;			/* Command file job */
-  char		uri[HTTP_MAX_URI],	/* Job URI */
-		resource[1024],		/* Printer resource path */
-		refresh[1024],		/* Refresh URL */
-		command_file[1024];	/* Command "file" */
-  http_status_t	status;			/* Document status */
-  cups_option_t	hold_option;		/* job-hold-until option */
-  const char	*user;			/* User name */
-  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 */
-		{
-		  "job-state",
-		  "job-printer-state-message"
-		};
-
-
- /*
-  * Create the CUPS command file...
-  */
-
-  snprintf(command_file, sizeof(command_file), "#CUPS-COMMAND\n%s\n", command);
-
- /*
-  * Show status...
-  */
-
-  cgiStartMultipart();
-  cgiStartHTML(title);
-  cgiCopyTemplateLang("command.tmpl");
-  cgiEndHTML();
-  fflush(stdout);
-
- /*
-  * Send the command file job...
-  */
-
-  hold_option.name  = "job-hold-until";
-  hold_option.value = "no-hold";
-
-  if ((user = getenv("REMOTE_USER")) != NULL)
-    cupsSetUser(user);
-  else
-    cupsSetUser("anonymous");
-
-  if ((job_id = cupsCreateJob(http, dest, title,
-			      1, &hold_option)) < 1)
-  {
-    cgiSetVariable("MESSAGE", cgiText(_("Unable to send command to printer driver!")));
-    cgiSetVariable("ERROR", cupsLastErrorString());
-    cgiStartHTML(title);
-    cgiCopyTemplateLang("error.tmpl");
-    cgiEndHTML();
-    cgiEndMultipart();
-    return;
-  }
-
-  status = cupsStartDocument(http, dest, job_id, NULL, CUPS_FORMAT_COMMAND, 1);
-  if (status == HTTP_CONTINUE)
-    status = cupsWriteRequestData(http, command_file,
-				  strlen(command_file));
-  if (status == HTTP_CONTINUE)
-    cupsFinishDocument(http, dest);
-
-  if (cupsLastError() >= IPP_REDIRECTION_OTHER_SITE)
-  {
-    cgiSetVariable("MESSAGE", cgiText(_("Unable to send command to printer driver!")));
-    cgiSetVariable("ERROR", cupsLastErrorString());
-    cgiStartHTML(title);
-    cgiCopyTemplateLang("error.tmpl");
-    cgiEndHTML();
-    cgiEndMultipart();
-
-    cupsCancelJob(dest, job_id);
-    return;
-  }
-
- /*
-  * Wait for the job to complete...
-  */
-
-  for (;;)
-  {
-   /*
-    * Get the current job state...
-    */
-
-    snprintf(uri, sizeof(uri), "ipp://localhost/jobs/%d", job_id);
-    request = ippNewRequest(IPP_GET_JOB_ATTRIBUTES);
-    ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, "job-uri",
-		 NULL, uri);
-    if (user)
-      ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_NAME,
-		   "requesting-user-name", NULL, user);
-    ippAddStrings(request, IPP_TAG_OPERATION, IPP_TAG_KEYWORD,
-		  "requested-attributes", 2, NULL, job_attrs);
-
-    if ((response = cupsDoRequest(http, request, "/")) != NULL)
-      cgiSetIPPVars(response, NULL, NULL, NULL, 0);
-
-    attr = ippFindAttribute(response, "job-state", IPP_TAG_ENUM);
-    if (!attr || attr->values[0].integer >= IPP_JOB_STOPPED)
-    {
-      ippDelete(response);
-      break;
-    }
-
-   /*
-    * Job not complete, so update the status...
-    */
-
-    ippDelete(response);
-
-    cgiStartHTML(title);
-    cgiCopyTemplateLang("command.tmpl");
-    cgiEndHTML();
-    fflush(stdout);
-
-    sleep(5);
-  }
-
- /*
-  * Send the final page that reloads the printer's page...
-  */
-
-  snprintf(resource, sizeof(resource), "/printers/%s", dest);
-
-  cgiFormEncode(uri, resource, sizeof(uri));
-  snprintf(refresh, sizeof(refresh), "5;URL=%s", uri);
-  cgiSetVariable("refresh_page", refresh);
-
-  cgiStartHTML(title);
-  cgiCopyTemplateLang("command.tmpl");
-  cgiEndHTML();
-  cgiEndMultipart();
-}
-
-
 /*
 * 'cgiPrintTestPage()' - Print a test page.
 */
@@ -681,7 +532,8 @@ cgiPrintTestPage(http_t     *http,	/* I - Connection to server */
  * See who is logged in...
  */

-  user = getenv("REMOTE_USER");
+  if ((user = getenv("REMOTE_USER")) == NULL)
+    user = "guest";

 /*
  * Locate the test page file...
@@ -690,7 +542,7 @@ cgiPrintTestPage(http_t     *http,	/* I - Connection to server */
  if ((datadir = getenv("CUPS_DATADIR")) == NULL)
    datadir = CUPS_DATADIR;

-  snprintf(filename, sizeof(filename), "%s/data/testprint", datadir);
+  snprintf(filename, sizeof(filename), "%s/data/testprint.ps", datadir);

 /*
  * Point to the printer/class...
@@ -711,6 +563,7 @@ cgiPrintTestPage(http_t     *http,	/* I - Connection to server */
  *    attributes-natural-language
  *    printer-uri
  *    requesting-user-name
+  *    document-format
  */

  request = ippNewRequest(IPP_PRINT_JOB);
@@ -718,13 +571,15 @@ cgiPrintTestPage(http_t     *http,	/* I - Connection to server */
  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, "printer-uri",
               NULL, uri);

-  if (user)
-    ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_NAME,
-		 "requesting-user-name", NULL, user);
+  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_NAME,
+               "requesting-user-name", NULL, user);

  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_NAME, "job-name",
               NULL, "Test Page");

+  ippAddString(request, IPP_TAG_JOB, IPP_TAG_MIMETYPE, "document-format",
+               NULL, "application/postscript");
+
 /*
  * Do the request and get back a response...
  */
@@ -747,11 +602,6 @@ cgiPrintTestPage(http_t     *http,	/* I - Connection to server */
    snprintf(refresh, sizeof(refresh), "2;URL=%s", uri);
    cgiSetVariable("refresh_page", refresh);
  }
-  else if (cupsLastError() == IPP_NOT_AUTHORIZED)
-  {
-    puts("Status: 401\n");
-    exit(0);
-  }

  cgiStartHTML(cgiText(_("Print Test Page")));

@@ -978,144 +828,6 @@ cgiSetIPPObjectVars(
      cgiSetArray("job_printer_name", element, valptr);
    }

-   /*
-    * Localize event names in "notify_events" variable...
-    */
-
-    if (!strcmp(name, "notify_events"))
-    {
-      size_t	remaining;		/* Remaining bytes in buffer */
-
-
-      value[0] = '\0';
-      valptr   = value;
-
-      for (i = 0; i < attr->num_values; i ++)
-      {
-        if (valptr >= (value + sizeof(value) - 3))
-	  break;
-
-        if (i)
-	{
-	  *valptr++ = ',';
-	  *valptr++ = ' ';
-        }
-
-        remaining = sizeof(value) - (valptr - value);
-
-        if (!strcmp(attr->values[i].string.text, "printer-stopped"))
-	  strlcpy(valptr, _("Printer Paused"), remaining);
-	else if (!strcmp(attr->values[i].string.text, "printer-added"))
-	  strlcpy(valptr, _("Printer Added"), remaining);
-	else if (!strcmp(attr->values[i].string.text, "printer-modified"))
-	  strlcpy(valptr, _("Printer Modified"), remaining);
-	else if (!strcmp(attr->values[i].string.text, "printer-deleted"))
-	  strlcpy(valptr, _("Printer Deleted"), remaining);
-	else if (!strcmp(attr->values[i].string.text, "job-created"))
-	  strlcpy(valptr, _("Job Created"), remaining);
-	else if (!strcmp(attr->values[i].string.text, "job-completed"))
-	  strlcpy(valptr, _("Job Completed"), remaining);
-	else if (!strcmp(attr->values[i].string.text, "job-stopped"))
-	  strlcpy(valptr, _("Job Stopped"), remaining);
-	else if (!strcmp(attr->values[i].string.text, "job-config-changed"))
-	  strlcpy(valptr, _("Job Options Changed"), remaining);
-	else if (!strcmp(attr->values[i].string.text, "server-restarted"))
-	  strlcpy(valptr, _("Server Restarted"), remaining);
-	else if (!strcmp(attr->values[i].string.text, "server-started"))
-	  strlcpy(valptr, _("Server Started"), remaining);
-	else if (!strcmp(attr->values[i].string.text, "server-stopped"))
-	  strlcpy(valptr, _("Server Stopped"), remaining);
-	else if (!strcmp(attr->values[i].string.text, "server-audit"))
-	  strlcpy(valptr, _("Server Security Auditing"), remaining);
-	else
-          strlcpy(valptr, attr->values[i].string.text, remaining);
-
-        valptr += strlen(valptr);
-      }
-
-      cgiSetArray("notify_events", element, value);
-      continue;
-    }
-
-   /*
-    * Add "notify_printer_name" variable if we have a "notify_printer_uri"
-    * attribute...
-    */
-
-    if (!strcmp(name, "notify_printer_uri"))
-    {
-      if ((valptr = strrchr(attr->values[0].string.text, '/')) == NULL)
-	valptr = "unknown";
-      else
-	valptr ++;
-
-      cgiSetArray("notify_printer_name", element, valptr);
-    }
-
-   /*
-    * Add "notify_recipient_name" variable if we have a "notify_recipient_uri"
-    * attribute, and rewrite recipient URI...
-    */
-
-    if (!strcmp(name, "notify_recipient_uri"))
-    {
-      char	uri[1024],		/* New URI */
-		scheme[32],		/* Scheme portion of URI */
-		userpass[256],		/* Username/password portion of URI */
-		host[1024],		/* Hostname portion of URI */
-		resource[1024],		/* Resource portion of URI */
-		*options;		/* Options in URI */
-      int	port;			/* Port number */
-
-
-      httpSeparateURI(HTTP_URI_CODING_ALL, attr->values[0].string.text,
-                      scheme, sizeof(scheme), userpass, sizeof(userpass),
-		      host, sizeof(host), &port, resource, sizeof(resource));
-
-      if (!strcmp(scheme, "rss"))
-      {
-       /*
-        * RSS notification...
-	*/
-
-        if ((options = strchr(resource, '?')) != NULL)
-	  *options = '\0';
-
-        if (host[0])
-	{
-	 /*
-	  * Link to remote feed...
-	  */
-
-	  httpAssembleURI(HTTP_URI_CODING_ALL, uri, sizeof(uri), "http",
-	                  userpass, host, port, resource);
-          strlcpy(name, uri, sizeof(name));
-	}
-	else
-	{
-	 /*
-	  * Link to local feed...
-	  */
-
-	  snprintf(uri, sizeof(uri), "/rss%s", resource);
-          strlcpy(name, resource + 1, sizeof(name));
-	}
-      }
-      else
-      {
-       /*
-        * Other...
-	*/
-
-        strlcpy(uri, attr->values[0].string.text, sizeof(uri));
-	strlcpy(name, resource, sizeof(name));
-      }
-
-      cgiSetArray("notify_recipient_uri", element, uri);
-      cgiSetArray("notify_recipient_name", element, name);
-      continue;
-    }
-
   /*
    * Add "admin_uri" variable if we have a "printer_uri_supported"
    * attribute...
@@ -1139,7 +851,7 @@ cgiSetIPPObjectVars(
    for (i = 0; i < attr->num_values; i ++)
    {
      if (i)
-	strlcat(valptr, ", ", sizeof(value) - (valptr - value));
+	strlcat(valptr, ",", sizeof(value) - (valptr - value));

      valptr += strlen(valptr);

@@ -1202,7 +914,7 @@ cgiSetIPPObjectVars(

                snprintf(valptr, sizeof(value) - (valptr - value),
 		         "<A HREF=\"%s\">%s</A>", url,
-			 strrchr(attr->values[i].string.text, '/') + 1);
+			 strrchr(url, '/') + 1);
 	      }
 	      else
 		cgiRewriteURL(attr->values[i].string.text, valptr,
@@ -1366,8 +1078,9 @@ cgiShowJobs(http_t     *http,		/* I - Connection to server */
 			count;		/* Number of jobs */
  const char		*var;		/* Form variable */
  void			*search;	/* Search data */
-  char			url[1024],	/* Printer URI */
-			val[1024];	/* Form variable */
+  char			url[1024],	/* URL for prev/next/this */
+			*urlptr,	/* Position in URL */
+			*urlend;	/* End of URL */


 /*
@@ -1408,8 +1121,7 @@ cgiShowJobs(http_t     *http,		/* I - Connection to server */
    * Get a list of matching job objects.
    */

-    if ((var = cgiGetVariable("QUERY")) != NULL &&
-        !cgiGetVariable("CLEAR"))
+    if ((var = cgiGetVariable("QUERY")) != NULL)
      search = cgiCompileSearch(var);
    else
      search = NULL;
@@ -1437,8 +1149,8 @@ cgiShowJobs(http_t     *http,		/* I - Connection to server */
    if (first < 0)
      first = 0;

-    sprintf(val, "%d", count);
-    cgiSetVariable("TOTAL", val);
+    sprintf(url, "%d", count);
+    cgiSetVariable("TOTAL", url);

    if ((var = cgiGetVariable("ORDER")) != NULL)
      ascending = !strcasecmp(var, "asc");
@@ -1467,23 +1179,61 @@ cgiShowJobs(http_t     *http,		/* I - Connection to server */
    * Save navigation URLs...
    */

-    if (dest)
-      snprintf(val, sizeof(val), "/%s/%s",  cgiGetVariable("SECTION"), dest);
-    else
-      strlcpy(val, "/jobs/", sizeof(val));
+    urlend = url + sizeof(url);

-    cgiSetVariable("THISURL", val);
+    if ((var = cgiGetVariable("QUERY")) != NULL)
+    {
+      if (dest)
+        snprintf(url, sizeof(url), "/%s/%s?QUERY=", cgiGetVariable("SECTION"),
+	         dest);
+      else
+        strlcpy(url, "/jobs/?QUERY=", sizeof(url));
+
+      urlptr = url + strlen(url);
+
+      cgiFormEncode(urlptr, var, urlend - urlptr);
+      urlptr += strlen(urlptr);
+
+      strlcpy(urlptr, "&", urlend - urlptr);
+      urlptr += strlen(urlptr);
+    }
+    else
+    {
+      if (dest)
+        snprintf(url, sizeof(url), "/%s/%s?", cgiGetVariable("SECTION"), dest);
+      else
+        strlcpy(url, "/jobs/?", sizeof(url));
+
+      urlptr = url + strlen(url);
+    }
+
+    if (which_jobs)
+    {
+      strlcpy(urlptr, "WHICH_JOBS=", urlend - urlptr);
+      urlptr += strlen(urlptr);
+
+      cgiFormEncode(urlptr, which_jobs, urlend - urlptr);
+      urlptr += strlen(urlptr);
+
+      strlcpy(urlptr, "&", urlend - urlptr);
+      urlptr += strlen(urlptr);
+    }
+
+    snprintf(urlptr, urlend - urlptr, "FIRST=%d", first);
+    cgiSetVariable("THISURL", url);

    if (first > 0)
    {
-      sprintf(val, "%d", first - CUPS_PAGE_MAX);
-      cgiSetVariable("PREV", val);
+      snprintf(urlptr, urlend - urlptr, "FIRST=%d&ORDER=%s",
+	       first - CUPS_PAGE_MAX, ascending ? "asc" : "dec");
+      cgiSetVariable("PREVURL", url);
    }

    if ((first + CUPS_PAGE_MAX) < count)
    {
-      sprintf(val, "%d", first + CUPS_PAGE_MAX);
-      cgiSetVariable("NEXT", val);
+      snprintf(urlptr, urlend - urlptr, "FIRST=%d&ORDER=%s",
+	       first + CUPS_PAGE_MAX, ascending ? "asc" : "dec");
+      cgiSetVariable("NEXTURL", url);
    }

   /*
@@ -1497,12 +1247,12 @@ cgiShowJobs(http_t     *http,		/* I - Connection to server */

    cgiCopyTemplateLang("jobs-header.tmpl");

-    if (count > CUPS_PAGE_MAX)
+    if (count > 0)
      cgiCopyTemplateLang("pager.tmpl");

    cgiCopyTemplateLang("jobs.tmpl");

-    if (count > CUPS_PAGE_MAX)
+    if (count > 0)
      cgiCopyTemplateLang("pager.tmpl");

    cupsArrayDelete(jobs);
@@ -3,14 +3,23 @@
 *
 *   Job status CGI for the Common UNIX Printing System (CUPS).
 *
- *   Copyright 2007-2008 by Apple Inc.
 *   Copyright 1997-2006 by Easy Software Products.
 *
 *   These coded instructions, statements, and computer programs are the
- *   property of Apple Inc. and are protected by Federal copyright
- *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
- *   which should have been included with this file.  If this file is
- *   file is missing or damaged, see the license at "http://www.cups.org/".
+ *   property of Easy Software Products and are protected by Federal
+ *   copyright law.  Distribution and use rights are outlined in the file
+ *   "LICENSE.txt" which should have been included with this file.  If this
+ *   file is missing or damaged please contact Easy Software Products
+ *   at:
+ *
+ *       Attn: CUPS Licensing Information
+ *       Easy Software Products
+ *       44141 Airport View Drive, Suite 204
+ *       Hollywood, Maryland 20636 USA
+ *
+ *       Voice: (301) 373-9600
+ *       EMail: cups-info@cups.org
+ *         WWW: http://www.cups.org
 *
 * Contents:
 *
@@ -77,7 +86,7 @@ main(int  argc,				/* I - Number of command-line arguments */
  * Do the operation...
  */

-  if ((op = cgiGetVariable("OP")) != NULL && job_id > 0 && cgiIsPOST())
+  if ((op = cgiGetVariable("OP")) != NULL && job_id > 0)
  {
   /*
    * Do the operation...
@@ -172,25 +181,6 @@ do_job_op(http_t      *http,		/* I - HTTP connection */

  ippDelete(cupsDoRequest(http, request, "/jobs"));

-  if (cupsLastError() <= IPP_OK_CONFLICT && getenv("HTTP_REFERER"))
-  {
-   /*
-    * Redirect successful updates back to the parent page...
-    */
-
-    char	url[1024];		/* Encoded URL */
-
-
-    strcpy(url, "5;URL=");
-    cgiFormEncode(url + 6, getenv("HTTP_REFERER"), sizeof(url) - 6);
-    cgiSetVariable("refresh_page", url);
-  }
-  else if (cupsLastError() == IPP_NOT_AUTHORIZED)
-  {
-    puts("Status: 401\n");
-    exit(0);
-  }
-
  cgiStartHTML(cgiText(_("Jobs")));

  if (cupsLastError() > IPP_OK_CONFLICT)
@@ -1,38 +0,0 @@
-_cgiCheckVariables
-_cgiCompileSearch
-_cgiCopyTemplateFile
-_cgiCopyTemplateLang
-_cgiDoSearch
-_cgiEndHTML
-_cgiEndMultipart
-_cgiFormEncode
-_cgiFreeSearch
-_cgiGetArray
-_cgiGetAttributes
-_cgiGetFile
-_cgiGetIPPObjects
-_cgiGetSize
-_cgiGetTemplateDir
-_cgiGetVariable
-_cgiInitialize
-_cgiIsPOST
-_cgiMoveJobs
-_cgiPrintCommand
-_cgiPrintTestPage
-_cgiRewriteURL
-_cgiSetArray
-_cgiSetIPPObjectVars
-_cgiSetIPPVars
-_cgiSetServerVersion
-_cgiSetSize
-_cgiSetVariable
-_cgiShowIPPError
-_cgiShowJobs
-_cgiStartHTML
-_cgiStartMultipart
-_cgiText
-_helpDeleteIndex
-_helpFindNode
-_helpLoadIndex
-_helpSaveIndex
-_helpSearchIndex
@@ -3,19 +3,28 @@
 *
 *   Printer status CGI for the Common UNIX Printing System (CUPS).
 *
- *   Copyright 2007-2008 by Apple Inc.
 *   Copyright 1997-2006 by Easy Software Products.
 *
 *   These coded instructions, statements, and computer programs are the
- *   property of Apple Inc. and are protected by Federal copyright
- *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
- *   which should have been included with this file.  If this file is
- *   file is missing or damaged, see the license at "http://www.cups.org/".
+ *   property of Easy Software Products and are protected by Federal
+ *   copyright law.  Distribution and use rights are outlined in the file
+ *   "LICENSE.txt" which should have been included with this file.  If this
+ *   file is missing or damaged please contact Easy Software Products
+ *   at:
+ *
+ *       Attn: CUPS Licensing Information
+ *       Easy Software Products
+ *       44141 Airport View Drive, Suite 204
+ *       Hollywood, Maryland 20636 USA
+ *
+ *       Voice: (301) 373-9600
+ *       EMail: cups-info@cups.org
+ *         WWW: http://www.cups.org
 *
 * Contents:
 *
 *   main()              - Main entry for CGI.
- *   do_printer_op()     - Do a printer operation.
+ *   print_command()     - Send a print command to the printer.
 *   show_all_printers() - Show all printers...
 *   show_printer()      - Show a single printer.
 */
@@ -32,10 +41,9 @@
 * Local functions...
 */

-static void	do_printer_op(http_t *http, const char *printer, ipp_op_t op,
-		              const char *title);
-static void	show_all_printers(http_t *http, const char *username);
-static void	show_printer(http_t *http, const char *printer);
+void	print_command(http_t *http, const char *printer, const char *command);
+void	show_all_printers(http_t *http, const char *username);
+void	show_printer(http_t *http, const char *printer);


 /*
@@ -84,9 +92,6 @@ main(int  argc,				/* I - Number of command-line arguments */

    if (!*printer)
      printer = NULL;
-
-    if (printer)
-      cgiSetVariable("PRINTER_NAME", printer);
  }

 /*
@@ -105,7 +110,7 @@ main(int  argc,				/* I - Number of command-line arguments */
  * Get the default printer...
  */

-  if (!op || !cgiIsPOST())
+  if (!op)
  {
   /*
    * Get the default destination...
@@ -145,48 +150,25 @@ main(int  argc,				/* I - Number of command-line arguments */
    else
      show_printer(http, printer);
  }
-  else if (printer)
-  {
-    if (!strcmp(op, "start-printer"))
-      do_printer_op(http, printer, IPP_RESUME_PRINTER,
-                    cgiText(_("Resume Printer")));
-    else if (!strcmp(op, "stop-printer"))
-      do_printer_op(http, printer, IPP_PAUSE_PRINTER,
-                    cgiText(_("Pause Printer")));
-    else if (!strcmp(op, "accept-jobs"))
-      do_printer_op(http, printer, CUPS_ACCEPT_JOBS, cgiText(_("Accept Jobs")));
-    else if (!strcmp(op, "reject-jobs"))
-      do_printer_op(http, printer, CUPS_REJECT_JOBS, cgiText(_("Reject Jobs")));
-    else if (!strcmp(op, "purge-jobs"))
-      do_printer_op(http, printer, IPP_PURGE_JOBS, cgiText(_("Purge Jobs")));
-    else if (!strcasecmp(op, "print-self-test-page"))
-      cgiPrintCommand(http, printer, "PrintSelfTestPage",
-                      cgiText(_("Print Self-Test Page")));
-    else if (!strcasecmp(op, "clean-print-heads"))
-      cgiPrintCommand(http, printer, "Clean all",
-                      cgiText(_("Clean Print Heads")));
-    else if (!strcasecmp(op, "print-test-page"))
-      cgiPrintTestPage(http, printer);
-    else if (!strcasecmp(op, "move-jobs"))
-      cgiMoveJobs(http, printer, 0);
-    else
-    {
-     /*
-      * Unknown/bad operation...
-      */
-
-      cgiStartHTML(printer);
-      cgiCopyTemplateLang("error-op.tmpl");
-      cgiEndHTML();
-    }
-  }
+  else if (!strcasecmp(op, "print-self-test-page") && printer)
+    print_command(http, printer, "PrintSelfTestPage");
+  else if (!strcasecmp(op, "clean-print-heads") && printer)
+    print_command(http, printer, "Clean all");
+  else if (!strcasecmp(op, "print-test-page") && printer)
+    cgiPrintTestPage(http, printer);
+  else if (!strcasecmp(op, "move-jobs") && printer)
+    cgiMoveJobs(http, printer, 0);
  else
  {
   /*
    * Unknown/bad operation...
    */

-    cgiStartHTML(cgiText(_("Printers")));
+    if (printer)
+      cgiStartHTML(printer);
+    else
+      cgiStartHTML(cgiText(_("Printers")));
+
    cgiCopyTemplateLang("error-op.tmpl");
    cgiEndHTML();
  }
@@ -206,80 +188,117 @@ main(int  argc,				/* I - Number of command-line arguments */


 /*
- * 'do_printer_op()' - Do a printer operation.
+ * 'print_command()' - Send a print command to the printer.
 */

-static void
-do_printer_op(http_t      *http,	/* I - HTTP connection */
-              const char  *printer,	/* I - Printer name */
-	      ipp_op_t    op,		/* I - Operation to perform */
-	      const char  *title)	/* I - Title of page */
+void
+print_command(http_t     *http,		/* I - Connection to server */
+              const char *printer,	/* I - Printer */
+	      const char *command)	/* I - Command to send */
 {
-  ipp_t		*request;		/* IPP request */
+  cups_file_t	*fp;			/* File pointer */
+  char		filename[1024];		/* Temporary file */
+  ipp_t		*request,		/* IPP request */
+		*response;		/* IPP response */
  char		uri[HTTP_MAX_URI],	/* Printer URI */
-		resource[HTTP_MAX_URI];	/* Path for request */
+		resource[1024],		/* POST resource path */
+		refresh[1024];		/* Refresh URL */
+  const char	*user;			/* Username */


 /*
-  * Build a printer request, which requires the following
+  * See who is logged in...
+  */
+
+  if ((user = getenv("REMOTE_USER")) == NULL)
+    user = "guest";
+
+ /*
+  * Create the CUPS command file to print...
+  */
+
+  if ((fp = cupsTempFile2(filename, sizeof(filename))) == NULL)
+  {
+    cgiStartHTML(cgiText(_("Printer Maintenance")));
+    cgiSetVariable("MESSAGE", _("Unable to create temporary file:"));
+    cgiSetVariable("ERROR", strerror(errno));
+    cgiCopyTemplateLang("error.tmpl");
+    cgiEndHTML();
+    return;
+  }
+
+  cupsFilePuts(fp, "#CUPS-COMMAND\n");
+  cupsFilePrintf(fp, "%s\n", command);
+  cupsFileClose(fp);
+
+ /*
+  * Point to the printer...
+  */
+
+  snprintf(resource, sizeof(resource), "/printers/%s", printer);
+
+  httpAssembleURIf(HTTP_URI_CODING_ALL, uri, sizeof(uri), "ipp", NULL,
+                   "localhost", ippPort(), "/printers/%s", printer);
+
+ /*
+  * Build an IPP_PRINT_JOB request, which requires the following
  * attributes:
  *
  *    attributes-charset
  *    attributes-natural-language
  *    printer-uri
+  *    requesting-user-name
+  *    document-format
  */

-  request = ippNewRequest(op);
+  request = ippNewRequest(IPP_PRINT_JOB);

-  httpAssembleURIf(HTTP_URI_CODING_ALL, uri, sizeof(uri), "ipp", NULL,
-                   "localhost", 0, "/printers/%s", printer);
  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, "printer-uri",
               NULL, uri);

+  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_NAME,
+               "requesting-user-name", NULL, user);
+
+  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_NAME, "job-name",
+               NULL, "Printer Maintenance");
+
+  ippAddString(request, IPP_TAG_JOB, IPP_TAG_MIMETYPE, "document-format",
+               NULL, "application/postscript");
+
 /*
  * Do the request and get back a response...
  */

-  snprintf(resource, sizeof(resource), "/printers/%s", printer);
-  ippDelete(cupsDoRequest(http, request, resource));
+  if ((response = cupsDoFileRequest(http, request, resource,
+                                    filename)) != NULL)
+  {
+    cgiSetIPPVars(response, NULL, NULL, NULL, 0);

-  if (cupsLastError() == IPP_NOT_AUTHORIZED)
-  {
-    puts("Status: 401\n");
-    exit(0);
+    ippDelete(response);
  }
-  else if (cupsLastError() > IPP_OK_CONFLICT)
-  {
-    cgiStartHTML(title);
-    cgiShowIPPError(_("Unable to do maintenance command:"));
-  }
-  else
+
+  unlink(filename);
+
+  if (cupsLastError() <= IPP_OK_CONFLICT)
  {
   /*
-    * Redirect successful updates back to the printer page...
+    * Automatically reload the printer status page...
    */

-    char	url[1024],		/* Printer/class URL */
-		refresh[1024];		/* Refresh URL */
-
-
-    cgiRewriteURL(uri, url, sizeof(url), NULL);
-    cgiFormEncode(uri, url, sizeof(uri));
-    snprintf(refresh, sizeof(refresh), "5;URL=%s", uri);
+    cgiFormEncode(uri, resource, sizeof(uri));
+    snprintf(refresh, sizeof(refresh), "2;URL=%s", uri);
    cgiSetVariable("refresh_page", refresh);
+  }

-    cgiStartHTML(title);
+  cgiStartHTML(cgiText(_("Printer Maintenance")));

-    if (op == IPP_PAUSE_PRINTER)
-      cgiCopyTemplateLang("printer-stop.tmpl");
-    else if (op == IPP_RESUME_PRINTER)
-      cgiCopyTemplateLang("printer-start.tmpl");
-    else if (op == CUPS_ACCEPT_JOBS)
-      cgiCopyTemplateLang("printer-accept.tmpl");
-    else if (op == CUPS_REJECT_JOBS)
-      cgiCopyTemplateLang("printer-reject.tmpl");
-    else if (op == IPP_PURGE_JOBS)
-      cgiCopyTemplateLang("printer-purge.tmpl");
+  if (cupsLastError() > IPP_OK_CONFLICT)
+    cgiShowIPPError(_("Unable to send maintenance job:"));
+  else
+  {
+    cgiSetVariable("PRINTER_NAME", printer);
+
+    cgiCopyTemplateLang("maintenance.tmpl");
  }

  cgiEndHTML();
@@ -290,7 +309,7 @@ do_printer_op(http_t      *http,	/* I - HTTP connection */
 * 'show_all_printers()' - Show all printers...
 */

-static void
+void
 show_all_printers(http_t     *http,	/* I - Connection to server */
                  const char *user)	/* I - Username */
 {
@@ -298,13 +317,16 @@ show_all_printers(http_t     *http,	/* I - Connection to server */
  ipp_t			*request,	/* IPP request */
 			*response;	/* IPP response */
  cups_array_t		*printers;	/* Array of printer objects */
-  ipp_attribute_t	*printer;	/* Printer object */
+  ipp_attribute_t	*printer,	/* Printer object */
+			*attr;		/* Current attribute */
  int			ascending,	/* Order of printers (0 = descending) */
 			first,		/* First printer to show */
 			count;		/* Number of printers */
  const char		*var;		/* Form variable */
  void			*search;	/* Search data */
-  char			val[1024];	/* Form variable */
+  char			url[1024],	/* URL for prev/next/this */
+			*urlptr,	/* Position in URL */
+			*urlend;	/* End of URL */


  fprintf(stderr, "DEBUG: show_all_printers(http=%p, user=\"%s\")\n",
@@ -350,8 +372,7 @@ show_all_printers(http_t     *http,	/* I - Connection to server */
    * Get a list of matching job objects.
    */

-    if ((var = cgiGetVariable("QUERY")) != NULL &&
-        !cgiGetVariable("CLEAR"))
+    if ((var = cgiGetVariable("QUERY")) != NULL)
      search = cgiCompileSearch(var);
    else
      search = NULL;
@@ -379,8 +400,8 @@ show_all_printers(http_t     *http,	/* I - Connection to server */
    if (first < 0)
      first = 0;

-    sprintf(val, "%d", count);
-    cgiSetVariable("TOTAL", val);
+    sprintf(url, "%d", count);
+    cgiSetVariable("TOTAL", url);

    if ((var = cgiGetVariable("ORDER")) != NULL)
      ascending = !strcasecmp(var, "asc");
@@ -392,32 +413,82 @@ show_all_printers(http_t     *http,	/* I - Connection to server */
      for (i = 0, printer = (ipp_attribute_t *)cupsArrayIndex(printers, first);
 	   i < CUPS_PAGE_MAX && printer;
 	   i ++, printer = (ipp_attribute_t *)cupsArrayNext(printers))
+      {
        cgiSetIPPObjectVars(printer, NULL, i);
+
+        cgiSetArray("cupscommand", i, "0");
+
+	for (attr = printer; attr; attr = attr->next)
+	  if (attr->group_tag != IPP_TAG_PRINTER || !attr->name)
+	    break;
+	  else if (!strcmp(attr->name, "printer-type"))
+	  {
+            if (attr->values[0].integer & CUPS_PRINTER_COMMANDS)
+	      cgiSetArray("cupscommand", i, "1");
+	    break;
+	  }
+      }
    }
    else
    {
      for (i = 0, printer = (ipp_attribute_t *)cupsArrayIndex(printers, count - first - 1);
 	   i < CUPS_PAGE_MAX && printer;
 	   i ++, printer = (ipp_attribute_t *)cupsArrayPrev(printers))
+      {
        cgiSetIPPObjectVars(printer, NULL, i);
+
+        cgiSetArray("cupscommand", i, "0");
+
+	for (attr = printer; attr; attr = attr->next)
+	  if (attr->group_tag == IPP_TAG_ZERO || !attr->name)
+	    break;
+	  else if (!strcmp(attr->name, "printer-type"))
+	  {
+            if (attr->values[0].integer & CUPS_PRINTER_COMMANDS)
+	      cgiSetArray("cupscommand", i, "1");
+	    break;
+	  }
+      }
    }

   /*
    * Save navigation URLs...
    */

-    cgiSetVariable("THISURL", "/printers/");
+    urlend = url + sizeof(url);
+
+    if ((var = cgiGetVariable("QUERY")) != NULL)
+    {
+      strlcpy(url, "/printers/?QUERY=", sizeof(url));
+      urlptr = url + strlen(url);
+
+      cgiFormEncode(urlptr, var, urlend - urlptr);
+      urlptr += strlen(urlptr);
+
+      strlcpy(urlptr, "&", urlend - urlptr);
+      urlptr += strlen(urlptr);
+    }
+    else
+    {
+      strlcpy(url, "/printers/?", sizeof(url));
+      urlptr = url + strlen(url);
+    }
+
+    snprintf(urlptr, urlend - urlptr, "FIRST=%d", first);
+    cgiSetVariable("THISURL", url);

    if (first > 0)
    {
-      sprintf(val, "%d", first - CUPS_PAGE_MAX);
-      cgiSetVariable("PREV", val);
+      snprintf(urlptr, urlend - urlptr, "FIRST=%d&ORDER=%s",
+	       first - CUPS_PAGE_MAX, ascending ? "asc" : "dec");
+      cgiSetVariable("PREVURL", url);
    }

    if ((first + CUPS_PAGE_MAX) < count)
    {
-      sprintf(val, "%d", first + CUPS_PAGE_MAX);
-      cgiSetVariable("NEXT", val);
+      snprintf(urlptr, urlend - urlptr, "FIRST=%d&ORDER=%s",
+	       first + CUPS_PAGE_MAX, ascending ? "asc" : "dec");
+      cgiSetVariable("NEXTURL", url);
    }

   /*
@@ -428,12 +499,12 @@ show_all_printers(http_t     *http,	/* I - Connection to server */

    cgiCopyTemplateLang("printers-header.tmpl");

-    if (count > CUPS_PAGE_MAX)
+    if (count > 0)
      cgiCopyTemplateLang("pager.tmpl");

    cgiCopyTemplateLang("printers.tmpl");

-    if (count > CUPS_PAGE_MAX)
+    if (count > 0)
      cgiCopyTemplateLang("pager.tmpl");

   /*
@@ -460,7 +531,7 @@ show_all_printers(http_t     *http,	/* I - Connection to server */
 * 'show_printer()' - Show a single printer.
 */

-static void
+void
 show_printer(http_t     *http,		/* I - Connection to server */
             const char *printer)	/* I - Name of printer */
 {
@@ -490,7 +561,7 @@ show_printer(http_t     *http,		/* I - Connection to server */
  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, "printer-uri", NULL,
               uri);

-  cgiGetAttributes(request, "printer.tmpl");
+  cgiGetAttributes(request, "printers.tmpl");

 /*
  * Do the request and get back a response...
@@ -505,6 +576,14 @@ show_printer(http_t     *http,		/* I - Connection to server */

    cgiSetIPPVars(response, NULL, NULL, NULL, 0);

+    if ((attr = ippFindAttribute(response, "printer-type",
+                                 IPP_TAG_ENUM)) != NULL)
+    {
+      cgiSetVariable("cupscommand",
+                     (attr->values[0].integer & CUPS_PRINTER_COMMANDS) ?
+		         "1" : "0");
+    }
+
    if (printer && (attr = ippFindAttribute(response, "printer-state",
                                            IPP_TAG_ENUM)) != NULL &&
        attr->values[0].integer == IPP_PRINTER_PROCESSING)
@@ -535,7 +614,7 @@ show_printer(http_t     *http,		/* I - Connection to server */
    * Show the printer status...
    */

-    cgiCopyTemplateLang("printer.tmpl");
+    cgiCopyTemplateLang("printers.tmpl");

   /*
    * Show jobs for the specified printer...
@@ -3,14 +3,23 @@
 *
 *   Search routines for the Common UNIX Printing System (CUPS).
 *
- *   Copyright 2007-2008 by Apple Inc.
 *   Copyright 1997-2006 by Easy Software Products.
 *
 *   These coded instructions, statements, and computer programs are the
- *   property of Apple Inc. and are protected by Federal copyright
- *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
- *   which should have been included with this file.  If this file is
- *   file is missing or damaged, see the license at "http://www.cups.org/".
+ *   property of Easy Software Products and are protected by Federal
+ *   copyright law.  Distribution and use rights are outlined in the file
+ *   "LICENSE.txt" which should have been included with this file.  If this
+ *   file is missing or damaged please contact Easy Software Products
+ *   at:
+ *
+ *       Attn: CUPS Licensing Information
+ *       Easy Software Products
+ *       44141 Airport View Drive, Suite 204
+ *       Hollywood, Maryland 20636 USA
+ *
+ *       Voice: (301) 373-9600
+ *       EMail: cups-info@cups.org
+ *         WWW: http://www.cups.org
 *
 * Contents:
 *
@@ -47,21 +56,13 @@ cgiCompileSearch(const char *query)	/* I - Query string */
  char		*lword;			/* Last word in query */


-  DEBUG_printf(("cgiCompileSearch(query=\"%s\")\n", query));
-
- /*
-  * Range check input...
-  */
-
-  if (!query)
-    return (NULL);
+  DEBUG_printf(("help_compile_search(query=\"%s\")\n", query ? query : "(nil)"));

 /*
  * Allocate a regular expression storage structure...
  */

-  if ((re = (regex_t *)calloc(1, sizeof(regex_t))) == NULL)
-    return (NULL);
+  re = (regex_t *)calloc(1, sizeof(regex_t));

 /*
  * Allocate a buffer to hold the regular expression string, starting
@@ -73,11 +74,7 @@ cgiCompileSearch(const char *query)	/* I - Query string */
  if (slen < 1024)
    slen = 1024;

-  if ((s = (char *)malloc(slen)) == NULL)
-  {
-    free(re);
-    return (NULL);
-  }
+  s = (char *)malloc(slen);

 /*
  * Copy the query string to the regular expression, handling basic
@@ -174,9 +171,7 @@ cgiCompileSearch(const char *query)	/* I - Query string */
      * string + RE overhead...
      */

-      wlen = (sptr - s) + 2 * 4 * wlen + 2 * strlen(prefix) + 11;
-      if (lword)
-        wlen += strlen(lword);
+      wlen = (sptr - s) + 4 * wlen + 2 * strlen(prefix) + 4;

      if (wlen > slen)
      {
@@ -241,13 +236,7 @@ cgiCompileSearch(const char *query)	/* I - Query string */
        char *lword2;			/* New "last word" */


-        if ((lword2 = strdup(sword)) == NULL)
-	{
-	  free(lword);
-	  free(s);
-	  free(re);
-	  return (NULL);
-	}
+        lword2 = strdup(sword);

        strcpy(sptr, ".*|.*");
 	sptr += 5;
@@ -3,14 +3,23 @@
 *
 *   CGI template function.
 *
- *   Copyright 2007-2008 by Apple Inc.
 *   Copyright 1997-2006 by Easy Software Products.
 *
 *   These coded instructions, statements, and computer programs are the
- *   property of Apple Inc. and are protected by Federal copyright
- *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
- *   which should have been included with this file.  If this file is
- *   file is missing or damaged, see the license at "http://www.cups.org/".
+ *   property of Easy Software Products and are protected by Federal
+ *   copyright law.  Distribution and use rights are outlined in the file
+ *   "LICENSE.txt" which should have been included with this file.  If this
+ *   file is missing or damaged please contact Easy Software Products
+ *   at:
+ *
+ *       Attn: CUPS Licensing Information
+ *       Easy Software Products
+ *       44141 Airport View Drive, Suite 204
+ *       Hollywood, Maryland 20636 USA
+ *
+ *       Voice: (301) 373-9600
+ *       EMail: cups-info@cups.org
+ *         WWW: http://www.cups.org
 *
 * Contents:
 *
@@ -26,7 +35,6 @@

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


 /*
@@ -51,16 +59,9 @@ cgiCopyTemplateFile(FILE       *out,	/* I - Output file */
  FILE	*in;				/* Input file */


-  fprintf(stderr, "DEBUG2: cgiCopyTemplateFile(out=%p, tmpl=\"%s\")\n", out,
+  fprintf(stderr, "DEBUG: cgiCopyTemplateFile(out=%p, tmpl=\"%s\")\n", out,
          tmpl ? tmpl : "(null)");

- /*
-  * Range check input...
-  */
-
-  if (!tmpl || !out)
-    return;
-
 /*
  * Open the template file...
  */
@@ -93,34 +94,37 @@ cgiCopyTemplateFile(FILE       *out,	/* I - Output file */
 void
 cgiCopyTemplateLang(const char *tmpl)	/* I - Base filename */
 {
+  int		i;			/* Looping var */
  char		filename[1024],		/* Filename */
-		locale[16],		/* Locale name */
-		*locptr;		/* Pointer into locale name */
+		locale[16];		/* Locale name */
  const char	*directory,		/* Directory for templates */
 		*lang;			/* Language */
  FILE		*in;			/* Input file */


-  fprintf(stderr, "DEBUG2: cgiCopyTemplateLang(tmpl=\"%s\")\n",
+  fprintf(stderr, "DEBUG: cgiCopyTemplateLang(tmpl=\"%s\")\n",
          tmpl ? tmpl : "(null)");

 /*
  * Convert the language to a locale name...
  */

-  locale[0] = '\0';
-
  if ((lang = getenv("LANG")) != NULL)
  {
-    locale[0] = '/';
-    strlcpy(locale + 1, lang, sizeof(locale) - 1);
+    for (i = 0; lang[i] && i < 15; i ++)
+      if (isalnum(lang[i] & 255) || lang[i] == '_')
+        locale[i] = tolower(lang[i]);
+      else if (lang[i] == '-')
+        locale[i] = '_';
+      else
+        break;

-    if ((locptr = strchr(locale, '.')) != NULL)
-      *locptr = '\0';			/* Strip charset */
+    locale[i] = '\0';
  }
+  else
+    locale[0] = '\0';

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

 /*
  * See if we have a template file for this language...
@@ -128,26 +132,23 @@ cgiCopyTemplateLang(const char *tmpl)	/* I - Base filename */

  directory = cgiGetTemplateDir();

-  snprintf(filename, sizeof(filename), "%s%s/%s", directory, locale, tmpl);
-  if ((in = fopen(filename, "r")) == NULL)
+  snprintf(filename, sizeof(filename), "%s/%s/%s", directory, locale, tmpl);
+  if (access(filename, 0))
  {
-    locale[3] = '\0';
+    locale[2] = '\0';

-    snprintf(filename, sizeof(filename), "%s%s/%s", directory, locale, tmpl);
-    if ((in = fopen(filename, "r")) == NULL)
-    {
+    snprintf(filename, sizeof(filename), "%s/%s/%s", directory, locale, tmpl);
+    if (access(filename, 0))
      snprintf(filename, sizeof(filename), "%s/%s", directory, tmpl);
-      in = fopen(filename, "r");
-    }
  }

-  fprintf(stderr, "DEBUG2: Template file is \"%s\"...\n", filename);
+  fprintf(stderr, "DEBUG: Template file is \"%s\"...\n", filename);

 /*
  * Open the template file...
  */

-  if (!in)
+  if ((in = fopen(filename, "r")) == NULL)
  {
    fprintf(stderr, "ERROR: Unable to open template file \"%s\" - %s\n",
            filename, strerror(errno));
@@ -237,10 +238,9 @@ cgi_copy(FILE *out,			/* I - Output file */
 		compare[1024];		/* Comparison string */
  int		result;			/* Result of comparison */
  int		uriencode;		/* Encode as URI */
-  regex_t	re;			/* Regular expression to match */


-  fprintf(stderr, "DEBUG2: %*sStarting at file position %ld...\n", indent, "",
+  fprintf(stderr, "DEBUG: %*sStarting at file position %ld...\n", indent, "",
          ftell(in));

 /*
@@ -259,7 +259,7 @@ cgi_copy(FILE *out,			/* I - Output file */
      uriencode = 0;

      for (s = name; (ch = getc(in)) != EOF;)
-        if (strchr("}]<>=!~ \t\n", ch))
+        if (strchr("}]<>=! \t\n", ch))
          break;
 	else if (s == name && ch == '%')
 	  uriencode = 1;
@@ -272,7 +272,7 @@ cgi_copy(FILE *out,			/* I - Output file */

      if (s == name && isspace(ch & 255))
      {
-        fprintf(stderr, "DEBUG2: %*sLone { at %ld...\n", indent, "", ftell(in));
+        fprintf(stderr, "DEBUG: %*sLone { at %ld...\n", indent, "", ftell(in));

        if (out)
 	{
@@ -284,7 +284,7 @@ cgi_copy(FILE *out,			/* I - Output file */
      }

      if (ch == '}')
-	fprintf(stderr, "DEBUG2: %*s\"{%s}\" at %ld...\n", indent, "", name,
+	fprintf(stderr, "DEBUG: %*s\"{%s}\" at %ld...\n", indent, "", name,
        	ftell(in));

     /*
@@ -348,7 +348,7 @@ cgi_copy(FILE *out,			/* I - Output file */

 	pos = ftell(in);

-        fprintf(stderr, "DEBUG2: %*sLooping on \"%s\" at %ld, count=%d...\n",
+        fprintf(stderr, "DEBUG: %*sLooping on \"%s\" at %ld, count=%d...\n",
 	        indent, "", name + 1, pos, count);

        if (count > 0)
@@ -364,7 +364,7 @@ cgi_copy(FILE *out,			/* I - Output file */
 	else
 	  cgi_copy(NULL, in, 0, '}', indent + 2);

-        fprintf(stderr, "DEBUG2: %*sFinished looping on \"%s\"...\n", indent,
+        fprintf(stderr, "DEBUG: %*sFinished looping on \"%s\"...\n", indent,
 	        "", name + 1);

        continue;
@@ -409,8 +409,6 @@ cgi_copy(FILE *out,			/* I - Output file */
 	{
 	  if (uriencode)
 	    cgi_puturi(outptr, out);
-	  else if (!strcasecmp(name, "?cupsdconf_default"))
-	    fputs(outptr, stdout);
 	  else
 	    cgi_puts(outptr, out);
        }
@@ -426,7 +424,6 @@ cgi_copy(FILE *out,			/* I - Output file */
      *   {name<value?true:false}    Less than
      *   {name>value?true:false}    Greater than
      *   {name!value?true:false}    Not equal
-      *   {name~refex?true:false}    Regex match
      */

      op = ch;
@@ -503,7 +500,7 @@ cgi_copy(FILE *out,			/* I - Output file */
        if (ch != '?')
 	{
 	  fprintf(stderr,
-	          "DEBUG2: %*sBad terminator '%c' at file position %ld...\n",
+	          "DEBUG: %*sBad terminator '%c' at file position %ld...\n",
 	          indent, "", ch, ftell(in));
 	  return;
 	}
@@ -526,39 +523,6 @@ cgi_copy(FILE *out,			/* I - Output file */
 	  case '!' :
 	      result = strcasecmp(outptr, compare) != 0;
 	      break;
-	  case '~' :
-	      fprintf(stderr, "DEBUG: Regular expression \"%s\"\n", compare);
-
-	      if (regcomp(&re, compare, REG_EXTENDED | REG_ICASE))
-	      {
-	        fprintf(stderr,
-		        "ERROR: Unable to compile regular expresion \"%s\"!\n",
-			compare);
-		result = 0;
-	      }
-	      else
-	      {
-	        regmatch_t matches[10];
-
-		result = 0;
-
-	        if (!regexec(&re, outptr, 10, matches, 0))
-		{
-		  int i;
-		  for (i = 0; i < 10; i ++)
-		  {
-		    fprintf(stderr, "DEBUG: matches[%d].rm_so=%d\n", i,
-		            (int)matches[i].rm_so);
-		    if (matches[i].rm_so < 0)
-		      break;
-
-		    result ++;
-		  }
-		}
-
-		regfree(&re);
-	      }
-	      break;
 	  default :
 	      result = 1;
 	      break;
@@ -566,7 +530,7 @@ cgi_copy(FILE *out,			/* I - Output file */
      }

      fprintf(stderr,
-              "DEBUG2: %*sStarting \"{%s%c%s\" at %ld, result=%d...\n",
+              "DEBUG: %*sStarting \"{%s%c%s\" at %ld, result=%d...\n",
 	      indent, "", name, op, compare, ftell(in), result);

      if (result)
@@ -575,10 +539,10 @@ cgi_copy(FILE *out,			/* I - Output file */
 	* Comparison true; output first part and ignore second...
 	*/

-        fprintf(stderr, "DEBUG2: %*sOutput first part...\n", indent, "");
+        fprintf(stderr, "DEBUG: %*sOutput first part...\n", indent, "");
 	cgi_copy(out, in, element, ':', indent + 2);

-        fprintf(stderr, "DEBUG2: %*sSkip second part...\n", indent, "");
+        fprintf(stderr, "DEBUG: %*sSkip second part...\n", indent, "");
 	cgi_copy(NULL, in, element, '}', indent + 2);
      }
      else
@@ -587,14 +551,14 @@ cgi_copy(FILE *out,			/* I - Output file */
 	* Comparison false; ignore first part and output second...
 	*/

-        fprintf(stderr, "DEBUG2: %*sSkip first part...\n", indent, "");
+        fprintf(stderr, "DEBUG: %*sSkip first part...\n", indent, "");
 	cgi_copy(NULL, in, element, ':', indent + 2);

-        fprintf(stderr, "DEBUG2: %*sOutput second part...\n", indent, "");
+        fprintf(stderr, "DEBUG: %*sOutput second part...\n", indent, "");
 	cgi_copy(out, in, element, '}', indent + 2);
      }

-      fprintf(stderr, "DEBUG2: %*sFinished \"{%s%c%s\", out=%p...\n", indent, "",
+      fprintf(stderr, "DEBUG: %*sFinished \"{%s%c%s\", out=%p...\n", indent, "",
              name, op, compare, out);
    }
    else if (ch == '\\')	/* Quoted char */
@@ -608,11 +572,11 @@ cgi_copy(FILE *out,			/* I - Output file */
      putc(ch, out);

  if (ch == EOF)
-    fprintf(stderr, "DEBUG2: %*sReturning at file position %ld on EOF...\n",
+    fprintf(stderr, "DEBUG: %*sReturning at file position %ld on EOF...\n",
 	    indent, "", ftell(in));
  else
    fprintf(stderr,
-            "DEBUG2: %*sReturning at file position %ld on character '%c'...\n",
+            "DEBUG: %*sReturning at file position %ld on character '%c'...\n",
 	    indent, "", ftell(in), ch);

  if (ch == EOF && term)
@@ -3,14 +3,23 @@
 *
 *   CGI test program for the Common UNIX Printing System (CUPS).
 *
- *   Copyright 2007 by Apple Inc.
 *   Copyright 1997-2005 by Easy Software Products.
 *
 *   These coded instructions, statements, and computer programs are the
- *   property of Apple Inc. and are protected by Federal copyright
- *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
- *   which should have been included with this file.  If this file is
- *   file is missing or damaged, see the license at "http://www.cups.org/".
+ *   property of Easy Software Products and are protected by Federal
+ *   copyright law.  Distribution and use rights are outlined in the file
+ *   "LICENSE.txt" which should have been included with this file.  If this
+ *   file is missing or damaged please contact Easy Software Products
+ *   at:
+ *
+ *       Attn: CUPS Licensing Information
+ *       Easy Software Products
+ *       44141 Airport View Drive, Suite 204
+ *       Hollywood, Maryland 20636 USA
+ *
+ *       Voice: (301) 373-9600
+ *       EMail: cups-info@cups.org
+ *         WWW: http://www.cups.org
 *
 * Contents:
 *
@@ -3,14 +3,23 @@
 *
 *   Help index test program for the Common UNIX Printing System (CUPS).
 *
- *   Copyright 2007 by Apple Inc.
- *   Copyright 1997-2007 by Easy Software Products.
+ *   Copyright 1997-2005 by Easy Software Products.
 *
 *   These coded instructions, statements, and computer programs are the
- *   property of Apple Inc. and are protected by Federal copyright
- *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
- *   which should have been included with this file.  If this file is
- *   file is missing or damaged, see the license at "http://www.cups.org/".
+ *   property of Easy Software Products and are protected by Federal
+ *   copyright law.  Distribution and use rights are outlined in the file
+ *   "LICENSE.txt" which should have been included with this file.  If this
+ *   file is missing or damaged please contact Easy Software Products
+ *   at:
+ *
+ *       Attn: CUPS Licensing Information
+ *       Easy Software Products
+ *       44141 Airport View Drive, Suite 204
+ *       Hollywood, Maryland 20636 USA
+ *
+ *       Voice: (301) 373-9600
+ *       EMail: cups-info@cups.org
+ *         WWW: http://www.cups.org
 *
 * Contents:
 *
@@ -96,15 +105,11 @@ list_nodes(const char   *title,		/* I - Title string */
  for (i = 1, node = (help_node_t *)cupsArrayFirst(nodes);
       node;
       i ++, node = (help_node_t *)cupsArrayNext(nodes))
-  {
    if (node->anchor)
-      printf("    %d: %s#%s \"%s\"", i, node->filename, node->anchor,
+      printf("    %d: %s#%s \"%s\"\n", i, node->filename, node->anchor,
             node->text);
    else
-      printf("    %d: %s \"%s\"", i, node->filename, node->text);
-
-    printf(" (%d words)\n", cupsArrayCount(node->words));
-  }
+      printf("    %d: %s \"%s\"\n", i, node->filename, node->text);
 }


@@ -12,15 +12,13 @@ up to 1024 bytes in length.</P>

 <H1><A NAME="FIRST">This is the First Anchor</A></H1>

-<P>This&nbsp;is some text for the <em>first</em> anchor.</P>
+<P>This is some text for the first anchor.</P>


 <H1><A NAME="2ND">This is the Second Anchor</A></H1>

 <P>This is some text for the first anchor.</P>

-<P>John asked Mary to the dance.</P>
-

 <H1><A NAME="THIRD">This is the Third Anchor</A></H1>

@@ -3,14 +3,23 @@
 *
 *   CGI template test program for the Common UNIX Printing System (CUPS).
 *
- *   Copyright 2007 by Apple Inc.
 *   Copyright 2006 by Easy Software Products.
 *
 *   These coded instructions, statements, and computer programs are the
- *   property of Apple Inc. and are protected by Federal copyright
- *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
- *   which should have been included with this file.  If this file is
- *   file is missing or damaged, see the license at "http://www.cups.org/".
+ *   property of Easy Software Products and are protected by Federal
+ *   copyright law.  Distribution and use rights are outlined in the file
+ *   "LICENSE.txt" which should have been included with this file.  If this
+ *   file is missing or damaged please contact Easy Software Products
+ *   at:
+ *
+ *       Attn: CUPS Licensing Information
+ *       Easy Software Products
+ *       44141 Airport View Drive, Suite 204
+ *       Hollywood, Maryland 20636 USA
+ *
+ *       Voice: (301) 373-9600
+ *       EMail: cups-info@cups.org
+ *         WWW: http://www.cups.org
 *
 * Contents:
 *
@@ -3,14 +3,23 @@
 *
 *   CGI form variable and array functions.
 *
- *   Copyright 2007-2008 by Apple Inc.
 *   Copyright 1997-2005 by Easy Software Products.
 *
 *   These coded instructions, statements, and computer programs are the
- *   property of Apple Inc. and are protected by Federal copyright
- *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
- *   which should have been included with this file.  If this file is
- *   file is missing or damaged, see the license at "http://www.cups.org/".
+ *   property of Easy Software Products and are protected by Federal
+ *   copyright law.  Distribution and use rights are outlined in the file
+ *   "LICENSE.txt" which should have been included with this file.  If this
+ *   file is missing or damaged please contact Easy Software Products
+ *   at:
+ *
+ *       Attn: CUPS Licensing Information
+ *       Easy Software Products
+ *       44141 Airport View Drive, Suite 204
+ *       Hollywood, Maryland 20636 USA
+ *
+ *       Voice: (301) 373-9600
+ *       EMail: cups-info@cups.org
+ *         WWW: http://www.cups.org
 *
 * Contents:
 *
@@ -203,10 +212,10 @@ cgiGetVariable(const char *name)	/* I - Name of variable */

 #ifdef DEBUG
  if (var == NULL)
-    DEBUG_printf(("cgiGetVariable(\"%s\") is returning NULL...\n", name));
+    printf("cgiGetVariable(\"%s\") is returning NULL...\n", name);
  else
-    DEBUG_printf(("cgiGetVariable(\"%s\") is returning \"%s\"...\n", name,
-		  var->values[var->nvalues - 1]));
+    printf("cgiGetVariable(\"%s\") is returning \"%s\"...\n", name,
+           var->values[var->nvalues - 1]);
 #endif /* DEBUG */

  return ((var == NULL) ? NULL : var->values[var->nvalues - 1]);
@@ -242,6 +251,7 @@ cgiInitialize(void)
  */

  setbuf(stdout, NULL);
+  puts("Content-type: text/plain\n");
 #endif /* DEBUG */

 /*
@@ -321,15 +331,9 @@ cgiSetArray(const char *name,		/* I - Name of variable */
  {
    if (element >= var->avalues)
    {
-      const char **temp;		/* Temporary pointer */
-
-      temp = (const char **)realloc((void *)(var->values),
-                                    sizeof(char *) * (element + 16));
-      if (!temp)
-        return;
-
      var->avalues = element + 16;
-      var->values  = temp;
+      var->values  = (const char **)realloc((void *)(var->values),
+                                            sizeof(char *) * var->avalues);
    }

    if (element >= var->nvalues)
@@ -367,15 +371,9 @@ cgiSetSize(const char *name,		/* I - Name of variable */

  if (size >= var->avalues)
  {
-    const char **temp;			/* Temporary pointer */
-
-    temp = (const char **)realloc((void *)(var->values),
-				  sizeof(char *) * (size + 16));
-    if (!temp)
-      return;
-
    var->avalues = size + 16;
-    var->values  = temp;
+    var->values  = (const char **)realloc((void *)(var->values),
+                                          sizeof(char *) * var->avalues);
  }

  if (size > var->nvalues)
@@ -437,40 +435,31 @@ cgi_add_variable(const char *name,	/* I - Variable name */
 		 int        element,	/* I - Array element number */
                 const char *value)	/* I - Variable value */
 {
-  _cgi_var_t	*var;			/* New variable */
+  _cgi_var_t	*var;				/* New variable */


  if (name == NULL || value == NULL || element < 0 || element > 100000)
    return;

-  DEBUG_printf(("cgi_add_variable: Adding variable \'%s\' with value "
-                "\'%s\'...\n", name, value));
+#ifdef DEBUG
+  printf("Adding variable \'%s\' with value \'%s\'...\n", name, value);
+#endif /* DEBUG */

  if (form_count >= form_alloc)
  {
-    _cgi_var_t	*temp_vars;		/* Temporary form pointer */
-
-
    if (form_alloc == 0)
-      temp_vars = malloc(sizeof(_cgi_var_t) * 16);
+      form_vars = malloc(sizeof(_cgi_var_t) * 16);
    else
-      temp_vars = realloc(form_vars, (form_alloc + 16) * sizeof(_cgi_var_t));
+      form_vars = realloc(form_vars, (form_alloc + 16) * sizeof(_cgi_var_t));

-    if (!temp_vars)
-      return;
-
-    form_vars  = temp_vars;
    form_alloc += 16;
  }

-  var = form_vars + form_count;
-
-  if ((var->values = calloc(element + 1, sizeof(char *))) == NULL)
-    return;
-
+  var                  = form_vars + form_count;
  var->name            = strdup(name);
  var->nvalues         = element + 1;
  var->avalues         = element + 1;
+  var->values          = calloc(element + 1, sizeof(char *));
  var->values[element] = strdup(value);

  form_count ++;
@@ -520,7 +509,9 @@ cgi_initialize_get(void)
  char	*data;				/* Pointer to form data string */


-  DEBUG_puts("cgi_initialize_get: Initializing variables using GET method...");
+#ifdef DEBUG
+  puts("Initializing variables using GET method...");
+#endif /* DEBUG */

 /*
  * Check to see if there is anything for us to read...
@@ -774,7 +765,9 @@ cgi_initialize_post(void)
 	status;				/* Return status */


-  DEBUG_puts("cgi_initialize_post: Initializing variables using POST method...");
+#ifdef DEBUG
+  puts("Initializing variables using POST method...");
+#endif /* DEBUG */

 /*
  * Check to see if there is anything for us to read...
@@ -800,15 +793,11 @@ cgi_initialize_post(void)

  for (tbytes = 0; tbytes < length; tbytes += nbytes)
    if ((nbytes = read(0, data + tbytes, length - tbytes)) < 0)
-    {
      if (errno != EAGAIN)
      {
        free(data);
        return (0);
      }
-      else
-        nbytes = 0;
-    }

  data[length] = '\0';

@@ -925,7 +914,7 @@ cgi_initialize_string(const char *data)	/* I - Form data string */
    if (s > value)
      s --;

-    while (s >= value && isspace(*s & 255))
+    while (s >= value && *s == ' ')
      *s-- = '\0';

   /*
@@ -990,7 +979,7 @@ cgi_sort_variables(void)
  int	i;


-  DEBUG_puts("cgi_sort_variables: Sorting variables...");
+  puts("Sorting variables...");
 #endif /* DEBUG */

  if (form_count < 2)
@@ -1000,11 +989,10 @@ cgi_sort_variables(void)
        (int (*)(const void *, const void *))cgi_compare_variables);

 #ifdef DEBUG
-  DEBUG_puts("cgi_sort_variables: Sorted variable list is:");
+  puts("Sorted variable list is:");
  for (i = 0; i < form_count; i ++)
-    DEBUG_printf(("cgi_sort_variables: %d: %s (%d) = \"%s\" ...\n", i,
-                  form_vars[i].name, form_vars[i].nvalues,
-		  form_vars[i].values[0]));
+    printf("%d: %s (%d) = \"%s\" ...\n", i, form_vars[i].name,
+           form_vars[i].nvalues, form_vars[i].values[0]);
 #endif /* DEBUG */
 }

@@ -1,109 +0,0 @@
-/*
- * "$Id$"
- *
- *   Web search program for www.cups.org.
- *
- *   Copyright 2007-2008 by Apple Inc.
- *   Copyright 1997-2007 by Easy Software Products.
- *
- *   These coded instructions, statements, and computer programs are the
- *   property of Apple Inc. and are protected by Federal copyright
- *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
- *   which should have been included with this file.  If this file is
- *   file is missing or damaged, see the license at "http://www.cups.org/".
- *
- * Usage:
- *
- *   websearch directory "search string"
- *
- * Contents:
- *
- *   main()       - Search a directory of help files.
- *   list_nodes() - List matching nodes.
- */
-
-/*
- * Include necessary headers...
- */
-
-#include "cgi.h"
-
-
-/*
- * Local functions...
- */
-
-static void	list_nodes(const char *title, cups_array_t *nodes);
-
-
-/*
- * 'main()' - Test the help index code.
- */
-
-int					/* O - Exit status */
-main(int  argc,				/* I - Number of command-line args */
-     char *argv[])			/* I - Command-line arguments */
-{
-  help_index_t	*hi,			/* Help index */
-		*search;		/* Search index */
-  char		indexname[1024];	/* Name of index file */
-
-
-  if (argc != 3)
-  {
-    puts("Usage: websearch directory \"search terms\"");
-    return (1);
-  }
-
- /*
-  * Load the help index...
-  */
-
-  snprintf(indexname, sizeof(indexname), "%s/.index", argv[1]);
-  hi = helpLoadIndex(indexname, argv[1]);
-
- /*
-  * Do any searches...
-  */
-
-  search = helpSearchIndex(hi, argv[2], NULL, NULL);
-
-  if (search)
-    list_nodes(argv[1], search->sorted);
-
- /*
-  * Return with no errors...
-  */
-
-  return (0);
-}
-
-
-/*
- * 'list_nodes()' - List nodes in an array...
- */
-
-static void
-list_nodes(const char   *title,		/* I - Title string */
-	   cups_array_t *nodes)		/* I - Nodes */
-{
-  help_node_t	*node;			/* Current node */
-
-
-  printf("%d\n", cupsArrayCount(nodes));
-  for (node = (help_node_t *)cupsArrayFirst(nodes);
-       node;
-       node = (help_node_t *)cupsArrayNext(nodes))
-  {
-    if (node->anchor)
-      printf("%d|%s#%s|%s\n", node->score, node->filename, node->anchor,
-             node->text);
-    else
-      printf("%d|%s|%s\n", node->score, node->filename, node->text);
-  }
-}
-
-
-/*
- * End of "$Id$".
- */
@@ -3,14 +3,23 @@
 #
 #   Configuration file makefile for the Common UNIX Printing System (CUPS).
 #
-#   Copyright 2007-2008 by Apple Inc.
 #   Copyright 1993-2006 by Easy Software Products.
 #
 #   These coded instructions, statements, and computer programs are the
-#   property of Apple Inc. and are protected by Federal copyright
-#   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
-#   which should have been included with this file.  If this file is
-#   file is missing or damaged, see the license at "http://www.cups.org/".
+#   property of Easy Software Products and are protected by Federal
+#   copyright law.  Distribution and use rights are outlined in the file
+#   "LICENSE.txt" which should have been included with this file.  If this
+#   file is missing or damaged please contact Easy Software Products
+#   at:
+#
+#       Attn: CUPS Licensing Information
+#       Easy Software Products
+#       44141 Airport View Drive, Suite 204
+#       Hollywood, Maryland 20636 USA
+#
+#       Voice: (301) 373-9600
+#       EMail: cups-info@cups.org
+#         WWW: http://www.cups.org
 #

 include ../Makedefs
@@ -19,7 +28,7 @@ include ../Makedefs
 # Config files...
 #

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


@@ -30,20 +39,6 @@ REPLACE	=	mime.convs mime.types
 all:


-#
-# Make library targets...
-#
-
-libs:
-
-
-#
-# Make unit tests...
-#
-
-unittests:
-
-
 #
 # Clean all config and object files...
 #
@@ -59,17 +54,11 @@ depend:


 #
-# Install all targets...
+# Install files...
 #

-install:	all install-data install-headers install-libs install-exec
-
-
-#
-# Install data files...
-#
-
-install-data:
+install:	all
+	$(INSTALL_DIR) -m 755 $(SERVERROOT)
 	for file in $(KEEP); do \
 		if test -r $(SERVERROOT)/$$file ; then \
 			$(INSTALL_CONFIG) $$file $(SERVERROOT)/$$file.N ; \
@@ -81,15 +70,11 @@ install-data:
 	done
 	$(INSTALL_CONFIG) cupsd.conf $(SERVERROOT)/cupsd.conf.default
 	-chgrp $(CUPS_GROUP) $(SERVERROOT)/cupsd.conf.default
-	$(INSTALL_DIR) -m 755 $(DATADIR)/mime
 	for file in $(REPLACE); do \
-		if test -r $(DATADIR)/mime/$$file ; then \
-			$(MV) $(DATADIR)/mime/$$file $(DATADIR)/mime/$$file.O ; \
-		fi ; \
 		if test -r $(SERVERROOT)/$$file ; then \
-			$(MV) $(SERVERROOT)/$$file $(DATADIR)/mime/$$file.O ; \
+			$(MV) $(SERVERROOT)/$$file $(SERVERROOT)/$$file.O ; \
 		fi ; \
-		$(INSTALL_DATA) $$file $(DATADIR)/mime ; \
+		$(INSTALL_DATA) $$file $(SERVERROOT) ; \
 	done
 	-if test x$(PAMDIR) != x; then \
 		$(INSTALL_DIR) -m 755 $(BUILDROOT)$(PAMDIR); \
@@ -101,27 +86,6 @@ install-data:
 	fi


-#
-# Install programs...
-#
-
-install-exec:
-
-
-#
-# Install headers...
-#
-
-install-headers:
-
-
-#
-# Install libraries...
-#
-
-install-libs:
-
-
 #
 # Uninstall files...
 #
@@ -131,10 +95,6 @@ uninstall:
 		$(RM) $(SERVERROOT)/$$file; \
 	done
 	-$(RMDIR) $(SERVERROOT)
-	for file in $(REPLACE); do \
-		$(RM) $(DATADIR)/mime/$$file; \
-	done
-	-$(RMDIR) $(DATADIR)/mime
 	-if test x$(PAMDIR) != x; then \
 		$(RM) $(BUILDROOT)$(PAMDIR)/cups; \
 		$(RMDIR) $(BUILDROOT)$(PAMDIR); \
@@ -6,13 +6,12 @@
 #   file.
 #

-# Log general information in error_log - change "@CUPS_LOG_LEVEL@" to "debug"
-# for troubleshooting...
-LogLevel @CUPS_LOG_LEVEL@
+# Log general information in error_log - change "info" to "debug" for
+# troubleshooting...
+LogLevel info

 # Administrator user group...
 SystemGroup @CUPS_SYSTEM_GROUPS@
-@CUPS_SYSTEM_AUTHKEY@

 # Only listen for connections from the local machine.
 Listen localhost:@DEFAULT_IPP_PORT@
@@ -21,8 +20,7 @@ Listen localhost:@DEFAULT_IPP_PORT@
 # Show shared printers on the local network.
 Browsing On
 BrowseOrder allow,deny
-BrowseAllow all
-BrowseLocalProtocols @CUPS_DEFAULT_BROWSE_LOCAL_PROTOCOLS@
+BrowseAllow @LOCAL

 # Default authentication type, when authentication is required...
 DefaultAuthType Basic
@@ -30,91 +28,46 @@ DefaultAuthType Basic
 # Restrict access to the server...
 <Location />
  Order allow,deny
+  Allow localhost
 </Location>

 # Restrict access to the admin pages...
 <Location /admin>
@ENCRYPTION_REQUIRED@
  Order allow,deny
+  Allow localhost
 </Location>

 # Restrict access to configuration files...
 <Location /admin/conf>
-  AuthType Default
+  AuthType Basic
  Require user @SYSTEM
  Order allow,deny
+  Allow localhost
 </Location>

 # Set the default printer/job policies...
 <Policy default>
-  # Job-related operations must be done by the owner or an administrator...
-  <Limit Send-Document Send-URI Hold-Job Release-Job Restart-Job Purge-Jobs Set-Job-Attributes Create-Job-Subscription Renew-Subscription Cancel-Subscription Get-Notifications Reprocess-Job Cancel-Current-Job Suspend-Current-Job Resume-Job CUPS-Move-Job CUPS-Get-Document>
+  # Job-related operations must be done by the owner or an adminstrator...
+  <Limit Send-Document Send-URI Hold-Job Release-Job Restart-Job Purge-Jobs Set-Job-Attributes Create-Job-Subscription Renew-Subscription Cancel-Subscription Get-Notifications Reprocess-Job Cancel-Current-Job Suspend-Current-Job Resume-Job CUPS-Move-Job>
    Require user @OWNER @SYSTEM
    Order deny,allow
  </Limit>

-  # All administration operations require an administrator to authenticate...
-  <Limit CUPS-Add-Modify-Printer CUPS-Delete-Printer CUPS-Add-Modify-Class CUPS-Delete-Class CUPS-Set-Default CUPS-Get-Devices>
-    AuthType Default
+  # All administration operations require an adminstrator to authenticate...
+  <Limit Pause-Printer Resume-Printer Set-Printer-Attributes Enable-Printer Disable-Printer Pause-Printer-After-Current-Job Hold-New-Jobs Release-Held-New-Jobs Deactivate-Printer Activate-Printer Restart-Printer Shutdown-Printer Startup-Printer Promote-Job Schedule-Job-After CUPS-Add-Printer CUPS-Delete-Printer CUPS-Add-Class CUPS-Delete-Class CUPS-Accept-Jobs CUPS-Reject-Jobs CUPS-Set-Default>
+    AuthType Basic
    Require user @SYSTEM
    Order deny,allow
  </Limit>

-  # All printer operations require a printer operator to authenticate...
-  <Limit Pause-Printer Resume-Printer Enable-Printer Disable-Printer Pause-Printer-After-Current-Job Hold-New-Jobs Release-Held-New-Jobs Deactivate-Printer Activate-Printer Restart-Printer Shutdown-Printer Startup-Printer Promote-Job Schedule-Job-After CUPS-Accept-Jobs CUPS-Reject-Jobs>
-    AuthType Default
-    Require user @CUPS_DEFAULT_PRINTADMIN_AUTH@
-    Order deny,allow
-  </Limit>
-
  # Only the owner or an administrator can cancel or authenticate a job...
  <Limit Cancel-Job CUPS-Authenticate-Job>
-    Require user @OWNER @CUPS_DEFAULT_PRINTADMIN_AUTH@
-    Order deny,allow
-  </Limit>
-
-  <Limit All>
-    Order deny,allow
-  </Limit>
-</Policy>
-
-# Set the authenticated printer/job policies...
-<Policy authenticated>
-  # Job-related operations must be done by the owner or an administrator...
-  <Limit Create-Job Print-Job Print-URI>
-    AuthType Default
-    Order deny,allow
-  </Limit>
-
-  <Limit Send-Document Send-URI Hold-Job Release-Job Restart-Job Purge-Jobs Set-Job-Attributes Create-Job-Subscription Renew-Subscription Cancel-Subscription Get-Notifications Reprocess-Job Cancel-Current-Job Suspend-Current-Job Resume-Job CUPS-Move-Job CUPS-Get-Document>
-    AuthType Default
    Require user @OWNER @SYSTEM
    Order deny,allow
  </Limit>

-  # All administration operations require an administrator to authenticate...
-  <Limit CUPS-Add-Modify-Printer CUPS-Delete-Printer CUPS-Add-Modify-Class CUPS-Delete-Class CUPS-Set-Default>
-    AuthType Default
-    Require user @SYSTEM
-    Order deny,allow
-  </Limit>
-
-  # All printer operations require a printer operator to authenticate...
-  <Limit Pause-Printer Resume-Printer Enable-Printer Disable-Printer Pause-Printer-After-Current-Job Hold-New-Jobs Release-Held-New-Jobs Deactivate-Printer Activate-Printer Restart-Printer Shutdown-Printer Startup-Printer Promote-Job Schedule-Job-After CUPS-Accept-Jobs CUPS-Reject-Jobs>
-    AuthType Default
-    Require user @CUPS_DEFAULT_PRINTADMIN_AUTH@
-    Order deny,allow
-  </Limit>
-
-  # Only the owner or an administrator can cancel or authenticate a job...
-  <Limit Cancel-Job CUPS-Authenticate-Job>
-    AuthType Default
-    Require user @OWNER @CUPS_DEFAULT_PRINTADMIN_AUTH@
-    Order deny,allow
-  </Limit>
-
  <Limit All>
-    AuthType Default
    Order deny,allow
  </Limit>
 </Policy>
@@ -0,0 +1,118 @@
+#
+# "$Id: mime.convs 5402 2006-04-14 19:21:03Z mike $"
+#
+#   MIME converts file for the Common UNIX Printing System (CUPS).
+#
+#   Copyright 1997-2005 by Easy Software Products.
+#
+#   These coded instructions, statements, and computer programs are the
+#   property of Easy Software Products and are protected by Federal
+#   copyright law.  Distribution and use rights are outlined in the file
+#   "LICENSE.txt" which should have been included with this file.  If this
+#   file is missing or damaged please contact Easy Software Products
+#   at:
+#
+#       Attn: CUPS Licensing Information
+#       Easy Software Products
+#       44141 Airport View Drive, Suite 204
+#       Hollywood, Maryland 20636 USA
+#
+#       Voice: (301) 373-9600
+#       EMail: cups-info@cups.org
+#         WWW: http://www.cups.org
+#
+
+########################################################################
+#
+# Format of Lines:
+#
+#   source/type destination/type cost filter
+#
+# General Notes:
+#
+#   The "cost" field is used to find the least costly filters to run
+#   when converting a job file to a printable format.
+#
+#   All filters *must* accept the standard command-line arguments
+#   (job-id, user, title, copies, options, [filename or stdin]) to
+#   work with CUPS.
+#
+
+########################################################################
+#
+# PostScript filters
+#
+
+application/pdf		application/postscript	33	pdftops
+application/postscript	application/vnd.cups-postscript	66	pstops
+application/vnd.hp-HPGL	application/postscript	66	hpgltops
+application/x-cshell	application/postscript	33	texttops
+application/x-csource	application/postscript	33	texttops
+application/x-perl	application/postscript	33	texttops
+application/x-shell	application/postscript	33	texttops
+text/plain		application/postscript	33	texttops
+text/html		application/postscript	33	texttops
+image/gif		application/vnd.cups-postscript	66	imagetops
+image/png		application/vnd.cups-postscript	66	imagetops
+image/jpeg		application/vnd.cups-postscript	66	imagetops
+image/tiff		application/vnd.cups-postscript	66	imagetops
+image/x-bitmap		application/vnd.cups-postscript	66	imagetops
+image/x-photocd		application/vnd.cups-postscript	66	imagetops
+image/x-portable-anymap	application/vnd.cups-postscript	66	imagetops
+image/x-portable-bitmap	application/vnd.cups-postscript	66	imagetops
+image/x-portable-graymap application/vnd.cups-postscript	66	imagetops
+image/x-portable-pixmap	application/vnd.cups-postscript	66	imagetops
+image/x-sgi-rgb		application/vnd.cups-postscript	66	imagetops
+image/x-xbitmap		application/vnd.cups-postscript	66	imagetops
+image/x-xpixmap		application/vnd.cups-postscript	66	imagetops
+#image/x-xwindowdump	application/vnd.cups-postscript	66	imagetops
+image/x-sun-raster	application/vnd.cups-postscript	66	imagetops
+
+
+########################################################################
+#
+# Form filter...
+#
+# This filter does not currently exist, but the file format is defined
+# in the IDD and registered with the IANA for future use...
+#
+
+#application/vnd.cups-form application/vnd.cups-postscript 33 formtops
+
+########################################################################
+#
+# Raster filters...
+#
+
+image/gif		application/vnd.cups-raster	100	imagetoraster
+image/png		application/vnd.cups-raster	100	imagetoraster
+image/jpeg		application/vnd.cups-raster	100	imagetoraster
+image/tiff		application/vnd.cups-raster	100	imagetoraster
+image/x-bitmap		application/vnd.cups-raster	100	imagetoraster
+image/x-photocd		application/vnd.cups-raster	100	imagetoraster
+image/x-portable-anymap	application/vnd.cups-raster	100	imagetoraster
+image/x-portable-bitmap	application/vnd.cups-raster	100	imagetoraster
+image/x-portable-graymap application/vnd.cups-raster	100	imagetoraster
+image/x-portable-pixmap	application/vnd.cups-raster	100	imagetoraster
+image/x-sgi-rgb		application/vnd.cups-raster	100	imagetoraster
+image/x-xbitmap		application/vnd.cups-raster	100	imagetoraster
+image/x-xpixmap		application/vnd.cups-raster	100	imagetoraster
+#image/x-xwindowdump	application/vnd.cups-raster	100	imagetoraster
+image/x-sun-raster	application/vnd.cups-raster	100	imagetoraster
+
+# pstoraster is now part of ESP Ghostscript...
+#application/vnd.cups-postscript	application/vnd.cups-raster	100	pstoraster
+
+########################################################################
+#
+# Raw filter...
+#
+# Uncomment the following filter to allow printing of arbitrary files
+# without the -oraw option.
+#
+
+#application/octet-stream	application/vnd.cups-raw	0	-
+
+#
+# End of "$Id: mime.convs 5402 2006-04-14 19:21:03Z mike $".
+#
@@ -1,103 +0,0 @@
-#
-# "$Id$"
-#
-#   DO NOT EDIT THIS FILE, AS IT IS OVERWRITTEN WHEN YOU INSTALL NEW
-#   VERSIONS OF CUPS.  Instead, create a "local.convs" file that
-#   reflects your local configuration changes.
-#
-#   MIME converts file for the Common UNIX Printing System (CUPS).
-#
-#   Copyright 2007-2008 by Apple Inc.
-#   Copyright 1997-2007 by Easy Software Products.
-#
-#   These coded instructions, statements, and computer programs are the
-#   property of Apple Inc. and are protected by Federal copyright
-#   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
-#   which should have been included with this file.  If this file is
-#   file is missing or damaged, see the license at "http://www.cups.org/".
-#
-
-########################################################################
-#
-# Format of Lines:
-#
-#   source/type destination/type cost filter
-#
-# General Notes:
-#
-#   The "cost" field is used to find the least costly filters to run
-#   when converting a job file to a printable format.
-#
-#   All filters *must* accept the standard command-line arguments
-#   (job-id, user, title, copies, options, [filename or stdin]) to
-#   work with CUPS.
-#
-
-########################################################################
-#
-# PostScript filters
-#
-
-application/pdf			application/postscript		33	pdftops
-application/postscript		application/vnd.cups-postscript	66	pstops
-application/vnd.hp-HPGL		application/postscript		66	hpgltops
-application/x-cshell		application/postscript		33	texttops
-application/x-csource		application/postscript		33	texttops
-application/x-perl		application/postscript		33	texttops
-application/x-shell		application/postscript		33	texttops
-text/plain			application/postscript		33	texttops
-text/html			application/postscript		33	texttops
-image/gif			application/vnd.cups-postscript	66	imagetops
-image/png			application/vnd.cups-postscript	66	imagetops
-image/jpeg			application/vnd.cups-postscript	66	imagetops
-image/tiff			application/vnd.cups-postscript	66	imagetops
-image/x-bitmap			application/vnd.cups-postscript	66	imagetops
-image/x-photocd			application/vnd.cups-postscript	66	imagetops
-image/x-portable-anymap		application/vnd.cups-postscript	66	imagetops
-image/x-portable-bitmap		application/vnd.cups-postscript	66	imagetops
-image/x-portable-graymap	application/vnd.cups-postscript	66	imagetops
-image/x-portable-pixmap		application/vnd.cups-postscript	66	imagetops
-image/x-sgi-rgb			application/vnd.cups-postscript	66	imagetops
-image/x-xbitmap			application/vnd.cups-postscript	66	imagetops
-image/x-xpixmap			application/vnd.cups-postscript	66	imagetops
-#image/x-xwindowdump		application/vnd.cups-postscript	66	imagetops
-image/x-sun-raster		application/vnd.cups-postscript	66	imagetops
-application/vnd.cups-banner	application/postscript		33	bannertops
-
-########################################################################
-#
-# Raster filters...
-#
-
-image/gif			application/vnd.cups-raster	100	imagetoraster
-image/png			application/vnd.cups-raster	100	imagetoraster
-image/jpeg			application/vnd.cups-raster	100	imagetoraster
-image/tiff			application/vnd.cups-raster	100	imagetoraster
-image/x-bitmap			application/vnd.cups-raster	100	imagetoraster
-image/x-photocd			application/vnd.cups-raster	100	imagetoraster
-image/x-portable-anymap		application/vnd.cups-raster	100	imagetoraster
-image/x-portable-bitmap		application/vnd.cups-raster	100	imagetoraster
-image/x-portable-graymap	application/vnd.cups-raster	100	imagetoraster
-image/x-portable-pixmap		application/vnd.cups-raster	100	imagetoraster
-image/x-sgi-rgb			application/vnd.cups-raster	100	imagetoraster
-image/x-xbitmap			application/vnd.cups-raster	100	imagetoraster
-image/x-xpixmap			application/vnd.cups-raster	100	imagetoraster
-#image/x-xwindowdump		application/vnd.cups-raster	100	imagetoraster
-image/x-sun-raster		application/vnd.cups-raster	100	imagetoraster
-
-# pstoraster is part of GPL Ghostscript...
-application/vnd.cups-postscript	application/vnd.cups-raster	100	pstoraster
-
-########################################################################
-#
-# Raw filter...
-#
-# Uncomment the following filter to allow printing of arbitrary files
-# without the -oraw option.
-#
-
-@DEFAULT_RAW_PRINTING@application/octet-stream	application/vnd.cups-raw	0	-
-
-#
-# End of "$Id$".
-#
@@ -1,20 +1,25 @@
 #
-# "$Id: mime.types 7995 2008-10-01 04:48:33Z mike $"
+# "$Id: mime.types 5402 2006-04-14 19:21:03Z mike $"
 #
 #   MIME types file for the Common UNIX Printing System (CUPS).
 #
-#   DO NOT EDIT THIS FILE, AS IT IS OVERWRITTEN WHEN YOU INSTALL NEW
-#   VERSIONS OF CUPS.  Instead, create a "local.types" file that
-#   reflects your local configuration changes.
-#
-#   Copyright 2007-2008 by Apple Inc.
-#   Copyright 1997-2007 by Easy Software Products.
+#   Copyright 1997-2005 by Easy Software Products.
 #
 #   These coded instructions, statements, and computer programs are the
-#   property of Apple Inc. and are protected by Federal copyright
-#   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
-#   which should have been included with this file.  If this file is
-#   file is missing or damaged, see the license at "http://www.cups.org/".
+#   property of Easy Software Products and are protected by Federal
+#   copyright law.  Distribution and use rights are outlined in the file
+#   "LICENSE.txt" which should have been included with this file.  If this
+#   file is missing or damaged please contact Easy Software Products
+#   at:
+#
+#       Attn: CUPS Licensing Information
+#       Easy Software Products
+#       44141 Airport View Drive, Suite 204
+#       Hollywood, Maryland 20636 USA
+#
+#       Voice: (301) 373-9600
+#       EMail: cups-info@cups.org
+#         WWW: http://www.cups.org
 #

 ########################################################################
@@ -33,8 +38,6 @@
 #   extension				Pattern match on "*.extension"
 #   ascii(offset,length)		True if bytes are valid printable ASCII
 #					(CR, NL, TAB, BS, 32-126)
-#   priority(number)                    Sets priority of type (0=lowest,
-#                                       100=default, 200=highest)
 #   printable(offset,length)		True if bytes are printable 8-bit chars
 #					(CR, NL, TAB, BS, 32-126, 128-254)
 #   string(offset,"string")		True if bytes are identical to string
@@ -71,20 +74,20 @@
 application/pdf			pdf string(0,%PDF)
 application/postscript		ai eps ps string(0,%!) string(0,<04>%!) \
 				contains(0,128,<1B>%-12345X) + \
-				(contains(0,4096,"LANGUAGE=POSTSCRIPT") \
-				 contains(0,4096,"LANGUAGE = Postscript") \
-				 contains(0,4096,"LANGUAGE = PostScript") \
-				 contains(0,4096,"LANGUAGE = POSTSCRIPT") \
-				 (contains(0,4096,<0a>%!) + \
-				  !contains(0,4096,"ENTER LANGUAGE")))
-application/vnd.hp-HPGL		hpgl \
+				(contains(0,1024,"LANGUAGE=POSTSCRIPT") \
+				 contains(0,1024,"LANGUAGE = Postscript") \
+				 contains(0,1024,"LANGUAGE = PostScript") \
+				 contains(0,1024,"LANGUAGE = POSTSCRIPT") \
+				 (contains(0,1024,<0a>%!) + \
+				  !contains(0,1024,"ENTER LANGUAGE")))
+application/vnd.hp-HPGL		hpgl string(0,<1B>&)\
 				string(0,<1B>E<1B>%0B) \
 				string(0,<1B>%-1B) string(0,<201B>)\
 				string(0,BP;) string(0,IN;) string(0,DF;) \
 				string(0,BPINPS;) \
 				(contains(0,128,<1B>%-12345X) + \
-				 (contains(0,4096,"LANGUAGE=HPGL") \
-				  contains(0,4096,"LANGUAGE = HPGL")))
+				 (contains(0,1024,"LANGUAGE=HPGL") \
+				  contains(0,1024,"LANGUAGE = HPGL")))

 ########################################################################
 #
@@ -98,7 +101,7 @@ image/jpeg			jpeg jpg jpe string(0,<FFD8FF>) &&\
 				 char(3,0xe4) char(3,0xe5) char(3,0xe6) char(3,0xe7)\
 				 char(3,0xe8) char(3,0xe9) char(3,0xea) char(3,0xeb)\
 				 char(3,0xec) char(3,0xed) char(3,0xee) char(3,0xef))
-image/tiff			tiff tif string(0,MM<002A>) string(0,II<2A00>)
+image/tiff			tiff tif string(0,MM) string(0,II)
 image/x-photocd			pcd string(2048,PCD_IPI)
 image/x-portable-anymap		pnm
 image/x-portable-bitmap		pbm string(0,P1) string(0,P4)
@@ -137,33 +140,22 @@ text/html			html htm printable(0,1024) +\
 text/plain			txt printable(0,1024)
 text/css			css

-
-########################################################################
-#
-# RSS feed type...
-#
-
-application/rss+xml		rss
-
-
 ########################################################################
 #
 # CUPS-specific types...
 #

-application/vnd.cups-banner	string(0,'#CUPS-BANNER')
 application/vnd.cups-command	string(0,'#CUPS-COMMAND')
+application/vnd.cups-form	string(0,"<CUPSFORM>")
 application/vnd.cups-pdf
 application/vnd.cups-postscript
 application/vnd.cups-ppd	ppd string(0,"*PPD-Adobe:")
-application/vnd.cups-raster	string(0,"RaSt") string(0,"tSaR") \
-				string(0,"RaS2") string(0,"2SaR") \
-				string(0,"RaS3") string(0,"3SaR")
+application/vnd.cups-raster	string(0,"RaSt") string(0,"tSaR")
 application/vnd.cups-raw	(string(0,<1B>E) + !string(2,<1B>%0B)) \
 				string(0,<1B>@) \
 				(contains(0,128,<1B>%-12345X) + \
-				 (contains(0,4096,"LANGUAGE=PCL") \
-				  contains(0,4096,"LANGUAGE = PCL")))
+				 (contains(0,1024,"LANGUAGE=PCL") \
+				  contains(0,1024,"LANGUAGE = PCL")))

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

 #
-# End of "$Id: mime.types 7995 2008-10-01 04:48:33Z mike $".
+# End of "$Id: mime.types 5402 2006-04-14 19:21:03Z mike $".
 #
@@ -1,5 +0,0 @@
-# cups: auth account password session
-auth       required       pam_opendirectory.so
-account    required       pam_permit.so
-password   required       pam_deny.so
-session    required       pam_permit.so
@@ -1,13 +0,0 @@
-#
-# "$Id$"
-#
-#   Sample SNMP configuration file for CUPS.  See "man cups-smnp.conf" for a
-#   complete description of this file.
-#
-
-@CUPS_SNMP_ADDRESS@
-@CUPS_SNMP_COMMUNITY@
-
-#
-# End of "$Id$".
-#
@@ -1,140 +0,0 @@
-dnl
-dnl "$Id$"
-dnl
-dnl   32/64-bit library support stuff for the Common UNIX Printing System (CUPS).
-dnl
-dnl   Copyright 2007 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
-dnl   property of Apple Inc. and are protected by Federal copyright
-dnl   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
-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
-
-dnl Setup support for separate 32/64-bit library generation...
-AC_ARG_ENABLE(32bit, [  --enable-32bit          generate 32-bit libraries on 32/64-bit systems, default=no])
-
-INSTALL32=""
-LIB32CUPS=""
-LIB32CUPSIMAGE=""
-LIB32DIR=""
-UNINSTALL32=""
-
-AC_SUBST(INSTALL32)
-AC_SUBST(LIB32CUPS)
-AC_SUBST(LIB32CUPSIMAGE)
-AC_SUBST(LIB32DIR)
-AC_SUBST(UNINSTALL32)
-
-AC_ARG_ENABLE(64bit, [  --enable-64bit          generate 64-bit libraries on 32/64-bit systems, default=no])
-
-INSTALL64=""
-LIB64CUPS=""
-LIB64CUPSIMAGE=""
-LIB64DIR=""
-UNINSTALL64=""
-
-AC_SUBST(INSTALL64)
-AC_SUBST(LIB64CUPS)
-AC_SUBST(LIB64CUPSIMAGE)
-AC_SUBST(LIB64DIR)
-AC_SUBST(UNINSTALL64)
-
-case "$uname" in
-	HP-UX*)
-		if test "x$enable_32bit" = xyes; then
-			# Build 32-bit libraries, 64-bit base...
-			INSTALL32="install32bit"
-			LIB32CUPS="32bit/libcups.so.2"
-			LIB32CUPSIMAGE="32bit/libcupsimage.so.2"
-			LIB32DIR="$exec_prefix/lib"
-			if test -d /usr/lib/hpux32; then
-				LIB32DIR="${LIB32DIR}/hpux32"
-			fi
-			UNINSTALL32="uninstall32bit"
-		fi
-
-		if test "x$enable_64bit" = xyes; then
-			# Build 64-bit libraries, 32-bit base...
-			INSTALL64="install64bit"
-			LIB64CUPS="64bit/libcups.so.2"
-			LIB64CUPSIMAGE="64bit/libcupsimage.so.2"
-			LIB64DIR="$exec_prefix/lib"
-			if test -d /usr/lib/hpux64; then
-				LIB64DIR="${LIB64DIR}/hpux64"
-			fi
-			UNINSTALL64="uninstall64bit"
-		fi
-		;;
-
-	IRIX)
-		if test "x$enable_32bit" = xyes; then
-			INSTALL32="install32bit"
-			LIB32CUPS="32bit/libcups.so.2"
-			LIB32CUPSIMAGE="32bit/libcupsimage.so.2"
-			LIB32DIR="$prefix/lib32"
-			UNINSTALL32="uninstall32bit"
-		fi
-
-		if test "x$enable_64bit" = xyes; then
-			# Build 64-bit libraries, 32-bit base...
-			INSTALL64="install64bit"
-			LIB64CUPS="64bit/libcups.so.2"
-			LIB64CUPSIMAGE="64bit/libcupsimage.so.2"
-			LIB64DIR="$prefix/lib64"
-			UNINSTALL64="uninstall64bit"
-		fi
-		;;
-
-	Linux*)
-		if test "x$enable_32bit" = xyes; then
-			# Build 32-bit libraries, 64-bit base...
-			INSTALL32="install32bit"
-			LIB32CUPS="32bit/libcups.so.2"
-			LIB32CUPSIMAGE="32bit/libcupsimage.so.2"
-			LIB32DIR="$exec_prefix/lib"
-			if test -d /usr/lib32; then
-				LIB32DIR="${LIB32DIR}32"
-			fi
-			UNINSTALL32="uninstall32bit"
-		fi
-
-		if test "x$enable_64bit" = xyes; then
-			# Build 64-bit libraries, 32-bit base...
-			INSTALL64="install64bit"
-			LIB64CUPS="64bit/libcups.so.2"
-			LIB64CUPSIMAGE="64bit/libcupsimage.so.2"
-			LIB64DIR="$exec_prefix/lib"
-			if test -d /usr/lib64; then
-				LIB64DIR="${LIB64DIR}64"
-			fi
-			UNINSTALL64="uninstall64bit"
-		fi
-		;;
-
-	SunOS*)
-		if test "x$enable_32bit" = xyes; then
-			# Build 32-bit libraries, 64-bit base...
-			INSTALL32="install32bit"
-			LIB32CUPS="32bit/libcups.so.2"
-			LIB32CUPSIMAGE="32bit/libcupsimage.so.2"
-			LIB32DIR="$exec_prefix/lib/32"
-			UNINSTALL32="uninstall32bit"
-		fi
-
-		if test "x$enable_64bit" = xyes; then
-			# Build 64-bit libraries, 32-bit base...
-			INSTALL64="install64bit"
-			LIB64CUPS="64bit/libcups.so.2"
-			LIB64CUPSIMAGE="64bit/libcupsimage.so.2"
-			LIB64DIR="$exec_prefix/lib/64"
-			UNINSTALL64="uninstall64bit"
-		fi
-		;;
-esac
-
-dnl
-dnl End of "$Id$".
-dnl
@@ -1,38 +1,42 @@
 dnl
-dnl "$Id: cups-common.m4 8094 2008-10-31 20:51:39Z mike $"
+dnl "$Id: cups-common.m4 5930 2006-09-07 19:49:34Z mike $"
 dnl
 dnl   Common configuration stuff for the Common UNIX Printing System (CUPS).
 dnl
-dnl   Copyright 2007-2008 by Apple Inc.
-dnl   Copyright 1997-2007 by Easy Software Products, all rights reserved.
+dnl   Copyright 1997-2006 by Easy Software Products, all rights reserved.
 dnl
 dnl   These coded instructions, statements, and computer programs are the
-dnl   property of Apple Inc. and are protected by Federal copyright
-dnl   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
-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   property of Easy Software Products and are protected by Federal
+dnl   copyright law.  Distribution and use rights are outlined in the file
+dnl   "LICENSE.txt" which should have been included with this file.  If this
+dnl   file is missing or damaged please contact Easy Software Products
+dnl   at:
+dnl
+dnl       Attn: CUPS Licensing Information
+dnl       Easy Software Products
+dnl       44141 Airport View Drive, Suite 204
+dnl       Hollywood, Maryland 20636 USA
+dnl
+dnl       Voice: (301) 373-9600
+dnl       EMail: cups-info@cups.org
+dnl         WWW: http://www.cups.org
 dnl

-dnl We need at least autoconf 2.60...
-AC_PREREQ(2.60)
+dnl We need at least autoconf 2.50...
+AC_PREREQ(2.50)

 dnl Set the name of the config header file...
 AC_CONFIG_HEADER(config.h)

-dnl Version number information...
-CUPS_VERSION="1.4b2"
+dnl Versio number information...
+CUPS_VERSION="1.2.4"
 CUPS_REVISION=""
-#if test -z "$CUPS_REVISION" -a -d .svn; then
-#	CUPS_REVISION="-r`svnversion . | awk -F: '{print $NF}' | sed -e '1,$s/[[a-zA-Z]]*//g'`"
-#fi
-CUPS_BUILD="cups-$CUPS_VERSION"
-
-AC_ARG_WITH(cups_build, [  --with-cups-build       set "cups-config --build" string ],
-	CUPS_BUILD="$withval")
+if test -z "$CUPS_REVISION" -a -d .svn; then
+	CUPS_REVISION="-r`svnversion . | awk -F: '{print $NF}' | sed -e '1,$s/[[a-zA-Z]]*//g'`"
+fi

 AC_SUBST(CUPS_VERSION)
 AC_SUBST(CUPS_REVISION)
-AC_SUBST(CUPS_BUILD)
 AC_DEFINE_UNQUOTED(CUPS_SVERSION, "CUPS v$CUPS_VERSION$CUPS_REVISION")
 AC_DEFINE_UNQUOTED(CUPS_MINIMAL, "CUPS/$CUPS_VERSION$CUPS_REVISION")

@@ -45,8 +49,13 @@ LDFLAGS="${LDFLAGS:=}"
 dnl Checks for programs...
 AC_PROG_AWK
 AC_PROG_CC
-AC_PROG_CPP
 AC_PROG_CXX
+AC_PROG_CPP
+AC_PROG_INSTALL
+if test "$INSTALL" = "$ac_install_sh"; then
+	# Use full path to install-sh script...
+	INSTALL="`pwd`/install-sh -c"
+fi
 AC_PROG_RANLIB
 AC_PATH_PROG(AR,ar)
 AC_PATH_PROG(HTMLDOC,htmldoc)
@@ -56,18 +65,7 @@ AC_PATH_PROG(MV,mv)
 AC_PATH_PROG(RM,rm)
 AC_PATH_PROG(RMDIR,rmdir)
 AC_PATH_PROG(SED,sed)
-AC_PATH_PROG(XDGOPEN,xdg-open)
-if test "x$XDGOPEN" = x; then
-	CUPS_HTMLVIEW="htmlview"
-else
-	CUPS_HTMLVIEW="$XDGOPEN"
-fi
-AC_SUBST(CUPS_HTMLVIEW)
-
-AC_MSG_CHECKING(for install-sh script)
-INSTALL="`pwd`/install-sh -c"
-AC_SUBST(INSTALL)
-AC_MSG_RESULT(using $INSTALL)
+AC_PATH_PROG(STRIP,strip)

 if test "x$AR" = x; then
 	AC_MSG_ERROR([Unable to find required library archive command.])
@@ -75,6 +73,9 @@ fi
 if test "x$CC" = x; then
 	AC_MSG_ERROR([Unable to find required C compiler command.])
 fi
+if test "x$CXX" = x; then
+	AC_MSG_ERROR([Unable to find required C++ compiler command.])
+fi

 dnl Static library option...
 INSTALLSTATIC=""
@@ -95,11 +96,14 @@ LIBMALLOC=""
 AC_ARG_ENABLE(mallinfo, [  --enable-mallinfo       turn on malloc debug information, default=no])

 if test x$enable_mallinfo = xyes; then
-	SAVELIBS="$LIBS"
-	LIBS=""
-	AC_SEARCH_LIBS(mallinfo, malloc, AC_DEFINE(HAVE_MALLINFO))
-	LIBMALLOC="$LIBS"
-	LIBS="$SAVELIBS"
+	AC_CHECK_LIB(c,mallinfo,LIBS="$LIBS"; AC_DEFINE(HAVE_MALLINFO),LIBS="$LIBS")
+	if test "$ac_cv_lib_c_mallinfo" = "no"; then
+		AC_CHECK_LIB(malloc,mallinfo,
+	        	     LIBS="$LIBS"
+			     LIBMALLOC="-lmalloc"
+			     AC_DEFINE(HAVE_MALLINFO),
+			     LIBS="$LIBS")
+	fi
 fi

 AC_SUBST(LIBMALLOC)
@@ -128,9 +132,6 @@ AC_CHECK_HEADER(strings.h,AC_DEFINE(HAVE_STRINGS_H))
 AC_CHECK_HEADER(bstring.h,AC_DEFINE(HAVE_BSTRING_H))
 AC_CHECK_HEADER(usersec.h,AC_DEFINE(HAVE_USERSEC_H))
 AC_CHECK_HEADER(sys/ioctl.h,AC_DEFINE(HAVE_SYS_IOCTL_H))
-AC_CHECK_HEADER(sys/param.h,AC_DEFINE(HAVE_SYS_PARAM_H))
-AC_CHECK_HEADER(sys/ucred.h,AC_DEFINE(HAVE_SYS_UCRED_H))
-AC_CHECK_HEADER(scsi/sg.h,AC_DEFINE(HAVE_SCSI_SG_H))

 dnl Checks for string functions.
 AC_CHECK_FUNCS(strdup strcasecmp strncasecmp strlcat strlcpy)
@@ -140,9 +141,6 @@ else
 	AC_CHECK_FUNCS(snprintf vsnprintf)
 fi

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

@@ -166,7 +164,8 @@ esac
 AC_CHECK_FUNCS(sigaction)

 dnl Checks for wait functions.
-AC_CHECK_FUNCS(waitpid wait3)
+AC_CHECK_FUNCS(waitpid)
+AC_CHECK_FUNCS(wait3)

 dnl See if the tm structure has the tm_gmtoff member...
 AC_MSG_CHECKING(for tm_gmtoff member in tm structure)
@@ -176,43 +175,6 @@ AC_TRY_COMPILE([#include <time.h>],[struct tm t;
 	AC_DEFINE(HAVE_TM_GMTOFF),
 	AC_MSG_RESULT(no))

-dnl See if we have the removefile(3) function for securely removing files
-AC_CHECK_FUNCS(removefile)
-
-dnl See if we have libusb...
-AC_ARG_ENABLE(libusb, [  --enable-libusb         use libusb for USB printing, default=auto])
-
-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_init,[
-		AC_CHECK_HEADER(usb.h,
-			AC_DEFINE(HAVE_USB_H)
-			LIBUSB="-lusb")])
-fi
-
-dnl See if we have libwrap for TCP wrappers support...
-AC_ARG_ENABLE(tcp_wrappers, [  --enable-tcp-wrappers   use libwrap for TCP wrappers support, default=no])
-
-LIBWRAP=""
-AC_SUBST(LIBWRAP)
-
-if test x$enable_tcp_wrappers = xyes; then
-	AC_CHECK_LIB(wrap, hosts_access,[
-		AC_CHECK_HEADER(tcpd.h,
-			AC_DEFINE(HAVE_TCPD_H)
-			LIBWRAP="-lwrap")])
-fi
-
 dnl Flags for "ar" command...
 case $uname in
        Darwin* | *BSD*)
@@ -225,134 +187,83 @@ esac

 AC_SUBST(ARFLAGS)

-dnl Prep libraries specifically for cupsd and backends...
+dnl Extra platform-specific libraries...
 BACKLIBS=""
 CUPSDLIBS=""
-AC_SUBST(BACKLIBS)
-AC_SUBST(CUPSDLIBS)
-
-dnl See if we have POSIX ACL support...
-SAVELIBS="$LIBS"
-LIBS=""
-AC_ARG_ENABLE(acl, [  --enable-acl            enable POSIX ACL support, default=auto])
-if test "x$enable_acl" != xno; then
-	AC_SEARCH_LIBS(acl_init, acl, AC_DEFINE(HAVE_ACL_INIT))
-	CUPSDLIBS="$CUPSDLIBS $LIBS"
-fi
-LIBS="$SAVELIBS"
-
-dnl Check for DBUS support
-if test -d /etc/dbus-1; then
-	DBUSDIR="/etc/dbus-1"
-else
-	DBUSDIR=""
-fi
+DBUSDIR=""

 AC_ARG_ENABLE(dbus, [  --enable-dbus           enable DBUS support, default=auto])
-AC_ARG_WITH(dbusdir, [  --with-dbusdir          set DBUS configuration directory ],
-	DBUSDIR="$withval")
-
-DBUS_NOTIFIER=""
-DBUS_NOTIFIERLIBS=""
-
-if test "x$enable_dbus" != xno; then
-	AC_PATH_PROG(PKGCONFIG, pkg-config)
-	if test "x$PKGCONFIG" != x; then
-		AC_MSG_CHECKING(for DBUS)
-		if $PKGCONFIG --exists dbus-1; then
-			AC_MSG_RESULT(yes)
-			AC_DEFINE(HAVE_DBUS)
-			CFLAGS="$CFLAGS `$PKGCONFIG --cflags dbus-1` -DDBUS_API_SUBJECT_TO_CHANGE"
-			CUPSDLIBS="$CUPSDLIBS `$PKGCONFIG --libs dbus-1`"
-			AC_CHECK_LIB(dbus-1,
-				dbus_message_iter_init_append,
-				AC_DEFINE(HAVE_DBUS_MESSAGE_ITER_INIT_APPEND),,
-				`$PKGCONFIG --libs dbus-1`)
-			if $PKGCONFIG --exists glib-2.0 && $PKGCONFIG --exists dbus-glib-1; then
-				DBUS_NOTIFIER="dbus"
-				DBUS_NOTIFIERLIBS="`$PKGCONFIG --libs glib-2.0` `$PKGCONFIG --libs dbus-glib-1` `$PKGCONFIG --libs dbus-1`"
-				CFLAGS="$CFLAGS `$PKGCONFIG --cflags glib-2.0`"
-			fi
-		else
-			AC_MSG_RESULT(no)
-		fi
-	fi
-fi
-
-AC_SUBST(DBUSDIR)
-AC_SUBST(DBUS_NOTIFIER)
-AC_SUBST(DBUS_NOTIFIERLIBS)
-
-dnl Extra platform-specific libraries...
-CUPS_DEFAULT_PRINTADMIN_AUTH="@SYSTEM"
-CUPS_SYSTEM_AUTHKEY=""
-FONTS="fonts"
-LEGACY_BACKENDS="parallel scsi"

 case $uname in
        Darwin*)
-#		FONTS=""
-		LEGACY_BACKENDS=""
-                BACKLIBS="$BACKLIBS -framework IOKit"
-                CUPSDLIBS="$CUPSDLIBS -sectorder __TEXT __text cupsd.order -e start -framework IOKit -framework SystemConfiguration -weak_framework ApplicationServices"
-                LIBS="-framework SystemConfiguration -framework CoreFoundation $LIBS"
+                BACKLIBS="-framework IOKit"
+                CUPSDLIBS="-framework IOKit -framework SystemConfiguration"
+                LIBS="-framework CoreFoundation $LIBS"
+
+		dnl Check for CFLocaleCreateCanonicalLocaleIdentifierFromString...
+		AC_MSG_CHECKING(for CFLocaleCreateCanonicalLocaleIdentifierFromString)
+		if test "$uname" = "Darwin" -a $uversion -ge 70; then
+			AC_DEFINE(HAVE_CF_LOCALE_ID)
+			AC_MSG_RESULT(yes)
+		else
+			AC_MSG_RESULT(no)
+		fi

 		dnl Check for framework headers...
 		AC_CHECK_HEADER(CoreFoundation/CoreFoundation.h,AC_DEFINE(HAVE_COREFOUNDATION_H))
 		AC_CHECK_HEADER(CoreFoundation/CFPriv.h,AC_DEFINE(HAVE_CFPRIV_H))
 		AC_CHECK_HEADER(CoreFoundation/CFBundlePriv.h,AC_DEFINE(HAVE_CFBUNDLEPRIV_H))

-		dnl Check for the new membership functions in MacOSX 10.4...
+		dnl Check for the new membership functions in MacOSX 10.4 (Tiger)...
 		AC_CHECK_HEADER(membership.h,AC_DEFINE(HAVE_MEMBERSHIP_H))
-		AC_CHECK_HEADER(membershipPriv.h,AC_DEFINE(HAVE_MEMBERSHIPPRIV_H))
 		AC_CHECK_FUNCS(mbr_uid_to_uuid)

-		dnl Need <dlfcn.h> header...
-		AC_CHECK_HEADER(dlfcn.h,AC_DEFINE(HAVE_DLFCN_H))
-
 		dnl Check for notify_post support
 		AC_CHECK_HEADER(notify.h,AC_DEFINE(HAVE_NOTIFY_H))
 		AC_CHECK_FUNCS(notify_post)
-
-		dnl Check for Authorization Services support
-		AC_ARG_WITH(adminkey, [  --with-adminkey         set the default SystemAuthKey value],
-			default_adminkey="$withval",
-			default_adminkey="default")
- 		AC_ARG_WITH(operkey, [  --with-operkey          set the default operator @AUTHKEY value],
-			default_operkey="$withval",
-			default_operkey="default")
- 
-		AC_CHECK_HEADER(Security/Authorization.h, [
-			AC_DEFINE(HAVE_AUTHORIZATION_H)
-
-			if test "x$default_adminkey" != xdefault; then
-				CUPS_SYSTEM_AUTHKEY="SystemGroupAuthKey $default_adminkey"
-			elif grep -q system.print.operator /etc/authorization; then
-				CUPS_SYSTEM_AUTHKEY="SystemGroupAuthKey system.print.admin"
-			else
-				CUPS_SYSTEM_AUTHKEY="SystemGroupAuthKey system.preferences"
-			fi
-
-			if test "x$default_operkey" != xdefault; then
-				CUPS_DEFAULT_PRINTADMIN_AUTH="@AUTHKEY($default_operkey) @admin @lpadmin"
-			elif grep -q system.print.operator /etc/authorization; then
-				CUPS_DEFAULT_PRINTADMIN_AUTH="@AUTHKEY(system.print.operator) @admin @lpadmin"
-			else
-				CUPS_DEFAULT_PRINTADMIN_AUTH="@AUTHKEY(system.print.admin) @admin @lpadmin"
-			fi])
-		AC_CHECK_HEADER(Security/SecBasePriv.h,AC_DEFINE(HAVE_SECBASEPRIV_H))
-
-		dnl Check for sandbox/Seatbelt support
-		AC_CHECK_HEADER(sandbox.h,AC_DEFINE(HAVE_SANDBOX_H))
                ;;
+
+	Linux*)
+		dnl Check for DBUS support
+		if test "x$enable_dbus" != xno; then
+			AC_PATH_PROG(PKGCONFIG, pkg-config)
+			if test "x$PKGCONFIG" != x; then
+				AC_MSG_CHECKING(for DBUS)
+				if $PKGCONFIG --exists dbus-1; then
+					AC_MSG_RESULT(yes)
+					AC_CHECK_LIB(dbus-1,
+					    dbus_message_iter_init_append,
+					    AC_DEFINE(HAVE_DBUS)
+					    CFLAGS="$CFLAGS `$PKGCONFIG --cflags dbus-1` -DDBUS_API_SUBJECT_TO_CHANGE"
+					    CUPSDLIBS="`$PKGCONFIG --libs dbus-1`"
+					    DBUSDIR="/etc/dbus-1/system.d")
+				else
+					AC_MSG_RESULT(no)
+				fi
+			fi
+		fi
+		;;
 esac

-AC_SUBST(CUPS_DEFAULT_PRINTADMIN_AUTH)
-AC_DEFINE_UNQUOTED(CUPS_DEFAULT_PRINTADMIN_AUTH, "$CUPS_DEFAULT_PRINTADMIN_AUTH")
-AC_SUBST(CUPS_SYSTEM_AUTHKEY)
-AC_SUBST(FONTS)
-AC_SUBST(LEGACY_BACKENDS)
+dnl See if we have POSIX ACL support...
+SAVELIBS="$LIBS"
+LIBS=""
+AC_SEARCH_LIBS(acl_init, acl, AC_DEFINE(HAVE_ACL_INIT))
+CUPSDLIBS="$CUPSDLIBS $LIBS"
+LIBS="$SAVELIBS"
+
+AC_SUBST(BACKLIBS)
+AC_SUBST(CUPSDLIBS)
+AC_SUBST(DBUSDIR)
+
+dnl New default port definition for IPP...
+AC_ARG_WITH(ipp-port, [  --with-ipp-port         set default port number for IPP ],
+	DEFAULT_IPP_PORT="$withval",
+	DEFAULT_IPP_PORT="631")
+
+AC_SUBST(DEFAULT_IPP_PORT)
+AC_DEFINE_UNQUOTED(CUPS_DEFAULT_IPP_PORT,$DEFAULT_IPP_PORT)

 dnl
-dnl End of "$Id: cups-common.m4 8094 2008-10-31 20:51:39Z mike $".
+dnl End of "$Id: cups-common.m4 5930 2006-09-07 19:49:34Z mike $".
 dnl
@@ -1,55 +1,41 @@
 dnl
-dnl "$Id: cups-compiler.m4 8139 2008-11-17 23:46:55Z mike $"
+dnl "$Id: cups-compiler.m4 5705 2006-06-30 01:07:29Z mike $"
 dnl
 dnl   Compiler stuff for the Common UNIX Printing System (CUPS).
 dnl
-dnl   Copyright 2007-2008 by Apple Inc.
-dnl   Copyright 1997-2007 by Easy Software Products, all rights reserved.
+dnl   Copyright 1997-2006 by Easy Software Products, all rights reserved.
 dnl
 dnl   These coded instructions, statements, and computer programs are the
-dnl   property of Apple Inc. and are protected by Federal copyright
-dnl   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
-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   property of Easy Software Products and are protected by Federal
+dnl   copyright law.  Distribution and use rights are outlined in the file
+dnl   "LICENSE.txt" which should have been included with this file.  If this
+dnl   file is missing or damaged please contact Easy Software Products
+dnl   at:
+dnl
+dnl       Attn: CUPS Licensing Information
+dnl       Easy Software Products
+dnl       44141 Airport View Drive, Suite 204
+dnl       Hollywood, Maryland 20636 USA
+dnl
+dnl       Voice: (301) 373-9600
+dnl       EMail: cups-info@cups.org
+dnl         WWW: http://www.cups.org
 dnl

 dnl Clear the debugging and non-shared library options unless the user asks
 dnl for them...
-INSTALL_STRIP=""
 OPTIM=""
-AC_SUBST(INSTALL_STRIP)
 AC_SUBST(OPTIM)

 AC_ARG_WITH(optim, [  --with-optim="flags"    set optimization flags ])
-AC_ARG_ENABLE(debug, [  --enable-debug          turn on debugging, default=no])
-AC_ARG_ENABLE(debug_printfs, [  --enable-debug-printfs  turn on debug printfs, default=no])
-AC_ARG_ENABLE(unit_tests, [  --enable-unit-tests     turn on unit tests, default=no])
-
-dnl For debugging, keep symbols, otherwise strip them...
-if test x$enable_debug = xyes; then
-	OPTIM="-g"
-else
-	INSTALL_STRIP="-s"
-fi
-
-dnl Debug printfs can slow things down, so provide a separate option for that
-if test x$enable_debug_printfs = xyes; then
-	CFLAGS="$CFLAGS -DDEBUG"
-fi
-
-dnl Unit tests take up time during a compile...
-if test x$enable_unit_tests = xyes; then
-	UNITTESTS="unittests"
-else
-	UNITTESTS=""
-fi
-AC_SUBST(UNITTESTS)
+AC_ARG_ENABLE(debug, [  --enable-debug          turn on debugging, default=no],
+	[if test x$enable_debug = xyes; then
+		OPTIM="-g"
+	fi])

 dnl Setup general architecture flags...
 AC_ARG_WITH(archflags, [  --with-archflags="flags"
                          set default architecture flags ])
-AC_ARG_WITH(ldarchflags, [  --with-ldarchflags="flags"
-                          set default program architecture flags ])

 if test -z "$with_archflags"; then
 	ARCHFLAGS=""
@@ -57,64 +43,56 @@ else
 	ARCHFLAGS="$with_archflags"
 fi

-if test -z "$with_ldarchflags"; then
-	if test "$uname" = Darwin; then
-		# Only create 32-bit programs by default
-		LDARCHFLAGS="`echo $ARCHFLAGS | sed -e '1,$s/-arch x86_64//' -e '1,$s/-arch ppc64//'`"
-	else
-		LDARCHFLAGS="$ARCHFLAGS"
-	fi
-else
-	LDARCHFLAGS="$with_ldarchflags"
-fi
-
 AC_SUBST(ARCHFLAGS)
-AC_SUBST(LDARCHFLAGS)

 dnl Setup support for separate 32/64-bit library generation...
+AC_ARG_ENABLE(32bit, [  --enable-32bit          generate 32-bit libraries on 32/64-bit systems, default=no])
 AC_ARG_WITH(arch32flags, [  --with-arch32flags="flags"
                          specifies 32-bit architecture flags])
-ARCH32FLAGS=""
-AC_SUBST(ARCH32FLAGS)

+ARCH32FLAGS=""
+INSTALL32=""
+LIB32CUPS=""
+LIB32CUPSIMAGE=""
+LIB32DIR=""
+UNINSTALL32=""
+
+AC_SUBST(ARCH32FLAGS)
+AC_SUBST(INSTALL32)
+AC_SUBST(LIB32CUPS)
+AC_SUBST(LIB32CUPSIMAGE)
+AC_SUBST(LIB32DIR)
+AC_SUBST(UNINSTALL32)
+
+AC_ARG_ENABLE(64bit, [  --enable-64bit          generate 64-bit libraries on 32/64-bit systems, default=no])
 AC_ARG_WITH(arch64flags, [  --with-arch64flags="flags"
                          specifies 64-bit architecture flags])
-ARCH64FLAGS=""
-AC_SUBST(ARCH64FLAGS)

-dnl Read-only data/program support on Linux...
-AC_ARG_ENABLE(relro, [  --enable-relro          use GCC relro option, default=no])
+ARCH64FLAGS=""
+INSTALL64=""
+LIB64CUPS=""
+LIB64CUPSIMAGE=""
+LIB64DIR=""
+UNINSTALL64=""
+
+AC_SUBST(ARCH64FLAGS)
+AC_SUBST(INSTALL64)
+AC_SUBST(LIB64CUPS)
+AC_SUBST(LIB64CUPSIMAGE)
+AC_SUBST(LIB64DIR)
+AC_SUBST(UNINSTALL64)
+
+dnl Position-Independent Executable support on Linux and *BSD...
+AC_ARG_ENABLE(pie, [  --enable-pie            use GCC -fPIE option, default=no])

 dnl Update compiler options...
-CXXLIBS="${CXXLIBS:=}"
+CXXLIBS=""
 AC_SUBST(CXXLIBS)

 PIEFLAGS=""
 AC_SUBST(PIEFLAGS)

-RELROFLAGS=""
-AC_SUBST(RELROFLAGS)
-
-LIBCUPSORDER="libcups.order"
-AC_ARG_WITH(libcupsorder, [  --with-libcupsorder     libcups secorder file, default=libcups.order],
-	if test -f "$withval"; then
-		LIBCUPSORDER="$withval"
-	fi)
-AC_SUBST(LIBCUPSORDER)
-
-LIBCUPSIMAGEORDER="libcupsimage.order"
-AC_ARG_WITH(libcupsimageorder, [  --with-libcupsimagesorder
-                          libcupsimage secorder file, default=libcupsimage.order],
-	if test -f "$withval"; then
-		LIBCUPSIMAGEORDER="$withval"
-	fi)
-AC_SUBST(LIBCUPSIMAGEORDER)
-
-PHPOPTIONS=""
-AC_SUBST(PHPOPTIONS)
-
 if test -n "$GCC"; then
-	# Add GCC-specific compiler options...
 	if test -z "$OPTIM"; then
 		if test "x$with_optim" = x; then
 			# Default to optimize-for-size and debug
@@ -124,97 +102,32 @@ if test -n "$GCC"; then
 		fi
 	fi

-	# Generate position-independent code as needed...
 	if test $PICFLAG = 1 -a $uname != AIX; then
    		OPTIM="-fPIC $OPTIM"
 	fi

-	# The -fstack-protector option is available with some versions of
-	# GCC and adds "stack canaries" which detect when the return address
-	# has been overwritten, preventing many types of exploit attacks.
-	AC_MSG_CHECKING(if GCC supports -fstack-protector)
-	OLDCFLAGS="$CFLAGS"
-	CFLAGS="$CFLAGS -fstack-protector"
-	AC_TRY_COMPILE(,,
-		OPTIM="$OPTIM -fstack-protector"
-		AC_MSG_RESULT(yes),
-		AC_MSG_RESULT(no))
-	CFLAGS="$OLDCFLAGS"
+	case $uname in
+		Linux*)
+			if test x$enable_pie = xyes; then
+				PIEFLAGS="-pie -fPIE"
+			fi
+			;;

-	# The -pie option is available with some versions of GCC and adds
-	# randomization of addresses, which avoids another class of exploits
-	# that depend on a fixed address for common functions.
-	AC_MSG_CHECKING(if GCC supports -pie)
-	OLDCFLAGS="$CFLAGS"
-	CFLAGS="$CFLAGS -pie -fPIE"
-	AC_TRY_COMPILE(,,
-		PIEFLAGS="-pie -fPIE"
-		AC_MSG_RESULT(yes),
-		AC_MSG_RESULT(no))
-	CFLAGS="$OLDCFLAGS"
+		*)
+			if test x$enable_pie = xyes; then
+				echo "Sorry, --enable-pie is not supported on this OS!"
+			fi
+			;;
+	esac

 	if test "x$with_optim" = x; then
 		# Add useful warning options for tracking down problems...
 		OPTIM="-Wall -Wno-format-y2k $OPTIM"
-		# Additional warning options for development testing...
-		if test -d .svn; then
-			OPTIM="-Wshadow -Wunused $OPTIM"
-			CFLAGS="-Werror-implicit-function-declaration $CFLAGS"
-			PHPOPTIONS="-Wno-shadow"
-		fi
+		# Additional warning options for alpha testing...
+		OPTIM="-Wshadow -Wunused $OPTIM"
 	fi

 	case "$uname" in
-		Darwin*)
-			# -D_FORTIFY_SOURCE=2 adds additional object size
-			# checking, basically wrapping all string functions
-			# with buffer-limited ones.  Not strictly needed for
-			# CUPS since we already use buffer-limited calls, but
-			# this will catch any additions that are broken.		
-			CFLAGS="$CFLAGS -D_FORTIFY_SOURCE=2"
-
-			if test x$enable_pie = xyes; then
-				# GCC 4 on Mac OS X needs -Wl,-pie as well
-				LDFLAGS="$LDFLAGS -Wl,-pie"
-			fi
-			;;
-
-		HP-UX*)
-			if test "x$enable_32bit" = xyes; then
-				# Build 32-bit libraries, 64-bit base...
-				if test -z "$with_arch32flags"; then
-					ARCH32FLAGS="-milp32"
-				else
-					ARCH32FLAGS="$with_arch32flags"
-				fi
-
-				if test -z "$with_archflags"; then
-					if test -z "$with_arch64flags"; then
-						ARCHFLAGS="-mlp64"
-					else
-						ARCHFLAGS="$with_arch64flags"
-					fi
-				fi
-			fi
-
-			if test "x$enable_64bit" = xyes; then
-				# Build 64-bit libraries, 32-bit base...
-				if test -z "$with_arch64flags"; then
-					ARCH64FLAGS="-mlp64"
-				else
-					ARCH64FLAGS="$with_arch64flags"
-				fi
-
-				if test -z "$with_archflags"; then
-					if test -z "$with_arch32flags"; then
-						ARCHFLAGS="-milp32"
-					else
-						ARCHFLAGS="$with_arch32flags"
-					fi
-				fi
-			fi
-			;;
-
 		IRIX)
 			if test "x$enable_32bit" = xyes; then
 				# Build 32-bit libraries, 64-bit base...
@@ -223,6 +136,11 @@ if test -n "$GCC"; then
 				else
 					ARCH32FLAGS="$with_arch32flags"
 				fi
+				INSTALL32="install32bit"
+				LIB32CUPS="32bit/libcups.so.2"
+				LIB32CUPSIMAGE="32bit/libcupsimage.so.2"
+				LIB32DIR="$prefix/lib32"
+				UNINSTALL32="uninstall32bit"

 				if test -z "$with_archflags"; then
 					if test -z "$with_arch64flags"; then
@@ -240,6 +158,11 @@ if test -n "$GCC"; then
 				else
 					ARCH64FLAGS="$with_arch64flags"
 				fi
+				INSTALL64="install64bit"
+				LIB64CUPS="64bit/libcups.so.2"
+				LIB64CUPSIMAGE="64bit/libcupsimage.so.2"
+				LIB64DIR="$prefix/lib64"
+				UNINSTALL64="uninstall64bit"

 				if test -z "$with_archflags"; then
 					if test -z "$with_arch32flags"; then
@@ -252,12 +175,6 @@ if test -n "$GCC"; then
 			;;

 		Linux*)
-			# The -z relro option is provided by the Linux linker command to
-			# make relocatable data read-only.
-			if test x$enable_relro = xyes; then
-				RELROFLAGS="-Wl,-z,relro"
-			fi
-
 			if test "x$enable_32bit" = xyes; then
 				# Build 32-bit libraries, 64-bit base...
 				if test -z "$with_arch32flags"; then
@@ -265,6 +182,14 @@ if test -n "$GCC"; then
 				else
 					ARCH32FLAGS="$with_arch32flags"
 				fi
+				INSTALL32="install32bit"
+				LIB32CUPS="32bit/libcups.so.2"
+				LIB32CUPSIMAGE="32bit/libcupsimage.so.2"
+				LIB32DIR="$exec_prefix/lib"
+				if test -d /usr/lib32; then
+					LIB32DIR="${LIB32DIR}32"
+				fi
+				UNINSTALL32="uninstall32bit"

 				if test -z "$with_archflags"; then
 					if test -z "$with_arch64flags"; then
@@ -282,6 +207,14 @@ if test -n "$GCC"; then
 				else
 					ARCH64FLAGS="$with_arch64flags"
 				fi
+				INSTALL64="install64bit"
+				LIB64CUPS="64bit/libcups.so.2"
+				LIB64CUPSIMAGE="64bit/libcupsimage.so.2"
+				LIB64DIR="$exec_prefix/lib"
+				if test -d /usr/lib64; then
+					LIB64DIR="${LIB64DIR}64"
+				fi
+				UNINSTALL64="uninstall64bit"

 				if test -z "$with_archflags"; then
 					if test -z "$with_arch32flags"; then
@@ -301,6 +234,11 @@ if test -n "$GCC"; then
 				else
 					ARCH32FLAGS="$with_arch32flags"
 				fi
+				INSTALL32="install32bit"
+				LIB32CUPS="32bit/libcups.so.2"
+				LIB32CUPSIMAGE="32bit/libcupsimage.so.2"
+				LIB32DIR="$exec_prefix/lib/32"
+				UNINSTALL32="uninstall32bit"

 				if test -z "$with_archflags"; then
 					if test -z "$with_arch64flags"; then
@@ -318,6 +256,11 @@ if test -n "$GCC"; then
 				else
 					ARCH64FLAGS="$with_arch64flags"
 				fi
+				INSTALL64="install64bit"
+				LIB64CUPS="64bit/libcups.so.2"
+				LIB64CUPSIMAGE="64bit/libcupsimage.so.2"
+				LIB64DIR="$exec_prefix/lib/64"
+				UNINSTALL64="uninstall64bit"

 				if test -z "$with_archflags"; then
 					if test -z "$with_arch32flags"; then
@@ -330,7 +273,6 @@ if test -n "$GCC"; then
 			;;
 	esac
 else
-	# Add vendor-specific compiler options...
 	case $uname in
 		AIX*)
 			if test -z "$OPTIM"; then
@@ -351,44 +293,13 @@ else
 			fi

 			CFLAGS="-Ae $CFLAGS"
+			# Warning 336 is "empty translation unit"
+			# Warning 829 is passing constant string as char *
+			CXXFLAGS="+W336,829 $CXXFLAGS"

 			if test $PICFLAG = 1; then
 				OPTIM="+z $OPTIM"
 			fi
-
-			if test "x$enable_32bit" = xyes; then
-				# Build 32-bit libraries, 64-bit base...
-				if test -z "$with_arch32flags"; then
-					ARCH32FLAGS="+DD32"
-				else
-					ARCH32FLAGS="$with_arch32flags"
-				fi
-
-				if test -z "$with_archflags"; then
-					if test -z "$with_arch64flags"; then
-						ARCHFLAGS="+DD64"
-					else
-						ARCHFLAGS="$with_arch64flags"
-					fi
-				fi
-			fi
-
-			if test "x$enable_64bit" = xyes; then
-				# Build 64-bit libraries, 32-bit base...
-				if test -z "$with_arch64flags"; then
-					ARCH64FLAGS="+DD64"
-				else
-					ARCH64FLAGS="$with_arch64flags"
-				fi
-
-				if test -z "$with_archflags"; then
-					if test -z "$with_arch32flags"; then
-						ARCHFLAGS="+DD32"
-					else
-						ARCHFLAGS="$with_arch32flags"
-					fi
-				fi
-			fi
 			;;
        	IRIX)
 			if test -z "$OPTIM"; then
@@ -410,6 +321,11 @@ else
 				else
 					ARCH32FLAGS="$with_arch32flags"
 				fi
+				INSTALL32="install32bit"
+				LIB32CUPS="32bit/libcups.so.2"
+				LIB32CUPSIMAGE="32bit/libcupsimage.so.2"
+				LIB32DIR="$prefix/lib32"
+				UNINSTALL32="uninstall32bit"

 				if test -z "$with_archflags"; then
 					if test -z "$with_arch64flags"; then
@@ -427,6 +343,11 @@ else
 				else
 					ARCH64FLAGS="$with_arch64flags"
 				fi
+				INSTALL64="install64bit"
+				LIB64CUPS="64bit/libcups.so.2"
+				LIB64CUPSIMAGE="64bit/libcupsimage.so.2"
+				LIB64DIR="$prefix/lib64"
+				UNINSTALL64="uninstall64bit"

 				if test -z "$with_archflags"; then
 					if test -z "$with_arch32flags"; then
@@ -437,16 +358,6 @@ else
 				fi
 			fi
 			;;
-		OSF*)
-			# Tru64 UNIX aka Digital UNIX aka OSF/1
-			if test -z "$OPTIM"; then
-				if test "x$with_optim" = x; then
-					OPTIM="-O"
-				else
-					OPTIM="$with_optim"
-				fi
-			fi
-			;;
 		SunOS*)
 			# Solaris
 			if test -z "$OPTIM"; then
@@ -465,6 +376,11 @@ else
 				# Compiling on a Solaris system, build 64-bit
 				# binaries with separate 32-bit libraries...
 				ARCH32FLAGS="-xarch=generic"
+				INSTALL32="install32bit"
+				LIB32CUPS="32bit/libcups.so.2"
+				LIB32CUPSIMAGE="32bit/libcupsimage.so.2"
+				LIB32DIR="$exec_prefix/lib/32"
+				UNINSTALL32="uninstall32bit"

 				if test "x$with_optim" = x; then
 					# Suppress all of Sun's questionable
@@ -484,6 +400,11 @@ else
 				if test "x$enable_64bit" = xyes; then
 					# Build 64-bit libraries...
 					ARCH64FLAGS="-xarch=generic64"
+					INSTALL64="install64bit"
+					LIB64CUPS="64bit/libcups.so.2"
+					LIB64CUPSIMAGE="64bit/libcupsimage.so.2"
+					LIB64DIR="$exec_prefix/lib/64"
+					UNINSTALL64="uninstall64bit"
 				fi

 				if test "x$with_optim" = x; then
@@ -522,41 +443,22 @@ else
 			# cups-support@cups.org...
 			echo "Building CUPS with default compiler optimizations; contact"
 			echo "cups-bugs@cups.org with uname and compiler options needed"
-			echo "for your platform, or set the CFLAGS and LDFLAGS environment"
-			echo "variables before running configure."
+			echo "for your platform, or set the CFLAGS and CXXFLAGS"
+			echo "environment variable before running configure."
 			;;
 	esac
 fi

-# Add general compiler options per platform...
-case $uname in
-	HP-UX*)
-		# HP-UX 10.20 (at least) needs this definition to get the
-		# h_errno global...
-		OPTIM="$OPTIM -D_XOPEN_SOURCE_EXTENDED"
+if test $uname = HP-UX; then
+	# HP-UX 10.20 (at least) needs this definition to get the
+	# h_errno global...
+	OPTIM="$OPTIM -D_XOPEN_SOURCE_EXTENDED"

-		# HP-UX 11.00 (at least) needs this definition to get the
-		# u_short type used by the IP headers...
-		OPTIM="$OPTIM -D_INCLUDE_HPUX_SOURCE"
-
-		# HP-UX 11.23 (at least) needs this definition to get the
-		# IPv6 header to work...
-		OPTIM="$OPTIM -D_HPUX_SOURCE"
-		;;
-
-	Linux*)
-		# glibc 2.8 and higher breaks peer credentials unless you
-		# define _GNU_SOURCE...
-		OPTIM="$OPTIM -D_GNU_SOURCE"
-		;;
-
-	OSF*)
-		# Tru64 UNIX aka Digital UNIX aka OSF/1 need to be told
-		# to be POSIX-compliant...
-		OPTIM="$OPTIM -D_XOPEN_SOURCE=500 -D_XOPEN_SOURCE_EXTENDED -D_OSF_SOURCE"
-		;;
-esac
+	# HP-UX 11.00 (at least) needs this definition to get the
+	# u_short type used by the IP headers...
+	OPTIM="$OPTIM -D_INCLUDE_HPUX_SOURCE"
+fi

 dnl
-dnl End of "$Id: cups-compiler.m4 8139 2008-11-17 23:46:55Z mike $".
+dnl End of "$Id: cups-compiler.m4 5705 2006-06-30 01:07:29Z mike $".
 dnl
@@ -1,34 +1,44 @@
 dnl
-dnl "$Id: cups-defaults.m4 8106 2008-11-11 00:57:12Z mike $"
+dnl "$Id: cups-defaults.m4 5980 2006-09-21 19:01:55Z mike $"
 dnl
 dnl   Default cupsd configuration settings for the Common UNIX Printing System
 dnl   (CUPS).
 dnl
-dnl   Copyright 2007-2008 by Apple Inc.
-dnl   Copyright 2006-2007 by Easy Software Products, all rights reserved.
+dnl   Copyright 2006 by Easy Software Products, all rights reserved.
 dnl
 dnl   These coded instructions, statements, and computer programs are the
-dnl   property of Apple Inc. and are protected by Federal copyright
-dnl   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
-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   property of Easy Software Products and are protected by Federal
+dnl   copyright law.  Distribution and use rights are outlined in the file
+dnl   "LICENSE.txt" which should have been included with this file.  If this
+dnl   file is missing or damaged please contact Easy Software Products
+dnl   at:
+dnl
+dnl       Attn: CUPS Licensing Information
+dnl       Easy Software Products
+dnl       44141 Airport View Drive, Suite 204
+dnl       Hollywood, Maryland 20636 USA
+dnl
+dnl       Voice: (301) 373-9600
+dnl       EMail: cups-info@cups.org
+dnl         WWW: 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' ' '`"
-
-AC_ARG_WITH(languages, [  --with-languages        set installed languages, default=all ],[
-	case "$withval" in
-		none | no) LANGUAGES="" ;;
-		all) ;;
-		*) LANGUAGES="$withval" ;;
-	esac])
+dnl Default langugages...
+AC_ARG_WITH(languages, [  --with-languages        set installed languages, default="de es ja pl sv" ],
+	if test "x$withval" != xno; then
+		LANGUAGES="$withval"
+	fi,
+	LANGUAGES="de es ja pl sv")
 AC_SUBST(LANGUAGES)

 dnl Default ConfigFilePerm
 AC_ARG_WITH(config_file_perm, [  --with-config-file-perm set default ConfigFilePerm value, default=0640],
 	CUPS_CONFIG_FILE_PERM="$withval",
-	CUPS_CONFIG_FILE_PERM="640")
+	if test "x$uname" = xDarwin; then
+		CUPS_CONFIG_FILE_PERM="644"
+	else
+		CUPS_CONFIG_FILE_PERM="640"
+	fi)
 AC_SUBST(CUPS_CONFIG_FILE_PERM)
 AC_DEFINE_UNQUOTED(CUPS_DEFAULT_CONFIG_FILE_PERM, 0$CUPS_CONFIG_FILE_PERM)

@@ -39,28 +49,6 @@ AC_ARG_WITH(log_file_perm, [  --with-log-file-perm    set default LogFilePerm va
 AC_SUBST(CUPS_LOG_FILE_PERM)
 AC_DEFINE_UNQUOTED(CUPS_DEFAULT_LOG_FILE_PERM, 0$CUPS_LOG_FILE_PERM)

-dnl Default FatalErrors
-AC_ARG_WITH(fatal_errors, [  --with-fatal-errors     set default FatalErrors value, default=config],
-	CUPS_FATAL_ERRORS="$withval",
-	CUPS_FATAL_ERRORS="config")
-AC_SUBST(CUPS_FATAL_ERRORS)
-AC_DEFINE_UNQUOTED(CUPS_DEFAULT_FATAL_ERRORS, "$CUPS_FATAL_ERRORS")
-
-
-dnl Default LogLevel
-AC_ARG_WITH(log_level, [  --with-log-level        set default LogLevel value, default=warn],
-	CUPS_LOG_LEVEL="$withval",
-	CUPS_LOG_LEVEL="warn")
-AC_SUBST(CUPS_LOG_LEVEL)
-AC_DEFINE_UNQUOTED(CUPS_DEFAULT_LOG_LEVEL, "$CUPS_LOG_LEVEL")
-
-dnl Default AccessLogLevel
-AC_ARG_WITH(access_log_level, [  --with-access-log-level set default AccessLogLevel value, default=actions],
-	CUPS_ACCESS_LOG_LEVEL="$withval",
-	CUPS_ACCESS_LOG_LEVEL="actions")
-AC_SUBST(CUPS_ACCESS_LOG_LEVEL)
-AC_DEFINE_UNQUOTED(CUPS_DEFAULT_ACCESS_LOG_LEVEL, "$CUPS_ACCESS_LOG_LEVEL")
-
 dnl Default Browsing
 AC_ARG_ENABLE(browsing, [  --enable-browsing       enable Browsing by default, default=yes])
 if test "x$enable_browsing" = xno; then
@@ -74,46 +62,16 @@ AC_SUBST(CUPS_BROWSING)

 dnl Default BrowseLocalProtocols
 AC_ARG_WITH(local_protocols, [  --with-local-protocols  set default BrowseLocalProtocols, default="CUPS"],
-	default_local_protocols="$withval",
-	default_local_protocols="default")
-
-if test x$with_local_protocols != xno; then
-	if test "x$default_local_protocols" = "xdefault"; then
-		if test "x$DNSSDLIBS" != "x"; then
-		CUPS_BROWSE_LOCAL_PROTOCOLS="CUPS dnssd"
-	else
-		CUPS_BROWSE_LOCAL_PROTOCOLS="CUPS"
-		fi
-	else
-		CUPS_BROWSE_LOCAL_PROTOCOLS="$default_local_protocols"
-	fi
-else
-	CUPS_BROWSE_LOCAL_PROTOCOLS=""
-fi
-
+	CUPS_BROWSE_LOCAL_PROTOCOLS="$withval",
+	CUPS_BROWSE_LOCAL_PROTOCOLS="CUPS")
 AC_SUBST(CUPS_BROWSE_LOCAL_PROTOCOLS)
 AC_DEFINE_UNQUOTED(CUPS_DEFAULT_BROWSE_LOCAL_PROTOCOLS,
 	"$CUPS_BROWSE_LOCAL_PROTOCOLS")

 dnl Default BrowseRemoteProtocols
 AC_ARG_WITH(remote_protocols, [  --with-remote-protocols set default BrowseRemoteProtocols, default="CUPS"],
-	default_remote_protocols="$withval",
-	default_remote_protocols="default")
-
-if test x$with_remote_protocols != xno; then
-	if test "x$default_remote_protocols" = "xdefault"; then
-		if test "$uname" = "Darwin" -a $uversion -ge 90; then
-			CUPS_BROWSE_REMOTE_PROTOCOLS=""
-		else
-			CUPS_BROWSE_REMOTE_PROTOCOLS="CUPS"
-		fi
-	else
-		CUPS_BROWSE_REMOTE_PROTOCOLS="$default_remote_protocols"
-	fi
-else
-	CUPS_BROWSE_REMOTE_PROTOCOLS=""
-fi
-
+	CUPS_BROWSE_REMOTE_PROTOCOLS="$withval",
+	CUPS_BROWSE_REMOTE_PROTOCOLS="CUPS")
 AC_SUBST(CUPS_BROWSE_REMOTE_PROTOCOLS)
 AC_DEFINE_UNQUOTED(CUPS_DEFAULT_BROWSE_REMOTE_PROTOCOLS,
 	"$CUPS_BROWSE_REMOTE_PROTOCOLS")
@@ -154,11 +112,11 @@ fi
 AC_SUBST(CUPS_IMPLICIT_CLASSES)

 dnl Default UseNetworkDefault
-AC_ARG_ENABLE(use_network_default, [  --enable-use-network-default
+AC_ARG_ENABLE(network_default, [  --enable-use-network-default
                          enable UseNetworkDefault by default, default=auto])
-if test "x$enable_use_network_default" != xno; then
+if test "x$enable_network_default" != xno; then
 	AC_MSG_CHECKING(whether to use network default printers)
-	if test "x$enable_use_network_default" = xyes -o $uname != Darwin; then
+	if test "x$enable_network_default" = xyes -o $uname != Darwin; then
 		CUPS_USE_NETWORK_DEFAULT="Yes"
 		AC_DEFINE_UNQUOTED(CUPS_DEFAULT_USE_NETWORK_DEFAULT, 1)
 		AC_MSG_RESULT(yes)
@@ -177,14 +135,7 @@ dnl Determine the correct username and group for this OS...
 AC_ARG_WITH(cups_user, [  --with-cups-user        set default user for CUPS],
 	CUPS_USER="$withval",
 	AC_MSG_CHECKING(for default print user)
-	if test x$uname = xDarwin; then
-		if test x`id -u _lp 2>/dev/null` = x; then
-			CUPS_USER="lp";
-		else
-			CUPS_USER="_lp";
-		fi
-		AC_MSG_RESULT($CUPS_USER)
-	elif test -f /etc/passwd; then
+	if test -f /etc/passwd; then
 		CUPS_USER=""
 		for user in lp lpd guest daemon nobody; do
 			if test "`grep \^${user}: /etc/passwd`" != ""; then
@@ -206,15 +157,8 @@ AC_ARG_WITH(cups_user, [  --with-cups-user        set default user for CUPS],
 AC_ARG_WITH(cups_group, [  --with-cups-group       set default group for CUPS],
 	CUPS_GROUP="$withval",
 	AC_MSG_CHECKING(for default print group)
-	if test x$uname = xDarwin; then
-		if test x`id -g _lp 2>/dev/null` = x; then
-			CUPS_GROUP="lp";
-		else
-			CUPS_GROUP="_lp";
-		fi
-		AC_MSG_RESULT($CUPS_GROUP)
-	elif test -f /etc/group; then
-		GROUP_LIST="_lp lp nobody"
+	if test -f /etc/group; then
+		GROUP_LIST="lp nobody"
 		CUPS_GROUP=""
 		for group in $GROUP_LIST; do
 			if test "`grep \^${group}: /etc/group`" != ""; then
@@ -236,34 +180,34 @@ AC_ARG_WITH(cups_group, [  --with-cups-group       set default group for CUPS],
 AC_ARG_WITH(system_groups, [  --with-system-groups    set default system groups for CUPS],
 	CUPS_SYSTEM_GROUPS="$withval",
 	if test x$uname = xDarwin; then
-		CUPS_SYSTEM_GROUPS="admin"
+		GROUP_LIST="admin"
 	else
-		AC_MSG_CHECKING(for default system groups)
-		if test -f /etc/group; then
-			CUPS_SYSTEM_GROUPS=""
-			GROUP_LIST="lpadmin sys system root"
-			for group in $GROUP_LIST; do
-				if test "`grep \^${group}: /etc/group`" != ""; then
-					if test "x$CUPS_SYSTEM_GROUPS" = x; then
-						CUPS_SYSTEM_GROUPS="$group"
-					else
-						CUPS_SYSTEM_GROUPS="$CUPS_SYSTEM_GROUPS $group"
-					fi
+		GROUP_LIST="lpadmin sys system root"
+	fi
+
+	AC_MSG_CHECKING(for default system groups)
+	if test -f /etc/group; then
+		CUPS_SYSTEM_GROUPS=""
+		for group in $GROUP_LIST; do
+			if test "`grep \^${group}: /etc/group`" != ""; then
+				if test "x$CUPS_SYSTEM_GROUPS" = x; then
+					CUPS_SYSTEM_GROUPS="$group"
+				else
+					CUPS_SYSTEM_GROUPS="$CUPS_SYSTEM_GROUPS $group"
 				fi
-			done
-
-			if test "x$CUPS_SYSTEM_GROUPS" = x; then
-				CUPS_SYSTEM_GROUPS="$GROUP_LIST"
-				AC_MSG_RESULT(no groups found, using "$CUPS_SYSTEM_GROUPS")
-			else
-				AC_MSG_RESULT("$CUPS_SYSTEM_GROUPS")
 			fi
-		else
-			CUPS_SYSTEM_GROUPS="$GROUP_LIST"
-			AC_MSG_RESULT(no group file, using "$CUPS_SYSTEM_GROUPS")
-		fi
-	fi)
+		done

+		if test "x$CUPS_SYSTEM_GROUPS" = x; then
+			CUPS_SYSTEM_GROUPS="$GROUP_LIST"
+			AC_MSG_RESULT(no groups found, using "$CUPS_SYSTEM_GROUPS")
+		else
+			AC_MSG_RESULT("$CUPS_SYSTEM_GROUPS")
+		fi
+	else
+		CUPS_SYSTEM_GROUPS="$GROUP_LIST"
+		AC_MSG_RESULT(no group file, using "$CUPS_SYSTEM_GROUPS")
+	fi)

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

@@ -286,7 +230,7 @@ if test x$default_printcap != xno; then
 		case $uname in
 			Darwin*)
 				if test $uversion -ge 90; then
-					CUPS_DEFAULT_PRINTCAP="/Library/Preferences/org.cups.printers.plist"
+					CUPS_DEFAULT_PRINTCAP=""
 				else
 					CUPS_DEFAULT_PRINTCAP="/etc/printcap"
 				fi
@@ -305,141 +249,8 @@ else
 	CUPS_DEFAULT_PRINTCAP=""
 fi

-AC_SUBST(CUPS_DEFAULT_PRINTCAP)
 AC_DEFINE_UNQUOTED(CUPS_DEFAULT_PRINTCAP, "$CUPS_DEFAULT_PRINTCAP")

-dnl Default LPD config file...
-AC_ARG_WITH(lpdconfigfile, [  --with-lpdconfigfile    set default LPDConfigFile URI],
-	default_lpdconfigfile="$withval",
-	default_lpdconfigfile="default")
-
-if test x$default_lpdconfigfile != xno; then
-	if test "x$default_lpdconfigfile" = "xdefault"; then
-		case $uname in
-			Darwin*)
-				CUPS_DEFAULT_LPD_CONFIG_FILE="launchd:///System/Library/LaunchDaemons/org.cups.cups-lpd.plist"
-				;;
-			*)
-				if test -d /etc/xinetd.d; then
-					CUPS_DEFAULT_LPD_CONFIG_FILE="xinetd:///etc/xinetd.d/cups-lpd"
-				else
-					CUPS_DEFAULT_LPD_CONFIG_FILE=""
-				fi
-				;;
-		esac
-	else
-		CUPS_DEFAULT_LPD_CONFIG_FILE="$default_lpdconfigfile"
-	fi
-else
-	CUPS_DEFAULT_LPD_CONFIG_FILE=""
-fi
-
-AC_DEFINE_UNQUOTED(CUPS_DEFAULT_LPD_CONFIG_FILE, "$CUPS_DEFAULT_LPD_CONFIG_FILE")
-
-dnl Default SMB config file...
-AC_ARG_WITH(smbconfigfile, [  --with-smbconfigfile    set default SMBConfigFile URI],
-	default_smbconfigfile="$withval",
-	default_smbconfigfile="default")
-
-if test x$default_smbconfigfile != xno; then
-	if test "x$default_smbconfigfile" = "xdefault"; then
-		if test -f /etc/smb.conf; then
-			CUPS_DEFAULT_SMB_CONFIG_FILE="samba:///etc/smb.conf"
-		else
-			CUPS_DEFAULT_SMB_CONFIG_FILE=""
-		fi
-	else
-		CUPS_DEFAULT_SMB_CONFIG_FILE="$default_smbconfigfile"
-	fi
-else
-	CUPS_DEFAULT_SMB_CONFIG_FILE=""
-fi
-
-AC_DEFINE_UNQUOTED(CUPS_DEFAULT_SMB_CONFIG_FILE, "$CUPS_DEFAULT_SMB_CONFIG_FILE")
-
-dnl Default MaxCopies value...
-AC_ARG_WITH(max-copies, [  --with-max-copies       set default max copies value, default=auto ],
-	CUPS_MAX_COPIES="$withval",
-	if test "x$uname" = xDarwin; then
-		CUPS_MAX_COPIES="9999"
-	else
-		CUPS_MAX_COPIES="100"
-	fi)
-
-AC_SUBST(CUPS_MAX_COPIES)
-AC_DEFINE_UNQUOTED(CUPS_DEFAULT_MAX_COPIES, $CUPS_MAX_COPIES)
-
-dnl Default raw printing state
-AC_ARG_ENABLE(raw_printing, [  --enable-raw-printing   enable raw printing by default, default=auto])
-if test "x$enable_raw_printing" != xno; then
-	AC_MSG_CHECKING(whether to enable raw printing)
-	if test "x$enable_raw_printing" = xyes -o $uname = Darwin; then
-		DEFAULT_RAW_PRINTING=""
-		AC_MSG_RESULT(yes)
-	else
-		DEFAULT_RAW_PRINTING="#"
-		AC_MSG_RESULT(no)
-	fi
-else
-	DEFAULT_RAW_PRINTING="#"
-fi
-AC_SUBST(DEFAULT_RAW_PRINTING)
-
-dnl Default SNMP options...
-AC_ARG_WITH(snmp-address, [  --with-snmp-address     set SNMP query address, default=auto ],
-	if test "x$withval" = x; then
-		CUPS_SNMP_ADDRESS=""
-	else
-		CUPS_SNMP_ADDRESS="Address $withval"
-	fi,
-	if test "x$uname" = xDarwin; then
-		CUPS_SNMP_ADDRESS=""
-	else
-		CUPS_SNMP_ADDRESS="Address @LOCAL"
-	fi)
-
-AC_ARG_WITH(snmp-community, [  --with-snmp-community   set SNMP community, default=public ],
-	CUPS_SNMP_COMMUNITY="Community $withval",
-	CUPS_SNMP_COMMUNITY="Community public")
-
-AC_SUBST(CUPS_SNMP_ADDRESS)
-AC_SUBST(CUPS_SNMP_COMMUNITY)
-
-dnl New default port definition for IPP...
-AC_ARG_WITH(ipp-port, [  --with-ipp-port         set default port number for IPP ],
-	DEFAULT_IPP_PORT="$withval",
-	DEFAULT_IPP_PORT="631")
-
-AC_SUBST(DEFAULT_IPP_PORT)
-AC_DEFINE_UNQUOTED(CUPS_DEFAULT_IPP_PORT,$DEFAULT_IPP_PORT)
-
-dnl Filters
-AC_ARG_ENABLE(bannertops, [  --enable-bannertops     build with default banner filter, default=auto ])
-AC_ARG_ENABLE(texttops, [  --enable-texttops       build with default text filter, default=auto ])
-
-if test "x$enable_bannertops" = xno; then
-	BANNERTOPS=""
-elif test "x$enable_bannertops" = xyes; then
-	BANNERTOPS="bannertops"
-elif test $uname = Darwin; then
-	BANNERTOPS=""
-else
-	BANNERTOPS="bannertops"
-fi
-
-if test "x$enable_texttops" = xno; then
-	TEXTTOPS=""
-elif test "x$enable_texttops" = xyes; then
-	TEXTTOPS="texttops"
-elif test $uname = Darwin; then
-	TEXTTOPS=""
-else
-	TEXTTOPS="texttops"
-fi
-
-AC_SUBST(BANNERTOPS)
-AC_SUBST(TEXTTOPS)
-
 dnl
-dnl End of "$Id: cups-defaults.m4 8106 2008-11-11 00:57:12Z mike $".
+dnl End of "$Id: cups-defaults.m4 5980 2006-09-21 19:01:55Z mike $".
 dnl
@@ -1,16 +1,25 @@
 dnl
-dnl "$Id: cups-directories.m4 8076 2008-10-23 15:38:43Z mike $"
+dnl "$Id: cups-directories.m4 5905 2006-08-29 20:48:59Z mike $"
 dnl
 dnl   Directory stuff for the Common UNIX Printing System (CUPS).
 dnl
-dnl   Copyright 2007 by Apple Inc.
-dnl   Copyright 1997-2007 by Easy Software Products, all rights reserved.
+dnl   Copyright 1997-2006 by Easy Software Products, all rights reserved.
 dnl
 dnl   These coded instructions, statements, and computer programs are the
-dnl   property of Apple Inc. and are protected by Federal copyright
-dnl   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
-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   property of Easy Software Products and are protected by Federal
+dnl   copyright law.  Distribution and use rights are outlined in the file
+dnl   "LICENSE.txt" which should have been included with this file.  If this
+dnl   file is missing or damaged please contact Easy Software Products
+dnl   at:
+dnl
+dnl       Attn: CUPS Licensing Information
+dnl       Easy Software Products
+dnl       44141 Airport View Drive, Suite 204
+dnl       Hollywood, Maryland 20636 USA
+dnl
+dnl       Voice: (301) 373-9600
+dnl       EMail: cups-info@cups.org
+dnl         WWW: http://www.cups.org
 dnl

 AC_PREFIX_DEFAULT(/)
@@ -99,47 +108,39 @@ if test "$sysconfdir" = "\${prefix}/etc"; then
 	fi
 fi

-dnl Fix "libdir" variable...
+dnl Fix "libdir" variable for IRIX 6.x...
 if test "$libdir" = "\${exec_prefix}/lib"; then
-	case "$uname" in
-		IRIX*)
-			libdir="$exec_prefix/lib32"
-			;;
-		Linux*)
-			if test -d /usr/lib64; then
-				libdir="$exec_prefix/lib64"
-			fi
-			;;
-		HP-UX*)
-			if test -d /usr/lib/hpux32; then
-				libdir="$exec_prefix/lib/hpux32"
-			fi
-			;;
-	esac
+	if test "$uname" = "IRIX"; then
+		libdir="$exec_prefix/lib32"
+	else
+		if test "$uname" = Linux -a -d /usr/lib64; then
+			libdir="$exec_prefix/lib64"
+		else
+			libdir="$exec_prefix/lib"
+		fi
+	fi
 fi

 dnl Setup init.d locations...
 AC_ARG_WITH(rcdir, [  --with-rcdir            set path for rc scripts],rcdir="$withval",rcdir="")
-AC_ARG_WITH(rclevels, [  --with-rclevels         set run levels for rc scripts],rclevels="$withval",rclevels="2 3 5")
-AC_ARG_WITH(rcstart, [  --with-rcstart          set start number for rc scripts],rcstart="$withval",rcstart="99")
-AC_ARG_WITH(rcstop, [  --with-rcstop           set stop number for rc scripts],rcstop="$withval",rcstop="00")
-AC_ARG_WITH(smfmanifestdir, [  --with-smfmanifestdir   set path for Solaris SMF manifest],smfmanifestdir="$withval",smfmanifestdir="")
-
-INITDIR=""
-INITDDIR=""
-RCLEVELS="$rclevels"
-RCSTART="$rcstart"
-RCSTOP="$rcstop"
-SMFMANIFESTDIR=""

 if test x$rcdir = x; then
 	case "$uname" in
-		AIX*)
-			INITDIR="/etc/rc.d"
+		FreeBSD* | OpenBSD* | MirBsD* | ekkoBSD*)
+			# FreeBSD and OpenBSD
+			INITDIR=""
+			INITDDIR=""
+			;;
+
+		NetBSD*)
+			# NetBSD
+			INITDIR=""
+			INITDDIR="/etc/rc.d"
 			;;

 		Darwin*)
 			# Darwin and MacOS X...
+			INITDIR=""
 			if test -x /sbin/launchd; then
 				INITDDIR="/System/Library/LaunchDaemons"
 			else 
@@ -147,138 +148,63 @@ if test x$rcdir = x; then
 			fi
 			;;

-		FreeBSD* | OpenBSD* | MirBSD* | ekkoBSD*)
-			# FreeBSD and OpenBSD
-			;;
-
-		HP-UX*)
-			INITDIR="/sbin"
-			RCLEVELS="2"
-			RCSTART="380"
-			RCSTOP="620"
-			;;
-
-		IRIX*)
-			# IRIX
-			INITDIR="/etc"
-			RCSTART="60"
-			RCSTOP="25"
-			;;
-
-		Linux | GNU | GNU/k*BSD*)
+		Linux | GNU)
 			# Linux/HURD seems to choose an init.d directory at random...
 			if test -d /sbin/init.d; then
 				# SuSE
 				INITDIR="/sbin/init.d"
+				INITDDIR=".."
 			else
 				if test -d /etc/init.d; then
 					# Others
 					INITDIR="/etc"
+					INITDDIR="../init.d"
 				else
 					# RedHat
 					INITDIR="/etc/rc.d"
+					INITDDIR="../init.d"
 				fi
 			fi
-			RCSTART="81"
-			RCSTOP="36"
 			;;

-		NetBSD*)
-			# NetBSD
-			INITDDIR="/etc/rc.d"
-			;;
-
-		OSF1*)
+		OSF1* | HP-UX*)
 			INITDIR="/sbin"
+			INITDDIR="../init.d"
 			;;

-		SunOS*)
-			# Solaris
-			if test "x$smfmanifestdir" != x; then
-				SMFMANIFESTDIR=$smfmanifestdir
-			else
-				INITDIR="/etc"
-				RCSTART="81"
-			fi
+		AIX*)
+			INITDIR="/etc/rc.d"
+			INITDDIR=".."
 			;;

 		*)
 			INITDIR="/etc"
+			INITDDIR="../init.d"
 			;;

 	esac
-elif test "x$rcdir" != xno; then
-	if test "x$rclevels" = x; then
-		INITDDIR="$rcdir"
-	else
-		INITDIR="$rcdir"
-	fi
+else
+	INITDIR=""
+	INITDDIR="$rcdir"
 fi

 AC_SUBST(INITDIR)
 AC_SUBST(INITDDIR)
-AC_SUBST(RCLEVELS)
-AC_SUBST(RCSTART)
-AC_SUBST(RCSTOP)
-AC_SUBST(SMFMANIFESTDIR)

 dnl Xinetd support...
-AC_ARG_WITH(xinetd, [  --with-xinetd           set path for xinetd config files],XINETD="$withval",XINETD="")
+XINETD=""

-if test "x$XINETD" = x -a ! -x /sbin/launchd; then
+if test ! -x /sbin/launchd; then
 	for dir in /private/etc/xinetd.d /etc/xinetd.d /usr/local/etc/xinetd.d; do
 		if test -d $dir; then
 			XINETD="$dir"
 			break
 		fi
 	done
-elif test "x$XINETD" = xno; then
-	XINETD=""
 fi

 AC_SUBST(XINETD)

-dnl LPD sharing support...
-AC_ARG_WITH(lpdconfig, [  --with-lpdconfig        set URI for LPD config file],
-	LPDCONFIG="$withval", LPDCONFIG="")
-
-if test "x$LPDCONFIG" = x; then
-	if test -f /System/Library/LaunchDaemons/org.cups.cups-lpd.plist; then
-		LPDCONFIG="launchd:///System/Library/LaunchDaemons/org.cups.cups-lpd.plist"
-	elif test "x$XINETD" != x; then
-		LPDCONFIG="xinetd://$XINETD/cups-lpd"
-	fi
-fi
-
-if test "x$LPDCONFIG" = xoff; then
-	AC_DEFINE_UNQUOTED(CUPS_DEFAULT_LPD_CONFIG, "")
-else
-	AC_DEFINE_UNQUOTED(CUPS_DEFAULT_LPD_CONFIG, "$LPDCONFIG")
-fi
-
-dnl SMB sharing support...
-AC_ARG_WITH(smbconfig, [  --with-smbconfig        set URI for Samba config file],
-	SMBCONFIG="$withval", SMBCONFIG="")
-
-if test "x$SMBCONFIG" = x; then
-	if test -f /System/Library/LaunchDaemons/smbd.plist; then
-		SMBCONFIG="launchd:///System/Library/LaunchDaemons/smbd.plist"
-	else
-		for dir in /etc /etc/samba /usr/local/etc; do
-			if test -f $dir/smb.conf; then
-				SMBCONFIG="samba://$dir/smb.conf"
-				break
-			fi
-		done
-	fi
-fi
-
-if test "x$SMBCONFIG" = xoff; then
-	AC_DEFINE_UNQUOTED(CUPS_DEFAULT_SMB_CONFIG, "")
-else
-	AC_DEFINE_UNQUOTED(CUPS_DEFAULT_SMB_CONFIG, "$SMBCONFIG")
-fi
-
 dnl Setup default locations...
 # Cache data...
 AC_ARG_WITH(cachedir, [  --with-cachedir         set path for cache files],cachedir="$withval",cachedir="")
@@ -300,28 +226,6 @@ CUPS_DATADIR="$datadir/cups"
 AC_DEFINE_UNQUOTED(CUPS_DATADIR, "$datadir/cups")
 AC_SUBST(CUPS_DATADIR)

-# Icon directory
-AC_ARG_WITH(icondir, [  --with-icondir          set path for application icons],icondir="$withval",icondir="")
-
-if test "x$icondir" = x -a -d /usr/share/icons; then
-	ICONDIR="/usr/share/icons"
-else
-	ICONDIR="$icondir"
-fi
-
-AC_SUBST(ICONDIR)
-
-# Menu directory
-AC_ARG_WITH(menudir, [  --with-menudir          set path for application menus],menudir="$withval",menudir="")
-
-if test "x$menudir" = x -a -d /usr/share/applications; then
-	MENUDIR="/usr/share/applications"
-else
-	MENUDIR="$menudir"
-fi
-
-AC_SUBST(MENUDIR)
-
 # Documentation files
 AC_ARG_WITH(docdir, [  --with-docdir           set path for documentation],docdir="$withval",docdir="")

@@ -348,24 +252,20 @@ AC_SUBST(CUPS_FONTPATH)
 AC_DEFINE_UNQUOTED(CUPS_FONTPATH, "$CUPS_FONTPATH")

 # Locale data
-if test "$localedir" = "\${datarootdir}/locale"; then
-	case "$uname" in
-		Linux | GNU | *BSD* | Darwin*)
-			CUPS_LOCALEDIR="$datarootdir/locale"
-			;;
+case "$uname" in
+	Linux | GNU | *BSD* | Darwin*)
+		CUPS_LOCALEDIR="$datadir/locale"
+		;;

-		OSF1* | AIX*)
-			CUPS_LOCALEDIR="$exec_prefix/lib/nls/msg"
-			;;
+	OSF1* | AIX*)
+		CUPS_LOCALEDIR="$exec_prefix/lib/nls/msg"
+		;;

-		*)
-			# This is the standard System V location...
-			CUPS_LOCALEDIR="$exec_prefix/lib/locale"
-			;;
-	esac
-else
-	CUPS_LOCALEDIR="$localedir"
-fi
+	*)
+		# This is the standard System V location...
+		CUPS_LOCALEDIR="$exec_prefix/lib/locale"
+		;;
+esac

 AC_DEFINE_UNQUOTED(CUPS_LOCALEDIR, "$CUPS_LOCALEDIR")
 AC_SUBST(CUPS_LOCALEDIR)
@@ -416,5 +316,5 @@ AC_DEFINE_UNQUOTED(CUPS_STATEDIR, "$localstatedir/run/cups")
 AC_SUBST(CUPS_STATEDIR)

 dnl
-dnl End of "$Id: cups-directories.m4 8076 2008-10-23 15:38:43Z mike $".
+dnl End of "$Id: cups-directories.m4 5905 2006-08-29 20:48:59Z mike $".
 dnl
@@ -1,56 +0,0 @@
-dnl
-dnl "$Id: cups-dnssd.m4 7890 2008-08-29 22:19:39Z mike $"
-dnl
-dnl   DNS Service Discovery (aka Bonjour) stuff for the Common UNIX Printing System (CUPS).
-dnl
-dnl   http://www.dns-sd.org
-dnl   http://www.multicastdns.org/
-dnl   http://developer.apple.com/networking/bonjour/
-dnl
-dnl   Copyright 2007-2008 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
-dnl   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
-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, [  --enable-dnssd          turn on DNS Service Discovery support, default=yes])
-AC_ARG_WITH(dnssd-libs, [  --with-dnssd-libs       set directory for DNS Service Discovery library],
-	LDFLAGS="-L$withval $LDFLAGS"
-	DSOFLAGS="-L$withval $DSOFLAGS",)
-AC_ARG_WITH(dnssd-includes, [  --with-dnssd-includes   set directory for DNS Service Discovery includes],
-	CFLAGS="-I$withval $CFLAGS"
-	CPPFLAGS="-I$withval $CPPFLAGS",)
-
-DNSSDLIBS=""
-DNSSD_BACKEND=""
-
-if test x$enable_dnssd != xno; then
-	AC_CHECK_HEADER(dns_sd.h, [
-		case "$uname" in
-			Darwin*)
-				# Darwin and MacOS X...
-				DNSSDLIBS="-framework CoreFoundation -framework SystemConfiguration"
-				AC_DEFINE(HAVE_DNSSD)
-				AC_DEFINE(HAVE_COREFOUNDATION)
-				AC_DEFINE(HAVE_SYSTEMCONFIGURATION)
-				DNSSD_BACKEND="dnssd"
-				;;
-			*)
-				# All others...
-				AC_CHECK_LIB(dns_sd,TXTRecordGetValuePtr,
-					AC_DEFINE(HAVE_DNSSD)
-					DNSSDLIBS="-ldns_sd")
-				;;
-		esac
-	])
-fi
-
-AC_SUBST(DNSSDLIBS)
-AC_SUBST(DNSSD_BACKEND)
-
-dnl
-dnl End of "$Id: cups-dnssd.m4 7890 2008-08-29 22:19:39Z mike $".
-dnl
@@ -1,123 +0,0 @@
-dnl
-dnl   "$Id$"
-dnl
-dnl   GSSAPI/Kerberos library detection.
-dnl
-dnl   Copyright 2007 by Apple Inc.
-dnl   Copyright 2006-2007 by Easy Software Products.
-dnl
-dnl   This file contains Kerberos support code, copyright 2006 by
-dnl   Jelmer Vernooij.
-dnl
-dnl   These coded instructions, statements, and computer programs are the
-dnl   property of Apple Inc. and are protected by Federal copyright
-dnl   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
-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(gssapi, [  --enable-gssapi         turn on GSSAPI support, default=yes])
-
-LIBGSSAPI=""
-
-if test x$enable_gssapi != xno; then
-	AC_PATH_PROG(KRB5CONFIG, krb5-config)
-	if test "x$KRB5CONFIG" != x; then
-		case "$uname" in
-			Darwin)
-				# Mac OS X weak-links to the Kerberos framework...
-				LIBGSSAPI="-weak_framework Kerberos"
-				;;
-			SunOS*)
-				# Solaris has a non-standard krb5-config, don't use it!
-				AC_CHECK_LIB(gss, gss_display_status,
-					AC_DEFINE(HAVE_GSSAPI, 1, [Whether GSSAPI is available])
-					CFLAGS="`$KRB5CONFIG --cflags` $CFLAGS"		
-					CPPFLAGS="`$KRB5CONFIG --cflags` $CPPFLAGS"		
-					LIBGSSAPI="-lgss `$KRB5CONFIG --libs`")
-				;;
-			*)
-				# Other platforms just ask for GSSAPI
-				CFLAGS="`$KRB5CONFIG --cflags gssapi` $CFLAGS"		
-				CPPFLAGS="`$KRB5CONFIG --cflags gssapi` $CPPFLAGS"		
-				LIBGSSAPI="`$KRB5CONFIG --libs gssapi`"
-				;;
-		esac
-		AC_DEFINE(HAVE_GSSAPI, 1, [Whether GSSAPI is available])
-	else
-		# Check for vendor-specific implementations...
-		case "$uname" in
-			HP-UX*)
-				AC_CHECK_LIB(gss, gss_display_status,
-					AC_DEFINE(HAVE_GSSAPI, 1, [Whether GSSAPI is available])
-					LIBGSSAPI="-lgss -lgssapi_krb5")
-				;;
-			SunOS*)
-				AC_CHECK_LIB(gss, gss_display_status,
-					AC_DEFINE(HAVE_GSSAPI, 1, [Whether GSSAPI is available])
-					LIBGSSAPI="-lgss")
-				;;
-		esac
-	fi
-
-	if test "x$LIBGSSAPI" != x; then
-		AC_CHECK_HEADER(krb5.h, AC_DEFINE(HAVE_KRB5_H))
-		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_GSSAPI_GENERIC_H))
-		AC_CHECK_HEADER(gssapi/gssapi_krb5.h, AC_DEFINE(HAVE_GSSAPI_GSSAPI_KRB5_H))
-
-		SAVELIBS="$LIBS"
-		LIBS="$LIBS $LIBGSSAPI"
-
-		AC_CHECK_FUNC(gsskrb5_register_acceptor_identity, 
-			      AC_DEFINE(HAVE_GSSKRB5_REGISTER_ACCEPTOR_IDENTITY))
-		AC_CHECK_FUNC(krb5_cc_new_unique, AC_DEFINE(HAVE_KRB5_CC_NEW_UNIQUE))
-
-		AC_MSG_CHECKING(for GSS_C_NT_HOSTBASED_SERVICE)
-		if test $ac_cv_header_gssapi_gssapi_h = yes; then
-			AC_TRY_COMPILE([ #include <gssapi/gssapi.h> ],
-				       [ gss_OID foo = GSS_C_NT_HOSTBASED_SERVICE; ],
-				       AC_DEFINE(HAVE_GSS_C_NT_HOSTBASED_SERVICE)
-				       AC_MSG_RESULT(yes),
-				       AC_MSG_RESULT(no))
-		else
-			AC_TRY_COMPILE([ #include <gssapi.h> ],
-				       [ gss_OID foo = GSS_C_NT_HOSTBASED_SERVICE; ],
-				       AC_DEFINE(HAVE_GSS_C_NT_HOSTBASED_SERVICE)
-				       AC_MSG_RESULT(yes),
-				       AC_MSG_RESULT(no))
-		fi
-
-		LIBS="$SAVELIBS"
-
-		AC_MSG_CHECKING(for Heimdal Kerberos)
-		AC_TRY_COMPILE([ #include <krb5.h> ],
-			       [ char *tmp = heimdal_version; ],
-			       AC_DEFINE(HAVE_HEIMDAL)
-			       AC_MSG_RESULT(yes),
-			       AC_MSG_RESULT(no))
-	fi
-fi
-
-dnl Default GSS service name...
-AC_ARG_WITH(gssservicename, [  --with-gssservicename   set default gss service name],
-	default_gssservicename="$withval",
-	default_gssservicename="default")
-
-if test x$default_gssservicename != xno; then
-	if test "x$default_gssservicename" = "xdefault"; then
-		CUPS_DEFAULT_GSSSERVICENAME="ipp"
-	else
-		CUPS_DEFAULT_GSSSERVICENAME="$default_gssservicename"
-	fi
-else
-	CUPS_DEFAULT_GSSSERVICENAME=""
-fi
-
-AC_SUBST(LIBGSSAPI)
-AC_DEFINE_UNQUOTED(CUPS_DEFAULT_GSSSERVICENAME, "$CUPS_DEFAULT_GSSSERVICENAME")
-
-dnl
-dnl End of "$Id$".
-dnl
@@ -1,16 +1,25 @@
 dnl
-dnl "$Id: cups-image.m4 6649 2007-07-11 21:46:42Z mike $"
+dnl "$Id: cups-image.m4 5580 2006-05-23 19:30:23Z mike $"
 dnl
 dnl   Image library/filter stuff for the Common UNIX Printing System (CUPS).
 dnl
-dnl   Copyright 2007 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
-dnl   property of Apple Inc. and are protected by Federal copyright
-dnl   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
-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   property of Easy Software Products and are protected by Federal
+dnl   copyright law.  Distribution and use rights are outlined in the file
+dnl   "LICENSE.txt" which should have been included with this file.  If this
+dnl   file is missing or damaged please contact Easy Software Products
+dnl   at:
+dnl
+dnl       Attn: CUPS Licensing Information
+dnl       Easy Software Products
+dnl       44141 Airport View Drive, Suite 204
+dnl       Hollywood, Maryland 20636 USA
+dnl
+dnl       Voice: (301) 373-9600
+dnl       EMail: cups-info@cups.org
+dnl         WWW: http://www.cups.org
 dnl

 dnl See if we want the image filters included at all...
@@ -105,5 +114,5 @@ AC_SUBST(EXPORT_LIBZ)
 AC_CHECK_HEADER(stdlib.h,AC_DEFINE(HAVE_STDLIB_H))

 dnl
-dnl End of "$Id: cups-image.m4 6649 2007-07-11 21:46:42Z mike $".
+dnl End of "$Id: cups-image.m4 5580 2006-05-23 19:30:23Z mike $".
 dnl
@@ -1,16 +1,25 @@
 dnl
-dnl "$Id: cups-largefile.m4 6649 2007-07-11 21:46:42Z mike $"
+dnl "$Id: cups-largefile.m4 4732 2005-09-30 23:23:25Z mike $"
 dnl
 dnl   Large file support stuff for the Common UNIX Printing System (CUPS).
 dnl
-dnl   Copyright 2007 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
-dnl   property of Apple Inc. and are protected by Federal copyright
-dnl   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
-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   property of Easy Software Products and are protected by Federal
+dnl   copyright law.  Distribution and use rights are outlined in the file
+dnl   "LICENSE.txt" which should have been included with this file.  If this
+dnl   file is missing or damaged please contact Easy Software Products
+dnl   at:
+dnl
+dnl       Attn: CUPS Licensing Information
+dnl       Easy Software Products
+dnl       44141 Airport View Drive, Suite 204
+dnl       Hollywood, Maryland 20636 USA
+dnl
+dnl       Voice: (301) 373-9600
+dnl       EMail: cups-info@cups.org
+dnl         WWW: http://www.cups.org
 dnl

 dnl Check for largefile support...
@@ -21,11 +30,11 @@ LARGEFILE=""
 if test x$enable_largefile != xno; then
 	LARGEFILE="-D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE"

-	if test x$ac_cv_sys_large_files = x1; then
+	if test $ac_cv_sys_large_files = 1; then
 		LARGEFILE="$LARGEFILE -D_LARGE_FILES"
 	fi

-	if test x$ac_cv_sys_file_offset_bits = x64; then
+	if test $ac_cv_sys_file_offset_bits = 64; then
 		LARGEFILE="$LARGEFILE -D_FILE_OFFSET_BITS=64"
 	fi
 fi
@@ -48,5 +57,5 @@ fi
 AC_CHECK_FUNC(strtoll, AC_DEFINE(HAVE_STRTOLL))

 dnl
-dnl End of "$Id: cups-largefile.m4 6649 2007-07-11 21:46:42Z mike $".
+dnl End of "$Id: cups-largefile.m4 4732 2005-09-30 23:23:25Z mike $".
 dnl
@@ -1,16 +1,25 @@
 dnl
-dnl "$Id: cups-launchd.m4 6649 2007-07-11 21:46:42Z mike $"
+dnl "$Id: cups-launchd.m4 5466 2006-04-26 19:52:27Z mike $"
 dnl
 dnl   launchd stuff for the Common UNIX Printing System (CUPS).
 dnl
-dnl   Copyright 2007 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
-dnl   property of Apple Inc. and are protected by Federal copyright
-dnl   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
-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   property of Easy Software Products and are protected by Federal
+dnl   copyright law.  Distribution and use rights are outlined in the file
+dnl   "LICENSE.txt" which should have been included with this file.  If this
+dnl   file is missing or damaged please contact Easy Software Products
+dnl   at:
+dnl
+dnl       Attn: CUPS Licensing Information
+dnl       Easy Software Products
+dnl       44141 Airport View Drive, Suite 204
+dnl       Hollywood, Maryland 20636 USA
+dnl
+dnl       Voice: (301) 373-9600
+dnl       EMail: cups-info@cups.org
+dnl         WWW: http://www.cups.org
 dnl


@@ -40,5 +49,5 @@ AC_SUBST(DEFAULT_LAUNCHD_CONF)
 AC_SUBST(LAUNCHDLIBS)

 dnl
-dnl End of "$Id: cups-launchd.m4 6649 2007-07-11 21:46:42Z mike $".
+dnl End of "$Id: cups-launchd.m4 5466 2006-04-26 19:52:27Z mike $".
 dnl
@@ -1,52 +1,50 @@
 dnl
-dnl "$Id: cups-ldap.m4 7800 2008-07-25 21:01:34Z mike $"
+dnl "$Id: cups-ldap.m4 5564 2006-05-22 00:59:11Z mike $"
 dnl
 dnl   LDAP configuration stuff for the Common UNIX Printing System (CUPS).
 dnl
-dnl   Copyright 2007-2008 by Apple Inc.
 dnl   Copyright 2003-2006 by Easy Software Products, all rights reserved.
 dnl
 dnl   These coded instructions, statements, and computer programs are the
-dnl   property of Apple Inc. and are protected by Federal copyright
-dnl   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
-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   property of Easy Software Products and are protected by Federal
+dnl   copyright law.  Distribution and use rights are outlined in the file
+dnl   "LICENSE.txt" which should have been included with this file.  If this
+dnl   file is missing or damaged please contact Easy Software Products
+dnl   at:
+dnl
+dnl       Attn: CUPS Licensing Information
+dnl       Easy Software Products
+dnl       44141 Airport View Drive, Suite 204
+dnl       Hollywood, Maryland 20636 USA
+dnl
+dnl       Voice: (301) 373-9600
+dnl       EMail: cups-info@cups.org
+dnl         WWW: http://www.cups.org/
 dnl

 AC_ARG_ENABLE(ldap, [  --enable-ldap           turn on LDAP support, default=yes])
-AC_ARG_WITH(ldap-libs, [  --with-ldap-libs        set directory for LDAP library],
+AC_ARG_WITH(openldap-libs, [  --with-openldap-libs    set directory for OpenLDAP library],
    LDFLAGS="-L$withval $LDFLAGS"
    DSOFLAGS="-L$withval $DSOFLAGS",)
-AC_ARG_WITH(ldap-includes, [  --with-ldap-includes    set directory for LDAP includes],
+AC_ARG_WITH(openldap-includes, [  --with-openldap-includes
+                          set directory for OpenLDAP includes],
    CFLAGS="-I$withval $CFLAGS"
+    CXXFLAGS="-I$withval $CXXFLAGS"
    CPPFLAGS="-I$withval $CPPFLAGS",)

 LIBLDAP=""

 if test x$enable_ldap != xno; then
-    AC_CHECK_HEADER(ldap.h, [
+    AC_CHECK_HEADER(ldap.h,
 	AC_CHECK_LIB(ldap, ldap_initialize,
-	    AC_DEFINE(HAVE_LDAP)
-	    AC_DEFINE(HAVE_OPENLDAP)
-	    LIBLDAP="-lldap"
-	    AC_CHECK_LIB(ldap, ldap_start_tls,
-		AC_DEFINE(HAVE_LDAP_SSL)),
-
-	    AC_CHECK_LIB(ldap, ldap_init,
-		AC_DEFINE(HAVE_LDAP)
-		AC_DEFINE(HAVE_MOZILLA_LDAP)
-		LIBLDAP="-lldap"
-		AC_CHECK_HEADER(ldap_ssl.h, AC_DEFINE(HAVE_LDAP_SSL_H),,[#include <ldap.h>])
-		AC_CHECK_LIB(ldap, ldapssl_init,
-		    AC_DEFINE(HAVE_LDAP_SSL)))
-	)
-	AC_CHECK_LIB(ldap, ldap_set_rebind_proc, AC_DEFINE(HAVE_LDAP_REBIND_PROC))
-    ])
+            AC_DEFINE(HAVE_LDAP)
+            AC_DEFINE(HAVE_OPENLDAP)
+	    LIBLDAP="-lldap"))
 fi

 AC_SUBST(LIBLDAP)


 dnl
-dnl End of "$Id: cups-ldap.m4 7800 2008-07-25 21:01:34Z mike $".
+dnl End of "$Id: cups-ldap.m4 5564 2006-05-22 00:59:11Z mike $".
 dnl
@@ -1,16 +1,25 @@
 dnl
-dnl "$Id: cups-libtool.m4 6649 2007-07-11 21:46:42Z mike $"
+dnl "$Id: cups-libtool.m4 5466 2006-04-26 19:52:27Z mike $"
 dnl
 dnl   Libtool stuff for the Common UNIX Printing System (CUPS).
 dnl
-dnl   Copyright 2007 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
-dnl   property of Apple Inc. and are protected by Federal copyright
-dnl   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
-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   property of Easy Software Products and are protected by Federal
+dnl   copyright law.  Distribution and use rights are outlined in the file
+dnl   "LICENSE.txt" which should have been included with this file.  If this
+dnl   file is missing or damaged please contact Easy Software Products
+dnl   at:
+dnl
+dnl       Attn: CUPS Licensing Information
+dnl       Easy Software Products
+dnl       44141 Airport View Drive, Suite 204
+dnl       Hollywood, Maryland 20636 USA
+dnl
+dnl       Voice: (301) 373-9600
+dnl       EMail: cups-info@cups.org
+dnl         WWW: http://www.cups.org
 dnl

 AC_ARG_ENABLE(libtool_unsupported, [  --enable-libtool-unsupported=LIBTOOL_PATH
@@ -36,5 +45,5 @@ if test x$LIBTOOL != x; then
 fi

 dnl
-dnl End of "$Id: cups-libtool.m4 6649 2007-07-11 21:46:42Z mike $".
+dnl End of "$Id: cups-libtool.m4 5466 2006-04-26 19:52:27Z mike $".
 dnl
@@ -1,16 +1,25 @@
 dnl
-dnl "$Id: cups-manpages.m4 6649 2007-07-11 21:46:42Z mike $"
+dnl "$Id: cups-manpages.m4 5799 2006-08-03 00:54:38Z mike $"
 dnl
 dnl   Manpage stuff for the Common UNIX Printing System (CUPS).
 dnl
-dnl   Copyright 2007 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
-dnl   property of Apple Inc. and are protected by Federal copyright
-dnl   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
-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   property of Easy Software Products and are protected by Federal
+dnl   copyright law.  Distribution and use rights are outlined in the file
+dnl   "LICENSE.txt" which should have been included with this file.  If this
+dnl   file is missing or damaged please contact Easy Software Products
+dnl   at:
+dnl
+dnl       Attn: CUPS Licensing Information
+dnl       Easy Software Products
+dnl       44141 Airport View Drive, Suite 204
+dnl       Hollywood, Maryland 20636 USA
+dnl
+dnl       Voice: (301) 373-9600
+dnl       EMail: cups-info@cups.org
+dnl         WWW: http://www.cups.org
 dnl

 dnl Fix "mandir" variable...
@@ -100,5 +109,5 @@ AC_SUBST(MAN8EXT)
 AC_SUBST(MAN8DIR)

 dnl
-dnl End of "$Id: cups-manpages.m4 6649 2007-07-11 21:46:42Z mike $".
+dnl End of "$Id: cups-manpages.m4 5799 2006-08-03 00:54:38Z mike $".
 dnl
@@ -1,38 +1,56 @@
 dnl
-dnl "$Id: cups-network.m4 7918 2008-09-08 22:03:01Z mike $"
+dnl "$Id: cups-network.m4 5634 2006-06-06 17:48:27Z mike $"
 dnl
 dnl   Networking stuff for the Common UNIX Printing System (CUPS).
 dnl
-dnl   Copyright 2007-2008 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
-dnl   property of Apple Inc. and are protected by Federal copyright
-dnl   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
-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   property of Easy Software Products and are protected by Federal
+dnl   copyright law.  Distribution and use rights are outlined in the file
+dnl   "LICENSE.txt" which should have been included with this file.  If this
+dnl   file is missing or damaged please contact Easy Software Products
+dnl   at:
+dnl
+dnl       Attn: CUPS Licensing Information
+dnl       Easy Software Products
+dnl       44141 Airport View Drive, Suite 204
+dnl       Hollywood, Maryland 20636 USA
+dnl
+dnl       Voice: (301) 373-9600
+dnl       EMail: cups-info@cups.org
+dnl         WWW: http://www.cups.org
 dnl

-AC_CHECK_HEADER(resolv.h,AC_DEFINE(HAVE_RESOLV_H))
 AC_SEARCH_LIBS(socket, socket)
 AC_SEARCH_LIBS(gethostbyaddr, nsl)
+AC_SEARCH_LIBS(getaddrinfo, nsl, AC_DEFINE(HAVE_GETADDRINFO))
 AC_SEARCH_LIBS(getifaddrs, nsl, AC_DEFINE(HAVE_GETIFADDRS))
+AC_SEARCH_LIBS(getnameinfo, nsl, AC_DEFINE(HAVE_GETNAMEINFO))
 AC_SEARCH_LIBS(hstrerror, nsl socket resolv, AC_DEFINE(HAVE_HSTRERROR))
 AC_SEARCH_LIBS(rresvport_af, nsl, AC_DEFINE(HAVE_RRESVPORT_AF))
-AC_SEARCH_LIBS(__res_init, resolv bind, AC_DEFINE(HAVE_RES_INIT),
-	AC_SEARCH_LIBS(res_9_init, resolv bind, AC_DEFINE(HAVE_RES_INIT),
-	AC_SEARCH_LIBS(res_init, resolv bind, AC_DEFINE(HAVE_RES_INIT))))
-
-# Tru64 5.1b leaks file descriptors with these functions; disable until
-# we can come up with a test for this...
-if test "$uname" != "OSF1"; then
-	AC_SEARCH_LIBS(getaddrinfo, nsl, AC_DEFINE(HAVE_GETADDRINFO))
-	AC_SEARCH_LIBS(getnameinfo, nsl, AC_DEFINE(HAVE_GETNAMEINFO))
-fi

 AC_CHECK_MEMBER(struct sockaddr.sa_len,,, [#include <sys/socket.h>])
 AC_CHECK_HEADER(sys/sockio.h, AC_DEFINE(HAVE_SYS_SOCKIO_H))

+if test "$uname" = "SunOS"; then
+	case "$uversion" in
+		55* | 56*)
+			maxfiles=1024
+			;;
+		*)
+			maxfiles=4096
+			;;
+	esac
+else
+	maxfiles=4096
+fi
+
+AC_ARG_WITH(maxfiles, [  --with-maxfiles=N       set maximum number of file descriptors for scheduler (deprecated) ],
+	maxfiles=$withval)
+
+AC_DEFINE_UNQUOTED(CUPS_MAX_FDS, $maxfiles)
+
 CUPS_DEFAULT_DOMAINSOCKET=""

 dnl Domain socket support...
@@ -66,9 +84,6 @@ fi
 AC_SUBST(CUPS_DEFAULT_DOMAINSOCKET)
 AC_SUBST(CUPS_LISTEN_DOMAINSOCKET)

-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 7918 2008-09-08 22:03:01Z mike $".
+dnl End of "$Id: cups-network.m4 5634 2006-06-06 17:48:27Z mike $".
 dnl
@@ -1,22 +1,30 @@
 dnl
-dnl "$Id: cups-opsys.m4 6649 2007-07-11 21:46:42Z mike $"
+dnl "$Id: cups-opsys.m4 5466 2006-04-26 19:52:27Z mike $"
 dnl
 dnl   Operating system stuff for the Common UNIX Printing System (CUPS).
 dnl
-dnl   Copyright 2007 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
-dnl   property of Apple Inc. and are protected by Federal copyright
-dnl   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
-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   property of Easy Software Products and are protected by Federal
+dnl   copyright law.  Distribution and use rights are outlined in the file
+dnl   "LICENSE.txt" which should have been included with this file.  If this
+dnl   file is missing or damaged please contact Easy Software Products
+dnl   at:
+dnl
+dnl       Attn: CUPS Licensing Information
+dnl       Easy Software Products
+dnl       44141 Airport View Drive, Suite 204
+dnl       Hollywood, Maryland 20636 USA
+dnl
+dnl       Voice: (301) 373-9600
+dnl       EMail: cups-info@cups.org
+dnl         WWW: http://www.cups.org
 dnl

-dnl Get the operating system, version number, and architecture...
+dnl Get the operating system and version number...
 uname=`uname`
 uversion=`uname -r | sed -e '1,$s/^[[^0-9]]*\([[0-9]]*\)\.\([[0-9]]*\).*/\1\2/'`
-uarch=`uname -m`

 case "$uname" in
 	GNU* | GNU/*)
@@ -31,5 +39,5 @@ case "$uname" in
 esac

 dnl
-dnl "$Id: cups-opsys.m4 6649 2007-07-11 21:46:42Z mike $"
+dnl "$Id: cups-opsys.m4 5466 2006-04-26 19:52:27Z mike $"
 dnl
@@ -1,20 +1,28 @@
 dnl
-dnl "$Id: cups-pam.m4 7960 2008-09-17 19:42:02Z mike $"
+dnl "$Id: cups-pam.m4 5466 2006-04-26 19:52:27Z mike $"
 dnl
 dnl   PAM stuff for the Common UNIX Printing System (CUPS).
 dnl
-dnl   Copyright 2007-2008 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
-dnl   property of Apple Inc. and are protected by Federal copyright
-dnl   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
-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   property of Easy Software Products and are protected by Federal
+dnl   copyright law.  Distribution and use rights are outlined in the file
+dnl   "LICENSE.txt" which should have been included with this file.  If this
+dnl   file is missing or damaged please contact Easy Software Products
+dnl   at:
+dnl
+dnl       Attn: CUPS Licensing Information
+dnl       Easy Software Products
+dnl       44141 Airport View Drive, Suite 204
+dnl       Hollywood, Maryland 20636 USA
+dnl
+dnl       Voice: (301) 373-9600
+dnl       EMail: cups-info@cups.org
+dnl         WWW: http://www.cups.org
 dnl

 AC_ARG_ENABLE(pam, [  --enable-pam            turn on PAM support, default=yes])
-AC_ARG_WITH(pam_module, [  --with-pam-module       specify the PAM module to use, default=auto])

 dnl Don't use PAM with AIX...
 if test $uname = AIX; then
@@ -31,8 +39,6 @@ if test x$enable_pam != xno; then

 	AC_CHECK_LIB(dl,dlopen)
 	AC_CHECK_LIB(pam,pam_start)
-	AC_CHECK_LIB(pam,pam_set_item,AC_DEFINE(HAVE_PAM_SET_ITEM))
-	AC_CHECK_LIB(pam,pam_setcred,AC_DEFINE(HAVE_PAM_SETCRED))
 	AC_CHECK_HEADER(security/pam_appl.h)
 	if test x$ac_cv_header_security_pam_appl_h != xyes; then
 		AC_CHECK_HEADER(pam/pam_appl.h,
@@ -61,33 +67,21 @@ if test x$enable_pam != xno; then
 	case "$uname" in
 		Darwin*)
 			# Darwin, MacOS X
-			if test "x$with_pam_module" != x; then
-				PAMFILE="pam.$with_pam_module"
-			elif test -f /usr/lib/pam/pam_opendirectory.so; then
-				PAMFILE="pam.opendirectory"
-			else
-				PAMFILE="pam.securityserver"
-			fi
+			PAMFILE="pam.darwin"
 			;;
-
 		IRIX)
 			# SGI IRIX
 			PAMFILE="pam.irix"
 			;;
-
 		*)
 			# All others; this test might need to be updated
 			# as Linux distributors move things around...
-			if test "x$with_pam_module" != x; then
-				PAMMOD="pam_${with_pam_module}.so"
-			else
-				for mod in pam_unix2.so pam_unix.so pam_pwdb.so; do
-					if test -f /lib/security/$mod; then
-						PAMMOD="$mod"
-						break;
-					fi
-				done
-			fi
+			for mod in pam_unix2.so pam_unix.so pam_pwdb.so; do
+				if test -f /lib/security/$mod; then
+					PAMMOD="$mod"
+					break;
+				fi
+			done

 			PAMFILE="pam.std"
 			;;
@@ -100,5 +94,5 @@ AC_SUBST(PAMLIBS)
 AC_SUBST(PAMMOD)

 dnl
-dnl End of "$Id: cups-pam.m4 7960 2008-09-17 19:42:02Z mike $".
+dnl End of "$Id: cups-pam.m4 5466 2006-04-26 19:52:27Z mike $".
 dnl
@@ -3,29 +3,35 @@ dnl "$Id: cups-pam.m4 5466 2006-04-26 19:52:27Z mike $"
 dnl
 dnl   PAP (AppleTalk) stuff for the Common UNIX Printing System (CUPS).
 dnl
-dnl   Copyright 2007-2008 by Apple Inc.
 dnl   Copyright 2006 by Easy Software Products, all rights reserved.
 dnl
 dnl   These coded instructions, statements, and computer programs are the
-dnl   property of Apple Inc. and are protected by Federal copyright
-dnl   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
-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   property of Easy Software Products and are protected by Federal
+dnl   copyright law.  Distribution and use rights are outlined in the file
+dnl   "LICENSE.txt" which should have been included with this file.  If this
+dnl   file is missing or damaged please contact Easy Software Products
+dnl   at:
+dnl
+dnl       Attn: CUPS Licensing Information
+dnl       Easy Software Products
+dnl       44141 Airport View Drive, Suite 204
+dnl       Hollywood, Maryland 20636 USA
+dnl
+dnl       Voice: (301) 373-9600
+dnl       EMail: cups-info@cups.org
+dnl         WWW: http://www.cups.org
 dnl

 # Currently the PAP backend is only supported on MacOS X with the AppleTalk
 # SDK installed...
-AC_ARG_ENABLE(pap, [  --enable-pap            build with AppleTalk support, default=auto])
-
 PAP=""
-AC_SUBST(PAP)
-
-if test x$enable_pap != xno -a $uname = Darwin; then
-	AC_CHECK_HEADER(netat/appletalk.h,[
-		PAP="pap"
-		AC_CHECK_HEADER(AppleTalk/at_proto.h)])
+if test $uname = Darwin; then
+	PAP="pap"
+	AC_CHECK_HEADER(AppleTalk/at_proto.h)
 fi

+AC_SUBST(PAP)
+
 dnl
 dnl End of "$Id: cups-pam.m4 5466 2006-04-26 19:52:27Z mike $".
 dnl
@@ -1,16 +1,25 @@
 dnl
-dnl "$Id: cups-pdf.m4 7449 2008-04-14 18:27:53Z mike $"
+dnl "$Id: cups-pdf.m4 5466 2006-04-26 19:52:27Z mike $"
 dnl
 dnl   PDF filter configuration stuff for the Common UNIX Printing System (CUPS).
 dnl
-dnl   Copyright 2007-2008 by Apple Inc.
 dnl   Copyright 2006 by Easy Software Products, all rights reserved.
 dnl
 dnl   These coded instructions, statements, and computer programs are the
-dnl   property of Apple Inc. and are protected by Federal copyright
-dnl   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
-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   property of Easy Software Products and are protected by Federal
+dnl   copyright law.  Distribution and use rights are outlined in the file
+dnl   "LICENSE.txt" which should have been included with this file.  If this
+dnl   file is missing or damaged please contact Easy Software Products
+dnl   at:
+dnl
+dnl       Attn: CUPS Licensing Information
+dnl       Easy Software Products
+dnl       44141 Airport View Drive, Suite 204
+dnl       Hollywood, Maryland 20636 USA
+dnl
+dnl       Voice: (301) 373-9600
+dnl       EMail: cups-info@cups.org
+dnl         WWW: http://www.cups.org
 dnl

 AC_ARG_ENABLE(pdftops, [  --enable-pdftops        build pdftops filter, default=auto ])
@@ -18,34 +27,17 @@ AC_ARG_ENABLE(pdftops, [  --enable-pdftops        build pdftops filter, default=
 PDFTOPS=""

 if test "x$enable_pdftops" != xno; then
-	AC_PATH_PROG(CUPS_PDFTOPS, pdftops)
-	if test "x$CUPS_PDFTOPS" != x; then
-		AC_DEFINE(HAVE_PDFTOPS)
-	fi
-	AC_DEFINE_UNQUOTED(CUPS_PDFTOPS, "$CUPS_PDFTOPS")
-
-	AC_PATH_PROG(CUPS_GHOSTSCRIPT, gs)
-	if test "x$CUPS_GHOSTSCRIPT" != x; then
-		AC_DEFINE(HAVE_GHOSTSCRIPT)
-	fi
-	AC_DEFINE_UNQUOTED(CUPS_GHOSTSCRIPT, "$CUPS_GHOSTSCRIPT")
-
-	if test "x$CUPS_PDFTOPS" != x -o "x$CUPS_GHOSTSCRIPT" != x; then
-		AC_MSG_CHECKING(whether to build pdftops filter)
-		if test x$enable_pdftops = xyes -o $uname != Darwin; then
-			PDFTOPS="pdftops"
-			AC_MSG_RESULT(yes)
-		else
-			AC_MSG_RESULT(no)
-		fi
-	elif test x$enable_pdftops = xyes; then
-		AC_MSG_ERROR(Unable to find pdftops or gs programs!)
-		exit 1
+	AC_MSG_CHECKING(whether to build pdftops filter)
+	if test "x$enable_pdftops" = xyes -o $uname != Darwin; then
+		PDFTOPS="pdftops"
+		AC_MSG_RESULT(yes)
+	else
+		AC_MSG_RESULT(no)
 	fi
 fi

 AC_SUBST(PDFTOPS)

 dnl
-dnl End of "$Id: cups-pdf.m4 7449 2008-04-14 18:27:53Z mike $".
+dnl End of "$Id: cups-pdf.m4 5466 2006-04-26 19:52:27Z mike $".
 dnl
@@ -1,22 +0,0 @@
-dnl
-dnl "$Id$"
-dnl
-dnl   Select/poll stuff for the Common UNIX Printing System (CUPS).
-dnl
-dnl   Copyright 2007 by Apple Inc.
-dnl   Copyright 2006 by Easy Software Products, all rights reserved.
-dnl
-dnl   These coded instructions, statements, and computer programs are the
-dnl   property of Apple Inc. and are protected by Federal copyright
-dnl   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
-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_CHECK_FUNC(poll, AC_DEFINE(HAVE_POLL))
-AC_CHECK_FUNC(epoll_create, AC_DEFINE(HAVE_EPOLL))
-AC_CHECK_FUNC(kqueue, AC_DEFINE(HAVE_KQUEUE))
-
-dnl
-dnl End of "$Id$".
-dnl
@@ -1,16 +1,25 @@
 dnl
-dnl "$Id: cups-scripting.m4 7915 2008-09-07 22:18:29Z mike $"
+dnl "$Id: cups-scripting.m4 5466 2006-04-26 19:52:27Z mike $"
 dnl
 dnl   Scripting configuration stuff for the Common UNIX Printing System (CUPS).
 dnl
-dnl   Copyright 2007-2008 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
-dnl   property of Apple Inc. and are protected by Federal copyright
-dnl   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
-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   property of Easy Software Products and are protected by Federal
+dnl   copyright law.  Distribution and use rights are outlined in the file
+dnl   "LICENSE.txt" which should have been included with this file.  If this
+dnl   file is missing or damaged please contact Easy Software Products
+dnl   at:
+dnl
+dnl       Attn: CUPS Licensing Information
+dnl       Easy Software Products
+dnl       44141 Airport View Drive, Suite 204
+dnl       Hollywood, Maryland 20636 USA
+dnl
+dnl       Voice: (301) 373-9600
+dnl       EMail: cups-info@cups.org
+dnl         WWW: http://www.cups.org
 dnl

 dnl Do we have Java?
@@ -51,13 +60,8 @@ AC_ARG_WITH(php, [  --with-php              set PHP interpreter for web interfac
 	CUPS_PHP="")

 if test "x$CUPS_PHP" = x; then
-	AC_PATH_PROG(PHPCGI,php-cgi)
-	if test "x$PHPCGI" = x; then
-		AC_PATH_PROG(PHP,php)
-		CUPS_PHP="$PHP"
-	else
-		CUPS_PHP="$PHPCGI"
-	fi
+	AC_PATH_PROG(PHP,php)
+	CUPS_PHP="$PHP"
 fi

 AC_DEFINE_UNQUOTED(CUPS_PHP, "$CUPS_PHP")
@@ -96,5 +100,5 @@ if test "x$CUPS_PYTHON" != x; then
 fi

 dnl
-dnl End of "$Id: cups-scripting.m4 7915 2008-09-07 22:18:29Z mike $".
+dnl End of "$Id: cups-scripting.m4 5466 2006-04-26 19:52:27Z mike $".
 dnl
@@ -1,16 +1,25 @@
 dnl
-dnl "$Id: cups-sharedlibs.m4 7630 2008-06-09 22:31:44Z mike $"
+dnl "$Id: cups-sharedlibs.m4 5582 2006-05-24 01:00:35Z mike $"
 dnl
 dnl   Shared library support for the Common UNIX Printing System (CUPS).
 dnl
-dnl   Copyright 2007-2008 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
-dnl   property of Apple Inc. and are protected by Federal copyright
-dnl   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
-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   property of Easy Software Products and are protected by Federal
+dnl   copyright law.  Distribution and use rights are outlined in the file
+dnl   "LICENSE.txt" which should have been included with this file.  If this
+dnl   file is missing or damaged please contact Easy Software Products
+dnl   at:
+dnl
+dnl       Attn: CUPS Licensing Information
+dnl       Easy Software Products
+dnl       44141 Airport View Drive, Suite 204
+dnl       Hollywood, Maryland 20636 USA
+dnl
+dnl       Voice: (301) 373-9600
+dnl       EMail: cups-info@cups.org
+dnl         WWW: http://www.cups.org
 dnl

 PICFLAG=1
@@ -20,122 +29,56 @@ AC_ARG_ENABLE(shared, [  --enable-shared         turn on shared libraries, defau

 if test x$enable_shared != xno; then
 	case "$uname" in
-		SunOS*)
+		SunOS* | UNIX_S*)
 			LIBCUPS="libcups.so.2"
-			LIBCUPSCGI="libcupscgi.so.1"
-			LIBCUPSDRIVER="libcupsdriver.so.1"
 			LIBCUPSIMAGE="libcupsimage.so.2"
-			LIBCUPSMIME="libcupsmime.so.1"
-			LIBCUPSPPDC="libcupsppdc.so.1"
 			DSO="\$(CC)"
-			DSOXX="\$(CXX)"
-			DSOFLAGS="$DSOFLAGS -Wl,-h\`basename \$@\` -G \$(OPTIM)"
-			;;
-		UNIX_S*)
-			LIBCUPS="libcups.so.2"
-			LIBCUPSCGI="libcupscgi.so.1"
-			LIBCUPSDRIVER="libcupsdriver.so.1"
-			LIBCUPSIMAGE="libcupsimage.so.2"
-			LIBCUPSMIME="libcupsmime.so.1"
-			LIBCUPSPPDC="libcupsppdc.so.1"
-			DSO="\$(CC)"
-			DSOXX="\$(CXX)"
 			DSOFLAGS="$DSOFLAGS -Wl,-h,\`basename \$@\` -G \$(OPTIM)"
 			;;
 		HP-UX*)
-			case "$uarch" in
-				ia64)
-					LIBCUPS="libcups.so.2"
-					LIBCUPSCGI="libcupscgi.so.1"
-					LIBCUPSDRIVER="libcupsdriver.so.1"
-					LIBCUPSIMAGE="libcupsimage.so.2"
-					LIBCUPSMIME="libcupsmime.so.1"
-					LIBCUPSPPDC="libcupsppdc.so.1"
-					DSO="\$(CC)"
-					DSOXX="\$(CXX)"
-					DSOFLAGS="$DSOFLAGS -Wl,-b,-z,+h,\`basename \$@\`"
-					;;
-				*)
-					LIBCUPS="libcups.sl.2"
-					LIBCUPSCGI="libcupscgi.sl.1"
-					LIBCUPSDRIVER="libcupsdriver.sl.1"
-					LIBCUPSIMAGE="libcupsimage.sl.2"
-					LIBCUPSMIME="libcupsmime.sl.1"
-					LIBCUPSPPDC="libcupsppdc.sl.1"
-					DSO="\$(LD)"
-					DSOXX="\$(LD)"
-					DSOFLAGS="$DSOFLAGS -b -z +h \`basename \$@\`"
-					;;
-			esac
+			LIBCUPS="libcups.sl.2"
+			LIBCUPSIMAGE="libcupsimage.sl.2"
+			DSO="\$(LD)"
+			DSOFLAGS="$DSOFLAGS -b -z +h \`basename \$@\`"
 			;;
 		IRIX)
 			LIBCUPS="libcups.so.2"
-			LIBCUPSCGI="libcupscgi.so.1"
-			LIBCUPSDRIVER="libcupsdriver.so.1"
 			LIBCUPSIMAGE="libcupsimage.so.2"
-			LIBCUPSMIME="libcupsmime.so.1"
-			LIBCUPSPPDC="libcupsppdc.so.1"
 			DSO="\$(CC)"
-			DSOXX="\$(CXX)"
 			DSOFLAGS="$DSOFLAGS -set_version,sgi2.6,-soname,\`basename \$@\` -shared \$(OPTIM)"
 			;;
 		OSF1* | Linux | GNU | *BSD*)
 			LIBCUPS="libcups.so.2"
-			LIBCUPSCGI="libcupscgi.so.1"
-			LIBCUPSDRIVER="libcupsdriver.so.1"
 			LIBCUPSIMAGE="libcupsimage.so.2"
-			LIBCUPSMIME="libcupsmime.so.1"
-			LIBCUPSPPDC="libcupsppdc.so.1"
 			DSO="\$(CC)"
-			DSOXX="\$(CXX)"
 			DSOFLAGS="$DSOFLAGS -Wl,-soname,\`basename \$@\` -shared \$(OPTIM)"
 			;;
 		Darwin*)
 			LIBCUPS="libcups.2.dylib"
-			LIBCUPSCGI="libcupscgi.1.dylib"
-			LIBCUPSDRIVER="libcupsdriver.1.dylib"
 			LIBCUPSIMAGE="libcupsimage.2.dylib"
-			LIBCUPSMIME="libcupsmime.1.dylib"
-			LIBCUPSPPDC="libcupsppdc.1.dylib"
 			DSO="\$(CC)"
-			DSOXX="\$(CXX)"
 			DSOFLAGS="$DSOFLAGS -dynamiclib -single_module -lc"
 			;;
 		AIX*)
 			LIBCUPS="libcups_s.a"
-			LIBCUPSCGI="libcupscgi_s.a"
-			LIBCUPSDRIVER="libcupsdriver_s.a"
 			LIBCUPSIMAGE="libcupsimage_s.a"
-			LIBCUPSMIME="libcupsmime_s.a"
-			LIBCUPSPPDC="libcupsppdc_s.a"
 			DSO="\$(CC)"
-			DSOXX="\$(CXX)"
 			DSOFLAGS="$DSOFLAGS -Wl,-bexpall,-bM:SRE,-bnoentry,-blibpath:\$(libdir)"
 			;;
 		*)
 			echo "Warning: shared libraries may not be supported.  Trying -shared"
 			echo "         option with compiler."
 			LIBCUPS="libcups.so.2"
-			LIBCUPSCGI="libcupscgi.so.1"
-			LIBCUPSDRIVER="libcupsdriver.so.1"
 			LIBCUPSIMAGE="libcupsimage.so.2"
-			LIBCUPSMIME="libcupsmime.so.1"
-			LIBCUPSPPDC="libcupsppdc.so.1"
 			DSO="\$(CC)"
-			DSOXX="\$(CXX)"
 			DSOFLAGS="$DSOFLAGS -Wl,-soname,\`basename \$@\` -shared \$(OPTIM)"
 			;;
 	esac
 else
 	PICFLAG=0
 	LIBCUPS="libcups.a"
-	LIBCUPSCGI="libcupscgi.a"
-	LIBCUPSDRIVER="libcupsdriver.a"
 	LIBCUPSIMAGE="libcupsimage.a"
-	LIBCUPSMIME="libcupsmime.a"
-	LIBCUPSPPDC="libcupsppdc.a"
 	DSO=":"
-	DSOXX=":"
 fi

 # 32-bit and 64-bit libraries need variations of the standard
@@ -144,16 +87,11 @@ DSO32FLAGS="$DSOFLAGS"
 DSO64FLAGS="$DSOFLAGS"

 AC_SUBST(DSO)
-AC_SUBST(DSOXX)
 AC_SUBST(DSOFLAGS)
 AC_SUBST(DSO32FLAGS)
 AC_SUBST(DSO64FLAGS)
 AC_SUBST(LIBCUPS)
-AC_SUBST(LIBCUPSCGI)
-AC_SUBST(LIBCUPSDRIVER)
 AC_SUBST(LIBCUPSIMAGE)
-AC_SUBST(LIBCUPSMIME)
-AC_SUBST(LIBCUPSPPDC)

 if test x$enable_shared = xno; then
 	LINKCUPS="../cups/libcups.a"
@@ -188,18 +126,9 @@ if test "$DSO" != ":"; then
 	case $uname in
                HP-UX*)
 			# HP-UX needs the path, even for /usr/lib...
-			case "$uarch" in
-				ia64)
-					DSOFLAGS="-Wl,+s,+b,$libdir $DSOFLAGS"
-					DSO32FLAGS="-Wl,+s,+b,$LIB32DIR $DSO32FLAGS"
-					DSO64FLAGS="-Wl,+s,+b,$LIB64DIR $DSO64FLAGS"
-					;;
-				*)
-                			DSOFLAGS="+s +b $libdir $DSOFLAGS"
-                			DSO32FLAGS="+s +b $LIB32DIR $DSO32FLAGS"
-                			DSO64FLAGS="+s +b $LIB64DIR $DSO64FLAGS"
-					;;
-			esac
+                	DSOFLAGS="+s +b $libdir $DSOFLAGS"
+                	DSO32FLAGS="+s +b $LIB32DIR $DSO32FLAGS"
+                	DSO64FLAGS="+s +b $LIB64DIR $DSO64FLAGS"
                	LDFLAGS="$LDFLAGS -Wl,+s,+b,$libdir"
                	EXPORT_LDFLAGS="-Wl,+s,+b,$libdir"
 			;;
@@ -244,5 +173,5 @@ AC_SUBST(IMGLIBS)
 AC_SUBST(EXPORT_LDFLAGS)

 dnl
-dnl End of "$Id: cups-sharedlibs.m4 7630 2008-06-09 22:31:44Z mike $".
+dnl End of "$Id: cups-sharedlibs.m4 5582 2006-05-24 01:00:35Z mike $".
 dnl
@@ -1,16 +1,25 @@
 dnl
-dnl "$Id: cups-slp.m4 7241 2008-01-22 22:34:52Z mike $"
+dnl "$Id: cups-slp.m4 5466 2006-04-26 19:52:27Z mike $"
 dnl
 dnl   OpenSLP configuration stuff for the Common UNIX Printing System (CUPS).
 dnl
-dnl   Copyright 2007-2008 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
-dnl   property of Apple Inc. and are protected by Federal copyright
-dnl   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
-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   property of Easy Software Products and are protected by Federal
+dnl   copyright law.  Distribution and use rights are outlined in the file
+dnl   "LICENSE.txt" which should have been included with this file.  If this
+dnl   file is missing or damaged please contact Easy Software Products
+dnl   at:
+dnl
+dnl       Attn: CUPS Licensing Information
+dnl       Easy Software Products
+dnl       44141 Airport View Drive, Suite 204
+dnl       Hollywood, Maryland 20636 USA
+dnl
+dnl       Voice: (301) 373-9600
+dnl       EMail: cups-info@cups.org
+dnl         WWW: http://www.cups.org
 dnl

 AC_ARG_ENABLE(slp, [  --enable-slp            turn on SLP support, default=yes])
@@ -19,6 +28,7 @@ AC_ARG_WITH(openslp-libs, [  --with-openslp-libs     set directory for OpenSLP l
    DSOFLAGS="-L$withval $DSOFLAGS",)
 AC_ARG_WITH(openslp-includes, [  --with-openslp-includes set directory for OpenSLP includes],
    CFLAGS="-I$withval $CFLAGS"
+    CXXFLAGS="-I$withval $CXXFLAGS"
    CPPFLAGS="-I$withval $CPPFLAGS",)

 LIBSLP=""
@@ -34,5 +44,5 @@ AC_SUBST(LIBSLP)


 dnl
-dnl End of "$Id: cups-slp.m4 7241 2008-01-22 22:34:52Z mike $".
+dnl End of "$Id: cups-slp.m4 5466 2006-04-26 19:52:27Z mike $".
 dnl
@@ -1,16 +1,25 @@
 dnl
-dnl "$Id: cups-ssl.m4 7241 2008-01-22 22:34:52Z mike $"
+dnl "$Id: cups-ssl.m4 5630 2006-06-05 18:42:53Z mike $"
 dnl
 dnl   OpenSSL/GNUTLS stuff for the Common UNIX Printing System (CUPS).
 dnl
-dnl   Copyright 2007-2008 by Apple Inc.
-dnl   Copyright 1997-2007 by Easy Software Products, all rights reserved.
+dnl   Copyright 1997-2006 by Easy Software Products, all rights reserved.
 dnl
 dnl   These coded instructions, statements, and computer programs are the
-dnl   property of Apple Inc. and are protected by Federal copyright
-dnl   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
-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   property of Easy Software Products and are protected by Federal
+dnl   copyright law.  Distribution and use rights are outlined in the file
+dnl   "LICENSE.txt" which should have been included with this file.  If this
+dnl   file is missing or damaged please contact Easy Software Products
+dnl   at:
+dnl
+dnl       Attn: CUPS Licensing Information
+dnl       Easy Software Products
+dnl       44141 Airport View Drive, Suite 204
+dnl       Hollywood, Maryland 20636 USA
+dnl
+dnl       Voice: (301) 373-9600
+dnl       EMail: cups-info@cups.org
+dnl         WWW: http://www.cups.org
 dnl

 AC_ARG_ENABLE(ssl, [  --enable-ssl            turn on SSL/TLS support, default=yes])
@@ -22,6 +31,7 @@ AC_ARG_WITH(openssl-libs, [  --with-openssl-libs     set directory for OpenSSL l
    DSOFLAGS="-L$withval $DSOFLAGS",)
 AC_ARG_WITH(openssl-includes, [  --with-openssl-includes set directory for OpenSSL includes],
    CFLAGS="-I$withval $CFLAGS"
+    CXXFLAGS="-I$withval $CXXFLAGS"
    CPPFLAGS="-I$withval $CPPFLAGS",)

 SSLFLAGS=""
@@ -32,33 +42,15 @@ if test x$enable_ssl != xno; then
    dnl Look for CDSA...
    if test "x${SSLLIBS}" = "x" -a "x${enable_cdsassl}" != "xno"; then
 	if test $uname = Darwin; then
-	    AC_CHECK_HEADER(Security/SecureTransport.h, [
-		SSLLIBS="-framework CoreFoundation -framework Security"
-		# MacOS X doesn't (yet) come with pre-installed encryption
-		# certificates for CUPS, so don't enable encryption on
-		# /admin just yet...
-		#ENCRYPTION_REQUIRED="  Encryption Required"
-		AC_DEFINE(HAVE_SSL)
-		AC_DEFINE(HAVE_CDSASSL)
-
-		dnl Check for the various security headers...
-		AC_CHECK_HEADER(Security/SecPolicy.h,
-		    AC_DEFINE(HAVE_SECPOLICY_H))
-		AC_CHECK_HEADER(Security/SecPolicyPriv.h,
-		    AC_DEFINE(HAVE_SECPOLICYPRIV_H))
-		AC_CHECK_HEADER(Security/SecBasePriv.h,
-		    AC_DEFINE(HAVE_SECBASEPRIV_H))
-		AC_CHECK_HEADER(Security/SecIdentitySearchPriv.h,
-		    AC_DEFINE(HAVE_SECIDENTITYSEARCHPRIV_H))
-
-		dnl Check for SecIdentitySearchCreateWithPolicy...
-		AC_MSG_CHECKING(for SecIdentitySearchCreateWithPolicy)
-		if test $uversion -ge 80; then
-		    AC_DEFINE(HAVE_SECIDENTITYSEARCHCREATEWITHPOLICY)
-		    AC_MSG_RESULT(yes)
-		else
-		    AC_MSG_RESULT(no)
-		fi])
+	    AC_CHECK_HEADER(Security/SecureTransport.h,
+		[SSLLIBS="-framework CoreFoundation -framework Security"
+		 # MacOS X doesn't (yet) come with pre-installed encryption
+		 # certificates for CUPS, so don't enable encryption on
+		 # /admin just yet...
+		 #ENCRYPTION_REQUIRED="  Encryption Required"
+		 AC_CHECK_HEADER(Security/SecBasePriv.h,AC_DEFINE(HAVE_SECBASEPRIV_H))
+		 AC_DEFINE(HAVE_SSL)
+		 AC_DEFINE(HAVE_CDSASSL)])
 	fi
    fi

@@ -123,5 +115,5 @@ AC_SUBST(EXPORT_SSLLIBS)


 dnl
-dnl End of "$Id: cups-ssl.m4 7241 2008-01-22 22:34:52Z mike $".
+dnl End of "$Id: cups-ssl.m4 5630 2006-06-05 18:42:53Z mike $".
 dnl
@@ -1,16 +1,25 @@
 dnl
-dnl "$Id: cups-threads.m4 6649 2007-07-11 21:46:42Z mike $"
+dnl "$Id: cups-threads.m4 5466 2006-04-26 19:52:27Z mike $"
 dnl
 dnl   Threading stuff for the Common UNIX Printing System (CUPS).
 dnl
-dnl   Copyright 2007 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
-dnl   property of Apple Inc. and are protected by Federal copyright
-dnl   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
-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   property of Easy Software Products and are protected by Federal
+dnl   copyright law.  Distribution and use rights are outlined in the file
+dnl   "LICENSE.txt" which should have been included with this file.  If this
+dnl   file is missing or damaged please contact Easy Software Products
+dnl   at:
+dnl
+dnl       Attn: CUPS Licensing Information
+dnl       Easy Software Products
+dnl       44141 Airport View Drive, Suite 204
+dnl       Hollywood, Maryland 20636 USA
+dnl
+dnl       Voice: (301) 373-9600
+dnl       EMail: cups-info@cups.org
+dnl         WWW: http://www.cups.org
 dnl

 AC_ARG_ENABLE(threads, [  --enable-threads        enable multi-threading support])
@@ -35,12 +44,6 @@ if test "x$enable_threads" != xno; then

 			if test $have_pthread = yes; then
 				PTHREAD_FLAGS="-D_THREAD_SAFE -D_REENTRANT"
-
-				# Solaris requires -D_POSIX_PTHREAD_SEMANTICS to
-				# be POSIX-compliant... :(
-				if test $uname = SunOS; then
-					PTHREAD_FLAGS="$PTHREAD_FLAGS -D_POSIX_PTHREAD_SEMANTICS"
-				fi
 				break
 			fi
 		done
@@ -50,5 +53,5 @@ fi
 AC_SUBST(PTHREAD_FLAGS)

 dnl
-dnl End of "$Id: cups-threads.m4 6649 2007-07-11 21:46:42Z mike $".
+dnl End of "$Id: cups-threads.m4 5466 2006-04-26 19:52:27Z mike $".
 dnl
@@ -3,14 +3,23 @@
 *
 *   Configuration file for the Common UNIX Printing System (CUPS).
 *
- *   Copyright 2007-2008 by Apple Inc.
- *   Copyright 1997-2007 by Easy Software Products.
+ *   Copyright 1997-2006 by Easy Software Products.
 *
 *   These coded instructions, statements, and computer programs are the
- *   property of Apple Inc. and are protected by Federal copyright
- *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
- *   which should have been included with this file.  If this file is
- *   file is missing or damaged, see the license at "http://www.cups.org/".
+ *   property of Easy Software Products and are protected by Federal
+ *   copyright law.  Distribution and use rights are outlined in the file
+ *   "LICENSE.txt" which should have been included with this file.  If this
+ *   file is missing or damaged please contact Easy Software Products
+ *   at:
+ *
+ *       Attn: CUPS Licensing Information
+ *       Easy Software Products
+ *       44141 Airport View Drive, Suite 204
+ *       Hollywood, Maryland 20636 USA
+ *
+ *       Voice: (301) 373-9600
+ *       EMail: cups-info@cups.org
+ *         WWW: http://www.cups.org
 */

 #ifndef _CUPS_CONFIG_H_
@@ -31,7 +40,6 @@
 #define CUPS_DEFAULT_USER	"lp"
 #define CUPS_DEFAULT_GROUP	"sys"
 #define CUPS_DEFAULT_SYSTEM_GROUPS	"sys root system"
-#define CUPS_DEFAULT_PRINTADMIN_AUTH	"@SYSTEM"


 /*
@@ -42,21 +50,6 @@
 #define CUPS_DEFAULT_LOG_FILE_PERM	0644


-/*
- * Default logging settings...
- */
-
-#define CUPS_DEFAULT_LOG_LEVEL	"warn"
-#define CUPS_DEFAULT_ACCESS_LOG_LEVEL "actions"
-
-
-/*
- * Default fatal error settings...
- */
-
-#define CUPS_DEFAULT_FATAL_ERRORS	"config"
-
-
 /*
 * Default browsing settings...
 */
@@ -85,18 +78,10 @@


 /*
- * Default Samba and LPD config files...
+ * Maximum number of file descriptors to support.
 */

-#define CUPS_DEFAULT_SMB_CONFIG_FILE	""
-#define CUPS_DEFAULT_LPD_CONFIG_FILE	""
-
-
-/*
- * Default MaxCopies value...
- */
-
-#define CUPS_DEFAULT_MAX_COPIES	100
+#define CUPS_MAX_FDS		4096


 /*
@@ -146,8 +131,6 @@
 #endif /* !HAVE_LIBPAM */

 #undef HAVE_PAM_PAM_APPL_H
-#undef HAVE_PAM_SET_ITEM
-#undef HAVE_PAM_SETCRED


 /*
@@ -164,13 +147,6 @@
 #undef HAVE_CRYPT_H


-/*
- * Do we have <scsi/sg.h>?
- */
-
-#undef HAVE_SCSI_SG_H
-
-
 /*
 * Use <string.h>, <strings.h>, and/or <bstring.h>?
 */
@@ -285,21 +261,10 @@


 /*
- * What Security framework headers do we have?
+ * Do we have <Security/SecBasePriv.h>?
 */

-#undef HAVE_AUTHORIZATION_H
-#undef HAVE_SECPOLICY_H
-#undef HAVE_SECPOLICYPRIV_H
 #undef HAVE_SECBASEPRIV_H
-#undef HAVE_SECIDENTITYSEARCHPRIV_H
-
-
-/*
- * Do we have the SecIdentitySearchCreateWithPolicy function?
- */
-
-#undef HAVE_SECIDENTITYSEARCHCREATEWITHPOLICY


 /*
@@ -315,10 +280,6 @@

 #undef HAVE_LDAP
 #undef HAVE_OPENLDAP
-#undef HAVE_MOZILLA_LDAP
-#undef HAVE_LDAP_SSL_H
-#undef HAVE_LDAP_SSL
-#undef HAVE_LDAP_REBIND_PROC


 /*
@@ -328,21 +289,6 @@
 #undef HAVE_LIBPAPER


-/*
- * Do we have DNS Service Discovery (aka Bonjour)?
- */
-
-#undef HAVE_DNSSD
-
-
-/*
- * Do we have Darwin's CoreFoundation and SystemConfiguration frameworks?
- */
-
-#undef HAVE_COREFOUNDATION
-#undef HAVE_SYSTEMCONFIGURATION
-
-
 /*
 * Do we have <sys/ioctl.h>?
 */
@@ -400,20 +346,6 @@
 #undef HAVE_HSTRERROR


-/*
- * Do we have res_init()?
- */
-
-#undef HAVE_RES_INIT
-
-
-/*
- * Do we have <resolv.h>
- */
-
-#undef HAVE_RESOLV_H
-
-
 /*
 * Do we have the <sys/sockio.h> header file?
 */
@@ -464,22 +396,6 @@
 #define CUPS_PYTHON	"/usr/bin/python"


-/*
- * Location of the poppler/Xpdf pdftops program...
- */
-
-#undef HAVE_PDFTOPS
-#define CUPS_PDFTOPS	"/usr/bin/pdftops"
-
-
-/*
- * Location of the Ghostscript gs program...
- */
-
-#undef HAVE_GHOSTSCRIPT
-#define CUPS_GHOSTSCRIPT "/usr/bin/gs"
-
-
 /*
 * Do we have Darwin's CoreFoundation and SystemConfiguration frameworks?
 */
@@ -502,7 +418,6 @@
 */

 #undef HAVE_MEMBERSHIP_H
-#undef HAVE_MEMBERSHIPPRIV_H
 #undef HAVE_MBR_UID_TO_UUID


@@ -519,7 +434,6 @@
 */

 #undef HAVE_DBUS
-#undef HAVE_DBUS_MESSAGE_ITER_INIT_APPEND


 /*
@@ -529,96 +443,6 @@
 #undef HAVE_APPLETALK_AT_PROTO_H


-/*
- * Do we have the GSSAPI support library (for Kerberos support)?
- */
-
-#undef HAVE_GSSAPI
-#undef HAVE_GSSAPI_H
-#undef HAVE_GSSAPI_GSSAPI_H
-#undef HAVE_GSSAPI_GSSAPI_GENERIC_H
-#undef HAVE_GSSAPI_GSSAPI_KRB5_H
-#undef HAVE_GSSKRB5_REGISTER_ACCEPTOR_IDENTITY
-#undef HAVE_GSS_C_NT_HOSTBASED_SERVICE
-#undef HAVE_KRB5_CC_NEW_UNIQUE
-#undef HAVE_KRB5_H
-#undef HAVE_HEIMDAL
-
-
-/*
- * Default GSS service name...
- */
-
-#define CUPS_DEFAULT_GSSSERVICENAME	""
-
-
-/*
- * Select/poll interfaces...
- */
-
-#undef HAVE_POLL
-#undef HAVE_EPOLL
-#undef HAVE_KQUEUE
-
-
-/*
- * Do we have the <dlfcn.h> header?
- */
-
-#undef HAVE_DLFCN_H
-
-
-/*
- * Do we have <sys/param.h>?
- */
-
-#undef HAVE_SYS_PARAM_H
-
-
-/*
- * Do we have <sys/ucred.h>?
- */
-
-#undef HAVE_SYS_UCRED_H
-
-
-/*
- * Do we have removefile()?
- */
-
-#undef HAVE_REMOVEFILE
-
-
-/*
- * Do we have <sandbox.h>?
- */
-
-#undef HAVE_SANDBOX_H
-
-
-/*
- * Which random number generator function to use...
- */
-
-#undef HAVE_RANDOM
-#undef HAVE_MRAND48
-#undef HAVE_LRAND48
-
-
-/*
- * Do we have libusb?
- */
-
-#undef HAVE_USB_H
-
-
-/*
- * Do we have libwrap and tcpd.h?
- */
-
-#undef HAVE_TCPD_H
-
-
 #endif /* !_CUPS_CONFIG_H_ */

 /*
@@ -3,14 +3,23 @@ dnl "$Id$"
 dnl
 dnl   Configuration script for the Common UNIX Printing System (CUPS).
 dnl
-dnl   Copyright 2007 by Apple Inc.
-dnl   Copyright 1997-2007 by Easy Software Products, all rights reserved.
+dnl   Copyright 1997-2006 by Easy Software Products, all rights reserved.
 dnl
 dnl   These coded instructions, statements, and computer programs are the
-dnl   property of Apple Inc. and are protected by Federal copyright
-dnl   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
-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   property of Easy Software Products and are protected by Federal
+dnl   copyright law.  Distribution and use rights are outlined in the file
+dnl   "LICENSE.txt" which should have been included with this file.  If this
+dnl   file is missing or damaged please contact Easy Software Products
+dnl   at:
+dnl
+dnl       Attn: CUPS Licensing Information
+dnl       Easy Software Products
+dnl       44141 Airport View Drive, Suite 204
+dnl       Hollywood, Maryland 20636 USA
+dnl
+dnl       Voice: (301) 373-9600
+dnl       EMail: cups-info@cups.org
+dnl         WWW: http://www.cups.org
 dnl

 AC_INIT(cups/cups.h)
@@ -20,22 +29,18 @@ sinclude(config-scripts/cups-common.m4)
 sinclude(config-scripts/cups-directories.m4)
 sinclude(config-scripts/cups-manpages.m4)

-sinclude(config-scripts/cups-3264.m4)
 sinclude(config-scripts/cups-sharedlibs.m4)
 sinclude(config-scripts/cups-libtool.m4)
 sinclude(config-scripts/cups-compiler.m4)

 sinclude(config-scripts/cups-image.m4)
 sinclude(config-scripts/cups-network.m4)
-sinclude(config-scripts/cups-poll.m4)
 sinclude(config-scripts/cups-slp.m4)
-sinclude(config-scripts/cups-gssapi.m4)
 sinclude(config-scripts/cups-ldap.m4)
 sinclude(config-scripts/cups-ssl.m4)
 sinclude(config-scripts/cups-pam.m4)
 sinclude(config-scripts/cups-threads.m4)
 sinclude(config-scripts/cups-largefile.m4)
-sinclude(config-scripts/cups-dnssd.m4)
 sinclude(config-scripts/cups-launchd.m4)
 sinclude(config-scripts/cups-defaults.m4)
 sinclude(config-scripts/cups-pap.m4)
@@ -53,6 +58,10 @@ if test "x$LANGUAGES" != x; then
 			LANGFILES="$LANGFILES doc/$lang/index.html"
 		fi

+		if test -f templates/$lang/edit-config.tmpl.in; then
+			LANGFILES="$LANGFILES templates/$lang/edit-config.tmpl"
+		fi
+
 		if test -f templates/$lang/header.tmpl.in; then
 			LANGFILES="$LANGFILES templates/$lang/header.tmpl"
 		fi
@@ -63,15 +72,12 @@ AC_SUBST(INSTALL_LANGUAGES)
 AC_SUBST(UNINSTALL_LANGUAGES)

 AC_OUTPUT(Makedefs packaging/cups.list init/cups.sh init/cups-lpd cups-config
-	  conf/cupsd.conf conf/mime.convs conf/pam.std conf/snmp.conf
-	  data/testprint
-	  desktop/cups.desktop
-	  doc/index.html doc/help/ref-cupsd-conf.html doc/help/standard.html
-	  init/org.cups.cups-lpd.plist init/cups.xml
-	  man/client.conf.man man/cups-deviced.man man/cups-driverd.man
+	  conf/cupsd.conf conf/pam.std doc/index.html
+	  doc/help/standard.html man/client.conf.man
+	  man/cups-deviced.man man/cups-driverd.man
 	  man/cups-lpd.man man/cupsaddsmb.man man/cupsd.man
-	  man/cupsd.conf.man man/drv.man man/lpoptions.man
-	  templates/header.tmpl
+	  man/cupsd.conf.man man/lpoptions.man
+	  templates/edit-config.tmpl templates/header.tmpl
 	  $LANGFILES)

 chmod +x cups-config
@@ -4,19 +4,27 @@
 # 
 #   CUPS configuration utility.
 #
-#   Copyright 2007-2008 by Apple Inc.
 #   Copyright 2001-2006 by Easy Software Products, all rights reserved.
 #
 #   These coded instructions, statements, and computer programs are the
-#   property of Apple Inc. and are protected by Federal copyright
-#   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
-#   which should have been included with this file.  If this file is
-#   file is missing or damaged, see the license at "http://www.cups.org/".
+#   property of Easy Software Products and are protected by Federal
+#   copyright law.  Distribution and use rights are outlined in the file
+#   "LICENSE.txt" which should have been included with this file.  If this
+#   file is missing or damaged please contact Easy Software Products
+#   at:
+#
+#       Attn: CUPS Licensing Information
+#       Easy Software Products
+#       44141 Airport View Drive, Suite 204
+#       Hollywood, Maryland 20636 USA
+#
+#       Voice: (301) 373-9600
+#       EMail: cups-info@cups.org
+#         WWW: http://www.cups.org
 #

 VERSION="@CUPS_VERSION@"
-APIVERSION="1.4"
-BUILD="@CUPS_BUILD@"
+APIVERSION="1.2"

 prefix=@prefix@
 exec_prefix=@exec_prefix@
@@ -35,7 +43,7 @@ INSTALLSTATIC=@INSTALLSTATIC@
 # flags for C++ compiler:
 CFLAGS=""
 LDFLAGS="@EXPORT_LDFLAGS@"
-LIBS="@LIBGSSAPI@ @EXPORT_SSLLIBS@ @EXPORT_LIBZ@ @LIBS@"
+LIBS="@EXPORT_SSLLIBS@ @EXPORT_LIBZ@ @LIBS@"
 IMGLIBS="@EXPORT_LIBTIFF@ @EXPORT_LIBJPEG@ @EXPORT_LIBPNG@"

 # Check for local invocation...
@@ -63,12 +71,11 @@ fi
 usage ()
 {
    echo "Usage: cups-config --api-version"
-    echo "       cups-config --build"
    echo "       cups-config --cflags"
    echo "       cups-config --datadir"
    echo "       cups-config --help"
    echo "       cups-config --ldflags"
-    echo "       cups-config [--driver] [--image] [--static] --libs"
+    echo "       cups-config [--image] [--static] --libs"
    echo "       cups-config --serverbin"
    echo "       cups-config --serverroot"
    echo "       cups-config --version"
@@ -83,25 +90,18 @@ fi
 # Parse command line options
 static=no
 image=no
-driver=no

 while test $# -gt 0; do
    case $1 in
 	--api-version)
 	    echo $APIVERSION
 	    ;;
-	--build)
-	    echo $BUILD
-	    ;;
 	--cflags)
 	    echo $CFLAGS
 	    ;;
 	--datadir)
 	    echo $cups_datadir
 	    ;;
-	--driver)
-	    driver=yes
-	    ;;
 	--help)
 	    usage 0
 	    ;;
@@ -113,23 +113,18 @@ while test $# -gt 0; do
 	    ;;
 	--libs)
 	    if test $static = no; then
-	        libs="-lcups $LIBS";
- 	        if test $image = yes; then
- 	            libs="-lcupsimage $libs"
-		fi
- 	        if test $driver = yes; then
- 	            libs="-lcupsdriver $libs"
-		fi
+ 	        if test $image = no; then
+ 	            echo -lcups $LIBS
+ 		else
+ 	            echo -lcupsimage -lcups $IMGLIBS $LIBS
+ 		fi
 	    else
-	        libs="$libdir/libcups.a $LIBS";
- 	        if test $image = yes; then
- 	            libs="$libdir/libcupsimage.a $IMGLIBS $libs"
-		fi
- 	        if test $driver = yes; then
- 	            libs="$libdir/libcupsdriver.a $libs"
+	        if test $image = no; then
+	            echo $libdir/libcups.a $LIBS
+		else
+	            echo $imagelibdir/libcupsimage.a $libdir/libcups.a $IMGLIBS $LIBS
 		fi
 	    fi
-	    echo $libs
 	    ;;
 	--serverbin)
 	    echo $cups_serverbin
--- a/Mostrar Mais
+++ b/Mostrar Mais