Imported Upstream version 1.6.4upstream/1.6.4

author: Didier Raboud <odyx@debian.org> 2013-09-27 11:05:02 +0200
committer: Didier Raboud <odyx@debian.org> 2013-09-27 11:05:02 +0200
commit: e89cd45b5c13f176689eb571884719236b4baa89 (patch)
tree: 895f25ab9018c6f343a261f0c1e5e3ae0bdd9362
parent: 3bbeb8a0d4f608995924ae6360556d4b589bdf4c (diff)
download: cups-upstream/1.6.4.tar.gz
317 files changed, 1243 insertions, 899 deletions
diff --git a/CHANGES.txt b/CHANGES.txt
index 9bf60a65..35d38fb6 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,6 +1,25 @@
-CHANGES.txt - 1.6.3 - 2013-07-11
+CHANGES.txt - 1.6.4 - 2013-09-24
 --------------------------------
 
+CHANGES IN CUPS V1.6.4
+
+	- Removed some duplicate size definitions for some ISO sizes that were
+	  causing problems (<rdar://problem/14722721>)
+	- The IPP backend did not add the "last-document" attribute
+	  (<rdar://problem/114660379>)
+	- Added a SyncOnClose directive to cups-files.conf to force cupsd to
+	  call fsync before closing any configuration/state files it writes
+	  (<rdar://problem/14523043>)
+	- Added USB quirk rule for Lexmark E238 (<rdar://problem/14493054>)
+	- Closed server connections were still not always detected
+	  (<rdar://problem/14484313>)
+	- The libusb-based USB backend now loads its list of quirks from files
+	  in /usr/share/cups/usb instead of using a hardcoded table
+	  (<rdar://problem/14442769>)
+	- The scheduler did not properly register ICC color profiles with
+	  colord (<rdar://problem/14455625>)
+
+
 CHANGES IN CUPS V1.6.3
 
 	- The configure script now prefers Clang over GCC.
diff --git a/INSTALL.txt b/INSTALL.txt
index 948433cf..1688a2bd 100644
--- a/INSTALL.txt
+++ b/INSTALL.txt
@@ -1,4 +1,4 @@
-INSTALL - CUPS v1.6.3 - 2013-07-11
+INSTALL - CUPS v1.6.4 - 2013-09-24
 ----------------------------------
 
 This file describes how to compile and install CUPS from source code. For more
diff --git a/Makedefs.in b/Makedefs.in
index 41612af7..91324406 100644
--- a/Makedefs.in
+++ b/Makedefs.in
@@ -1,9 +1,9 @@
 #
-# "$Id: Makedefs.in 7900 2008-09-03 13:47:57Z mike $"
+# "$Id: Makedefs.in 11173 2013-07-23 12:31:34Z msweet $"
 #
 #   Common makefile definitions for CUPS.
 #
-#   Copyright 2007-2012 by Apple Inc.
+#   Copyright 2007-2013 by Apple Inc.
 #   Copyright 1997-2007 by Easy Software Products, all rights reserved.
 #
 #   These coded instructions, statements, and computer programs are the
@@ -216,6 +216,7 @@ SERVERBIN	= 	$(BUILDROOT)@CUPS_SERVERBIN@
 SERVERROOT	= 	$(BUILDROOT)@CUPS_SERVERROOT@
 SMFMANIFESTDIR	= 	@SMFMANIFESTDIR@
 STATEDIR	=	$(BUILDROOT)@CUPS_STATEDIR@
+USBQUIRKS	=	@USBQUIRKS@
 XINETD		=	@XINETD@
 
 MAN1EXT		=	@MAN1EXT@
@@ -258,5 +259,5 @@ DBUSDIR		=	@DBUSDIR@
 
 
 #
-# End of "$Id: Makedefs.in 7900 2008-09-03 13:47:57Z mike $"
+# End of "$Id: Makedefs.in 11173 2013-07-23 12:31:34Z msweet $"
 #
diff --git a/Makefile b/Makefile
index d1ef21ad..47495ce4 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 #
-# "$Id: Makefile 9391 2010-11-30 21:53:04Z mike $"
+# "$Id: Makefile 11173 2013-07-23 12:31:34Z msweet $"
 #
 #   Top-level Makefile for CUPS.
 #
@@ -332,5 +332,5 @@ dist:	all
 
 
 #
-# End of "$Id: Makefile 9391 2010-11-30 21:53:04Z mike $".
+# End of "$Id: Makefile 11173 2013-07-23 12:31:34Z msweet $".
 #
diff --git a/README.txt b/README.txt
index 353056b9..ecccc390 100644
--- a/README.txt
+++ b/README.txt
@@ -1,4 +1,4 @@
-README - CUPS v1.6.3 - 2013-07-11
+README - CUPS v1.6.4 - 2013-09-24
 ---------------------------------
 
 Looking for compile instructions?  Read the file "INSTALL.txt" instead...
diff --git a/backend/Makefile b/backend/Makefile
index 902bf6e8..ad0d5f62 100644
--- a/backend/Makefile
+++ b/backend/Makefile
@@ -1,9 +1,9 @@
 #
-# "$Id: Makefile 7924 2008-09-10 17:36:13Z mike $"
+# "$Id: Makefile 11173 2013-07-23 12:31:34Z msweet $"
 #
 #   Backend makefile for CUPS.
 #
-#   Copyright 2007-2012 by Apple Inc.
+#   Copyright 2007-2013 by Apple Inc.
 #   Copyright 1997-2007 by Easy Software Products, all rights reserved.
 #
 #   These coded instructions, statements, and computer programs are the
@@ -109,6 +109,11 @@ install:	all install-data install-headers install-libs install-exec
 #
 
 install-data:
+	if test "x$(USBQUIRKS)" != x; then \
+		echo Installing USB quirks in $(USBQUIRKS); \
+		$(INSTALL_DIR) -m 755 $(USBQUIRKS); \
+		$(INSTALL_DATA) org.cups.usb-quirks $(USBQUIRKS); \
+	fi
 
 
 #
@@ -295,5 +300,5 @@ include Dependencies
 
 
 #
-# End of "$Id: Makefile 7924 2008-09-10 17:36:13Z mike $".
+# End of "$Id: Makefile 11173 2013-07-23 12:31:34Z msweet $".
 #
diff --git a/backend/backend-private.h b/backend/backend-private.h
index 980b3e51..9b0eda86 100644
--- a/backend/backend-private.h
+++ b/backend/backend-private.h
@@ -1,5 +1,5 @@
 /*
- * "$Id: backend-private.h 7810 2008-07-29 01:11:15Z mike $"
+ * "$Id: backend-private.h 11173 2013-07-23 12:31:34Z msweet $"
  *
  *   Backend support definitions for CUPS.
  *
@@ -334,5 +334,5 @@ extern int		backendWaitLoop(int snmp_fd, http_addr_t *addr,
 
 
 /*
- * End of "$Id: backend-private.h 7810 2008-07-29 01:11:15Z mike $".
+ * End of "$Id: backend-private.h 11173 2013-07-23 12:31:34Z msweet $".
  */
diff --git a/backend/dnssd.c b/backend/dnssd.c
index b3c594d3..317b39f7 100644
--- a/backend/dnssd.c
+++ b/backend/dnssd.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: dnssd.c 3833 2012-05-23 22:51:18Z msweet $"
+ * "$Id: dnssd.c 11173 2013-07-23 12:31:34Z msweet $"
  *
  *   DNS-SD discovery backend for CUPS.
  *
@@ -1276,5 +1276,5 @@ unquote(char       *dst,		/* I - Destination buffer */
 
 
 /*
- * End of "$Id: dnssd.c 3833 2012-05-23 22:51:18Z msweet $".
+ * End of "$Id: dnssd.c 11173 2013-07-23 12:31:34Z msweet $".
  */
diff --git a/backend/ieee1284.c b/backend/ieee1284.c
index a837325f..b2d1c7d7 100644
--- a/backend/ieee1284.c
+++ b/backend/ieee1284.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: ieee1284.c 7687 2008-06-24 01:28:36Z mike $"
+ * "$Id: ieee1284.c 11173 2013-07-23 12:31:34Z msweet $"
  *
  *   IEEE-1284 support functions for CUPS.
  *
@@ -487,5 +487,5 @@ backendGetMakeModel(
 
 
 /*
- * End of "$Id: ieee1284.c 7687 2008-06-24 01:28:36Z mike $".
+ * End of "$Id: ieee1284.c 11173 2013-07-23 12:31:34Z msweet $".
  */
diff --git a/backend/ipp.c b/backend/ipp.c
index 264405ae..efd570ae 100644
--- a/backend/ipp.c
+++ b/backend/ipp.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: ipp.c 9759 2011-05-11 03:24:33Z mike $"
+ * "$Id: ipp.c 11221 2013-08-06 16:16:01Z msweet $"
  *
  *   IPP backend for CUPS.
  *
@@ -1609,8 +1609,8 @@ main(int  argc,				/* I - Number of command-line args */
 	  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_NAME,
                        "requesting-user-name", NULL, argv[2]);
 
-        if ((i + 1) >= num_files)
-	  ippAddBoolean(request, IPP_TAG_OPERATION, "last-document", 1);
+	ippAddBoolean(request, IPP_TAG_OPERATION, "last-document",
+        	      (i + 1) >= num_files);
 
 	if (document_format)
 	  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_MIMETYPE,
@@ -3391,5 +3391,5 @@ update_reasons(ipp_attribute_t *attr,	/* I - printer-state-reasons or NULL */
 }
 
 /*
- * End of "$Id: ipp.c 9759 2011-05-11 03:24:33Z mike $".
+ * End of "$Id: ipp.c 11221 2013-08-06 16:16:01Z msweet $".
  */
diff --git a/backend/lpd.c b/backend/lpd.c
index 9d9e01b2..8436f998 100644
--- a/backend/lpd.c
+++ b/backend/lpd.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: lpd.c 7740 2008-07-14 23:58:05Z mike $"
+ * "$Id: lpd.c 11173 2013-07-23 12:31:34Z msweet $"
  *
  *   Line Printer Daemon backend for CUPS.
  *
@@ -1331,5 +1331,5 @@ sigterm_handler(int sig)		/* I - Signal */
 
 
 /*
- * End of "$Id: lpd.c 7740 2008-07-14 23:58:05Z mike $".
+ * End of "$Id: lpd.c 11173 2013-07-23 12:31:34Z msweet $".
  */
diff --git a/backend/network.c b/backend/network.c
index 4227319c..e66f49ba 100644
--- a/backend/network.c
+++ b/backend/network.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: network.c 3755 2012-03-30 05:59:14Z msweet $"
+ * "$Id: network.c 11173 2013-07-23 12:31:34Z msweet $"
  *
  *   Common backend network APIs for CUPS.
  *
@@ -322,5 +322,5 @@ backendNetworkSideCB(
 
 
 /*
- * End of "$Id: network.c 3755 2012-03-30 05:59:14Z msweet $".
+ * End of "$Id: network.c 11173 2013-07-23 12:31:34Z msweet $".
  */
diff --git a/backend/org.cups.usb-quirks b/backend/org.cups.usb-quirks
new file mode 100644
index 00000000..567d715d
--- /dev/null
+++ b/backend/org.cups.usb-quirks
@@ -0,0 +1,214 @@
+# USB backend 'quirks' file.
+#
+# This file lists known issues with various vendors or printers.  Each
+# line contains either a comment (starting with #) or the USB vendor ID,
+# product ID (omit for all vendor products), and a list of known issues:
+#
+#   blacklist     The printer is not functional with the USB backend.
+#   no-reattach   Do no re-attach usblp kernel module after printing.
+#   soft-reset    Do a soft reset after printing for cleanup.
+#   unidir        Only supported unidirectional I/O
+#   usb-init      Needs vendor USB initialization string.
+#   vendor-class  Uses vendor-specific class or subclass.
+#   whitelist     The printer is functional with the USB backend.
+
+# HP DeskJet 895C
+0x03f0 0x0004 unidir
+
+# HP DeskJet 880C
+0x03f0 0x0104 unidir
+
+# HP DeskJet 815C
+0x03f0 0x0204 unidir
+
+# HP DeskJet 810C/812C
+0x03f0 0x0304 unidir
+
+# HP DeskJet 830C
+0x03f0 0x0404 unidir
+
+# HP DeskJet 885C
+0x03f0 0x0504 unidir
+
+# HP DeskJet 840C
+0x03f0 0x0604 unidir
+
+# HP DeskJet 816C
+0x03f0 0x0804 unidir
+
+# HP Deskjet 959C
+0x03f0 0x1104 unidir
+
+# NEC Picty900 (HP OEM)
+0x0409 0xefbe unidir
+
+# NEC Picty760 (HP OEM)
+0x0409 0xbef4 unidir
+
+# NEC Picty920 (HP OEM)
+0x0409 0xf0be unidir
+
+# NEC Picty800 (HP OEM)
+0x0409 0xf1be unidir
+
+# Lexmark International, Inc. (e250d), https://bugs.launchpad.net/bugs/1084164
+0x043d 0x00f3 no-reattach
+
+# Kyocera Mita FS 820, by zut <kernel@zut.de>
+0x0482 0x0010 unidir
+
+# Canon, Inc. PIXMA iP6000D Printer, https://bugs.launchpad.net/bugs/1160638
+0x04a9 0x1095 unidir
+
+# Canon, Inc. PIXMA iP4200 Printer, http://www.cups.org/str.php?L4155
+0x04a9 0x10a2 unidir
+
+# Canon, Inc. PIXMA iP4300 Printer, https://bugs.launchpad.net/bugs/1032385
+0x04a9 0x10b6 unidir
+
+# Canon, Inc. MP210 https://bugzilla.redhat.com/show_bug.cgi?id=847923#c53
+0x04a9 0x1721 unidir
+
+# Canon, Inc. MP500 Printer, https://bugs.launchpad.net/bugs/1032456
+0x04a9 0x170c unidir
+
+# Canon, Inc. MP510 Printer, https://bugs.launchpad.net/bugs/1050009
+0x04a9 0x1717 unidir
+
+# Canon, Inc. MP550 Printer, http://www.cups.org/str.php?L4155
+0x04a9 0x173d unidir
+
+# Canon, Inc. MP560 Printer, http://www.cups.org/str.php?L4155
+0x04a9 0x173e unidir
+
+# Canon, Inc. MF4150 Printer, https://bugs.launchpad.net/bugs/1160638
+0x04a9 0x26a3 no-reattach
+
+# Brother Industries, Ltd HL-1430 Laser Printer, https://bugs.launchpad.net/bugs/1038695
+0x04f9 0x001a no-reattach
+
+# Brother Industries, Ltd HL-1440 Laser Printer, https://bugs.launchpad.net/bugs/1000253
+0x04f9 0x000d no-reattach unidir
+
+# Brother Industries, Ltd HL-1450 Laser Printer, https://bugs.launchpad.net/bugs/1000253
+0x04f9 0x000e no-reattach unidir
+
+# Oki Data Corp. Okipage 14ex Printer, https://bugs.launchpad.net/bugs/872483
+0x06bc 0x000b no-reattach
+
+# Oki Data Corp. B410d, https://bugs.launchpad.net/bugs/872483
+0x06bc 0x01c7 no-reattach
+
+# Seiko Epson Corp. Stylus Color 740 / Photo 750, http://bugs.debian.org/697970
+0x04b8 0x0001 no-reattach unidir
+
+# Seiko Epson Corp. Stylus Color 670, https://bugs.launchpad.net/bugs/872483
+0x04b8 0x0005 no-reattach
+
+# Seiko Epson Receipt Printer M129C
+0x04b8 0x0202 vendor-class
+
+# Prolific Technology, Inc. PL2305 Parallel Port (USB -> Parallel adapter), https://bugs.launchpad.net/bugs/987485
+0x067b 0x2305 no-reattach soft-reset unidir
+
+# Xerox Phaser 3124 https://bugzilla.redhat.com/show_bug.cgi?id=867392
+0x0924 0x3ce9 no-reattach
+
+# Xerox WorkCentre 3210 https://bugs.launchpad.net/bugs/1102470
+0x0924 0x4293 no-reattach
+
+# QinHeng Electronics CH340S (USB -> Parallel adapter), https://bugs.launchpad.net/bugs/1000253
+0x1a86 0x7584 no-reattach
+
+# All Samsung devices, https://bugs.launchpad.net/bugs/1032456
+0x04e8 soft-reset
+
+# All Zebra devices, https://bugs.launchpad.net/bugs/1001028
+0x0a5f unidir
+
+# Canon CP-10
+0x04a9 0x304a blacklist
+
+# Canon CP-100
+0x04a9 0x3063 blacklist
+
+# Canon CP-200
+0x04a9 0x307c blacklist
+
+# Canon CP-300
+0x04a9 0x307d blacklist
+
+# Canon CP-220
+0x04a9 0x30bd blacklist
+
+# Canon CP-330
+0x04a9 0x30be blacklist
+
+# Canon SELPHY CP400
+0x04a9 0x30f6 blacklist
+
+# Canon SELPHY CP600
+0x04a9 0x310b blacklist
+
+# Canon SELPHY CP710
+0x04a9 0x3127 blacklist
+
+# Canon SELPHY CP510
+0x04a9 0x3128 blacklist
+
+# Canon SELPHY ES1
+0x04a9 0x3141 blacklist
+
+# Canon SELPHY CP730
+0x04a9 0x3142 blacklist
+
+# Canon SELPHY CP720
+0x04a9 0x3143 blacklist
+
+# Canon SELPHY CP750
+0x04a9 0x3170 blacklist
+
+# Canon SELPHY CP740
+0x04a9 0x3171 blacklist
+
+# Canon SELPHY ES2
+0x04a9 0x3185 blacklist
+
+# Canon SELPHY ES20
+0x04a9 0x3186 blacklist
+
+# Canon SELPHY CP770
+0x04a9 0x31aa blacklist
+
+# Canon SELPHY CP760
+0x04a9 0x31ab blacklist
+
+# Canon SELPHY ES30
+0x04a9 0x31b0 blacklist
+
+# Canon SELPHY CP780
+0x04a9 0x31dd blacklist
+
+# Canon SELPHY ES40
+0x04a9 0x31ee blacklist
+
+# Canon SELPHY CP800
+0x04a9 0x3214 blacklist
+
+# Canon SELPHY CP900
+0x04a9 0x3255 blacklist
+
+# Canon SELPHY CP810
+0x04a9 0x3256 blacklist
+
+# Canon SELPHY CP500
+0x04a9 0x30f5 blacklist
+
+# Canon SELPHY ES3
+0x04a9 0x31af blacklist
+
+# Canon SELPHY CP780
+0x04a9 0x31dd blacklist
+
+# Lexmark E238 (<rdar://problem/14493054>)
+0x043d 0x00d7 no-reattach
diff --git a/backend/runloop.c b/backend/runloop.c
index 0b3f65f7..5a81a61a 100644
--- a/backend/runloop.c
+++ b/backend/runloop.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: runloop.c 9565 2011-02-23 00:08:08Z mike $"
+ * "$Id: runloop.c 11173 2013-07-23 12:31:34Z msweet $"
  *
  *   Common run loop APIs for CUPS backends.
  *
@@ -539,5 +539,5 @@ backendWaitLoop(
 
 
 /*
- * End of "$Id: runloop.c 9565 2011-02-23 00:08:08Z mike $".
+ * End of "$Id: runloop.c 11173 2013-07-23 12:31:34Z msweet $".
  */
diff --git a/backend/snmp-supplies.c b/backend/snmp-supplies.c
index 7d20406b..41d4d75e 100644
--- a/backend/snmp-supplies.c
+++ b/backend/snmp-supplies.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: snmp-supplies.c 4298 2013-05-10 16:52:10Z msweet $"
+ * "$Id: snmp-supplies.c 11173 2013-07-23 12:31:34Z msweet $"
  *
  *   SNMP supplies functions for CUPS.
  *
@@ -1073,5 +1073,5 @@ utf16_to_utf8(
 
 
 /*
- * End of "$Id: snmp-supplies.c 4298 2013-05-10 16:52:10Z msweet $".
+ * End of "$Id: snmp-supplies.c 11173 2013-07-23 12:31:34Z msweet $".
  */
diff --git a/backend/snmp.c b/backend/snmp.c
index cffc7aaf..22620950 100644
--- a/backend/snmp.c
+++ b/backend/snmp.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: snmp.c 7810 2008-07-29 01:11:15Z mike $"
+ * "$Id: snmp.c 11173 2013-07-23 12:31:34Z msweet $"
  *
  *   SNMP discovery backend for CUPS.
  *
@@ -1391,5 +1391,5 @@ update_cache(snmp_cache_t *device,	/* I - Device */
 
 
 /*
- * End of "$Id: snmp.c 7810 2008-07-29 01:11:15Z mike $".
+ * End of "$Id: snmp.c 11173 2013-07-23 12:31:34Z msweet $".
  */
diff --git a/backend/socket.c b/backend/socket.c
index 77255a39..2ec83f22 100644
--- a/backend/socket.c
+++ b/backend/socket.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: socket.c 7881 2008-08-28 20:21:56Z mike $"
+ * "$Id: socket.c 11173 2013-07-23 12:31:34Z msweet $"
  *
  *   AppSocket backend for CUPS.
  *
@@ -535,5 +535,5 @@ wait_bc(int device_fd,			/* I - Socket */
 
 
 /*
- * End of "$Id: socket.c 7881 2008-08-28 20:21:56Z mike $".
+ * End of "$Id: socket.c 11173 2013-07-23 12:31:34Z msweet $".
  */
diff --git a/backend/test1284.c b/backend/test1284.c
index b25bacb9..18861fdd 100644
--- a/backend/test1284.c
+++ b/backend/test1284.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: test1284.c 7465 2008-04-18 16:20:11Z mike $"
+ * "$Id: test1284.c 11173 2013-07-23 12:31:34Z msweet $"
  *
  *   IEEE-1284 support functions test program for CUPS.
  *
@@ -80,5 +80,5 @@ main(int  argc,				/* I - Number of command-line args */
 
 
 /*
- * End of "$Id: test1284.c 7465 2008-04-18 16:20:11Z mike $".
+ * End of "$Id: test1284.c 11173 2013-07-23 12:31:34Z msweet $".
  */
diff --git a/backend/testbackend.c b/backend/testbackend.c
index bff39ebe..065c27ad 100644
--- a/backend/testbackend.c
+++ b/backend/testbackend.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: testbackend.c 3755 2012-03-30 05:59:14Z msweet $"
+ * "$Id: testbackend.c 11173 2013-07-23 12:31:34Z msweet $"
  *
  *   Backend test program for CUPS.
  *
@@ -672,5 +672,5 @@ walk_cb(const char *oid,		/* I - OID */
 
 
 /*
- * End of "$Id: testbackend.c 3755 2012-03-30 05:59:14Z msweet $".
+ * End of "$Id: testbackend.c 11173 2013-07-23 12:31:34Z msweet $".
  */
diff --git a/backend/testsupplies.c b/backend/testsupplies.c
index 0a300bc9..0079ce32 100644
--- a/backend/testsupplies.c
+++ b/backend/testsupplies.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: testsupplies.c 3247 2011-05-12 06:22:31Z msweet $"
+ * "$Id: testsupplies.c 11173 2013-07-23 12:31:34Z msweet $"
  *
  *   SNMP supplies test program for CUPS.
  *
@@ -79,5 +79,5 @@ main(int  argc,				/* I - Number of command-line args */
 
 
 /*
- * End of "$Id: testsupplies.c 3247 2011-05-12 06:22:31Z msweet $".
+ * End of "$Id: testsupplies.c 11173 2013-07-23 12:31:34Z msweet $".
  */
diff --git a/backend/usb-darwin.c b/backend/usb-darwin.c
index 187bf3f5..6d7514d1 100644
--- a/backend/usb-darwin.c
+++ b/backend/usb-darwin.c
@@ -1,5 +1,5 @@
 /*
-* "$Id: usb-darwin.c 7953 2008-09-17 01:43:19Z mike $"
+* "$Id: usb-darwin.c 11173 2013-07-23 12:31:34Z msweet $"
 *
 * Copyright 2005-2012 Apple Inc. All rights reserved.
 *
@@ -2265,5 +2265,5 @@ static void get_device_id(cups_sc_status_t *status,
 
 
 /*
- * End of "$Id: usb-darwin.c 7953 2008-09-17 01:43:19Z mike $".
+ * End of "$Id: usb-darwin.c 11173 2013-07-23 12:31:34Z msweet $".
  */
diff --git a/backend/usb-libusb.c b/backend/usb-libusb.c
index 9fe4a8c6..81010069 100644
--- a/backend/usb-libusb.c
+++ b/backend/usb-libusb.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: usb-libusb.c 10979 2013-05-13 17:39:19Z msweet $"
+ * "$Id: usb-libusb.c 11173 2013-07-23 12:31:34Z msweet $"
  *
  *   LIBUSB interface code for CUPS.
  *
@@ -16,18 +16,20 @@
  *   list_devices()	  - List the available printers.
  *   print_device()	  - Print a file to a USB device.
  *   close_device()	  - Close the connection to the USB printer.
+ *   compare_quirks()	  - Compare two quirks entries.
  *   find_device()	  - Find or enumerate USB printers.
+ *   find_quirks()	  - Find the quirks for the given printer, if any.
  *   get_device_id()	  - Get the IEEE-1284 device ID for the printer.
  *   list_cb()		  - List USB printers for discovery.
+ *   load_quirks()	  - Load all quirks files in the /usr/share/cups/usb
+ *			    directory.
  *   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.
- *   printer_class_soft_reset()' - Do the soft reset request specific to
- *                          printers
- *   quirks()	 	  - Get the known quirks of a given printer model
  *   read_thread()	  - Thread to read the backchannel data on.
  *   sidechannel_thread() - Handle side-channel requests.
  *   soft_reset()	  - Send a soft reset to the device.
+ *   soft_reset_printer() - Do the soft reset request specific to printers
  */
 
 /*
@@ -36,6 +38,7 @@
 
 #include <libusb.h>
 #include <cups/cups-private.h>
+#include <cups/dir.h>
 #include <pthread.h>
 #include <sys/select.h>
 #include <sys/types.h>
@@ -70,15 +73,15 @@ typedef struct usb_printer_s		/**** USB Printer Data ****/
 			read_endp,	/* Read endpoint */
 			protocol,	/* Protocol: 1 = Uni-di, 2 = Bi-di. */
 			usblp_attached,	/* "usblp" kernel module attached? */
-			reset_after_job; /* Set to 1 by print_device() */
-  unsigned int		quirks;		/* Quirks flags */
+			reset_after_job;/* Set to 1 by print_device() */
+  unsigned		quirks;		/* Quirks flags */
   struct libusb_device_handle *handle;	/* Open handle to device */
 } usb_printer_t;
 
 typedef int (*usb_cb_t)(usb_printer_t *, const char *, const char *,
                         const void *);
 
-typedef struct usb_globals_s
+typedef struct usb_globals_s		/* Global USB printer information */
 {
   usb_printer_t		*printer;	/* Printer */
 
@@ -105,143 +108,41 @@ typedef struct usb_globals_s
 } usb_globals_t;
 
 /*
- * Quirks: various printer quirks are handled by this table & its flags.
+ * Quirks: various printer quirks are handled by this structure and its flags.
  *
- * This is copied from the usblp kernel module. So we can easily copy and paste
- * new quirks from the module.
+ * The quirks table used to be compiled into the backend but is now loaded from
+ * one or more files in the /usr/share/cups/usb directory.
  */
 
-struct quirk_printer_struct {
-	int vendorId;
-	int productId;
-	unsigned int quirks;
-};
-
-#define USBLP_QUIRK_BIDIR	0x1	/* reports bidir but requires
-					   unidirectional mode (no INs/reads) */
-#define USBLP_QUIRK_USB_INIT	0x2	/* needs vendor USB init string */
-#define USBLP_QUIRK_BAD_CLASS	0x4	/* descriptor uses vendor-specific
-					   Class or SubClass */
-#define USBLP_QUIRK_BLACKLIST	0x8	/* these printers do not conform to the USB print spec */
-#define USBLP_QUIRK_RESET	0x4000	/* After printing do a reset
-					   for clean-up */
-#define USBLP_QUIRK_NO_REATTACH	0x8000	/* After printing we cannot re-attach
+#define USB_QUIRK_BLACKLIST	0x0001	/* Does not conform to the spec */
+#define USB_QUIRK_NO_REATTACH	0x0002	/* After printing we cannot re-attach
 					   the usblp kernel module */
+#define USB_QUIRK_SOFT_RESET	0x0004	/* After printing do a soft reset
+					   for clean-up */
+#define USB_QUIRK_UNIDIR	0x0008	/* Requires unidirectional mode */
+#define USB_QUIRK_USB_INIT	0x0010	/* Needs vendor USB init string */
+#define USB_QUIRK_VENDOR_CLASS	0x0020	/* Descriptor uses vendor-specific
+					   Class or SubClass */
+#define USB_QUIRK_WHITELIST	0x0000	/* no quirks */
+
+
+typedef struct usb_quirk_s		/* USB "quirk" information */
+{
+  int		vendor_id,		/* Affected vendor ID */
+		product_id;		/* Affected product ID or 0 for all */
+  unsigned	quirks;			/* Quirks bitfield */
+} usb_quirk_t;
+
 
-static const struct quirk_printer_struct quirk_printers[] = {
-	{ 0x03f0, 0x0004, USBLP_QUIRK_BIDIR }, /* HP DeskJet 895C */
-	{ 0x03f0, 0x0104, USBLP_QUIRK_BIDIR }, /* HP DeskJet 880C */
-	{ 0x03f0, 0x0204, USBLP_QUIRK_BIDIR }, /* HP DeskJet 815C */
-	{ 0x03f0, 0x0304, USBLP_QUIRK_BIDIR }, /* HP DeskJet 810C/812C */
-	{ 0x03f0, 0x0404, USBLP_QUIRK_BIDIR }, /* HP DeskJet 830C */
-	{ 0x03f0, 0x0504, USBLP_QUIRK_BIDIR }, /* HP DeskJet 885C */
-	{ 0x03f0, 0x0604, USBLP_QUIRK_BIDIR }, /* HP DeskJet 840C */
-	{ 0x03f0, 0x0804, USBLP_QUIRK_BIDIR }, /* HP DeskJet 816C */
-	{ 0x03f0, 0x1104, USBLP_QUIRK_BIDIR }, /* HP Deskjet 959C */
-	{ 0x0409, 0xefbe, USBLP_QUIRK_BIDIR }, /* NEC Picty900 (HP OEM) */
-	{ 0x0409, 0xbef4, USBLP_QUIRK_BIDIR }, /* NEC Picty760 (HP OEM) */
-	{ 0x0409, 0xf0be, USBLP_QUIRK_BIDIR }, /* NEC Picty920 (HP OEM) */
-	{ 0x0409, 0xf1be, USBLP_QUIRK_BIDIR }, /* NEC Picty800 (HP OEM) */
-	{ 0x043d, 0x00f3, USBLP_QUIRK_NO_REATTACH }, /* Lexmark International,
-		       Inc. (e250d), https://bugs.launchpad.net/bugs/1084164 */
-	{ 0x0482, 0x0010, USBLP_QUIRK_BIDIR }, /* Kyocera Mita FS 820,
-						  by zut <kernel@zut.de> */
-	{ 0x04a9, 0x1095, USBLP_QUIRK_BIDIR }, /* Canon, Inc. PIXMA iP6000D
-			    Printer, https://bugs.launchpad.net/bugs/1160638 */
-	{ 0x04a9, 0x10a2, USBLP_QUIRK_BIDIR }, /* Canon, Inc. PIXMA iP4200
-			    Printer, http://www.cups.org/str.php?L4155 */
-	{ 0x04a9, 0x10b6, USBLP_QUIRK_BIDIR }, /* Canon, Inc. PIXMA iP4300
-			    Printer, https://bugs.launchpad.net/bugs/1032385 */
-	{ 0x04a9, 0x1721, USBLP_QUIRK_BIDIR }, /* Canon, Inc. MP210
-		      https://bugzilla.redhat.com/show_bug.cgi?id=847923#c53 */
-	{ 0x04a9, 0x170c, USBLP_QUIRK_BIDIR }, /* Canon, Inc. MP500
-			    Printer, https://bugs.launchpad.net/bugs/1032456 */
-	{ 0x04a9, 0x1717, USBLP_QUIRK_BIDIR }, /* Canon, Inc. MP510
-			    Printer, https://bugs.launchpad.net/bugs/1050009 */
-	{ 0x04a9, 0x173d, USBLP_QUIRK_BIDIR }, /* Canon, Inc. MP550
-			    Printer, http://www.cups.org/str.php?L4155 */
-	{ 0x04a9, 0x173e, USBLP_QUIRK_BIDIR }, /* Canon, Inc. MP560
-			    Printer, http://www.cups.org/str.php?L4155 */
-	{ 0x04a9, 0x26a3, USBLP_QUIRK_NO_REATTACH }, /* Canon, Inc. MF4150
-		            Printer, https://bugs.launchpad.net/bugs/1160638 */
-	{ 0x04f9, 0x001a, USBLP_QUIRK_NO_REATTACH }, /* Brother Industries, Ltd
-						  HL-1430 Laser Printer,
-				     https://bugs.launchpad.net/bugs/1038695 */
-	{ 0x04f9, 0x000d, USBLP_QUIRK_BIDIR |
-			  USBLP_QUIRK_NO_REATTACH }, /* Brother Industries, Ltd
-						  HL-1440 Laser Printer,
-				     https://bugs.launchpad.net/bugs/1000253 */
-	{ 0x04f9, 0x000e, USBLP_QUIRK_BIDIR |
-			  USBLP_QUIRK_NO_REATTACH }, /* Brother Industries, Ltd
-						  HL-1450 Laser Printer,
-				     https://bugs.launchpad.net/bugs/1000253 */
-	{ 0x06bc, 0x000b, USBLP_QUIRK_NO_REATTACH }, /* Oki Data Corp.
-						  Okipage 14ex Printer,
-				     https://bugs.launchpad.net/bugs/872483 */
-	{ 0x06bc, 0x01c7, USBLP_QUIRK_NO_REATTACH }, /* Oki Data Corp. B410d,
-				     https://bugs.launchpad.net/bugs/872483 */
-	{ 0x04b8, 0x0001, USBLP_QUIRK_BIDIR |
-			  USBLP_QUIRK_NO_REATTACH }, /* Seiko Epson Corp. Stylus Color 740 / Photo 750,
-				     http://bugs.debian.org/697970 */
-	{ 0x04b8, 0x0005, USBLP_QUIRK_NO_REATTACH }, /* Seiko Epson Corp. Stylus Color 670,
-				     https://bugs.launchpad.net/bugs/872483 */
-	{ 0x04b8, 0x0202, USBLP_QUIRK_BAD_CLASS }, /* Seiko Epson Receipt
-						      Printer M129C */
-	{ 0x067b, 0x2305, USBLP_QUIRK_BIDIR |
-			  USBLP_QUIRK_NO_REATTACH |
-	                  USBLP_QUIRK_RESET },
-	/* Prolific Technology, Inc. PL2305 Parallel Port
-	   (USB -> Parallel adapter), https://bugs.launchpad.net/bugs/987485 */
-	{ 0x0924, 0x3ce9, USBLP_QUIRK_NO_REATTACH }, /* Xerox Phaser 3124
-			  https://bugzilla.redhat.com/show_bug.cgi?id=867392 */
-	{ 0x0924, 0x4293, USBLP_QUIRK_NO_REATTACH }, /* Xerox WorkCentre 3210
-				     https://bugs.launchpad.net/bugs/1102470 */
-	{ 0x1a86, 0x7584, USBLP_QUIRK_NO_REATTACH }, /* QinHeng Electronics
-   CH340S (USB -> Parallel adapter), https://bugs.launchpad.net/bugs/1000253 */
-	{ 0x04e8, 0x0000, USBLP_QUIRK_RESET }, /* All Samsung devices,
-				     https://bugs.launchpad.net/bugs/1032456 */
-	{ 0x0a5f, 0x0000, USBLP_QUIRK_BIDIR }, /* All Zebra devices,
-				     https://bugs.launchpad.net/bugs/1001028 */
-	/* Canon */
-	{ 0x04a9, 0x304a, USBLP_QUIRK_BLACKLIST }, /* Canon CP-10 */
-	{ 0x04a9, 0x3063, USBLP_QUIRK_BLACKLIST }, /* Canon CP-100 */
-	{ 0x04a9, 0x307c, USBLP_QUIRK_BLACKLIST }, /* Canon CP-200 */
-	{ 0x04a9, 0x307d, USBLP_QUIRK_BLACKLIST }, /* Canon CP-300 */
-	{ 0x04a9, 0x30bd, USBLP_QUIRK_BLACKLIST }, /* Canon CP-220 */
-	{ 0x04a9, 0x30be, USBLP_QUIRK_BLACKLIST }, /* Canon CP-330 */
-	{ 0x04a9, 0x30f6, USBLP_QUIRK_BLACKLIST }, /* Canon SELPHY CP400 */
-	{ 0x04a9, 0x310b, USBLP_QUIRK_BLACKLIST }, /* Canon SELPHY CP600 */
-	{ 0x04a9, 0x3127, USBLP_QUIRK_BLACKLIST }, /* Canon SELPHY CP710 */
-	{ 0x04a9, 0x3128, USBLP_QUIRK_BLACKLIST }, /* Canon SELPHY CP510 */
-	{ 0x04a9, 0x3141, USBLP_QUIRK_BLACKLIST }, /* Canon SELPHY ES1 */
-	{ 0x04a9, 0x3142, USBLP_QUIRK_BLACKLIST }, /* Canon SELPHY CP730 */
-	{ 0x04a9, 0x3143, USBLP_QUIRK_BLACKLIST }, /* Canon SELPHY CP720 */
-	{ 0x04a9, 0x3170, USBLP_QUIRK_BLACKLIST }, /* Canon SELPHY CP750 */
-	{ 0x04a9, 0x3171, USBLP_QUIRK_BLACKLIST }, /* Canon SELPHY CP740 */
-	{ 0x04a9, 0x3185, USBLP_QUIRK_BLACKLIST }, /* Canon SELPHY ES2 */
-	{ 0x04a9, 0x3186, USBLP_QUIRK_BLACKLIST }, /* Canon SELPHY ES20 */
-	{ 0x04a9, 0x31aa, USBLP_QUIRK_BLACKLIST }, /* Canon SELPHY CP770 */
-	{ 0x04a9, 0x31ab, USBLP_QUIRK_BLACKLIST }, /* Canon SELPHY CP760 */
-	{ 0x04a9, 0x31b0, USBLP_QUIRK_BLACKLIST }, /* Canon SELPHY ES30 */
-	{ 0x04a9, 0x31dd, USBLP_QUIRK_BLACKLIST }, /* Canon SELPHY CP780 */
-	{ 0x04a9, 0x31ee, USBLP_QUIRK_BLACKLIST }, /* Canon SELPHY ES40 */
-	{ 0x04a9, 0x3214, USBLP_QUIRK_BLACKLIST }, /* Canon SELPHY CP800 */
-	{ 0x04a9, 0x3255, USBLP_QUIRK_BLACKLIST }, /* Canon SELPHY CP900 */
-	{ 0x04a9, 0x3256, USBLP_QUIRK_BLACKLIST }, /* Canon SELPHY CP810 */
-	{ 0x04a9, 0x30F5, USBLP_QUIRK_BLACKLIST }, /* Canon SELPHY CP500 */
-	{ 0x04a9, 0x31AF, USBLP_QUIRK_BLACKLIST }, /* Canon SELPHY ES3 */
-	{ 0x04a9, 0x31DD, USBLP_QUIRK_BLACKLIST }, /* Canon SELPHY CP780 */
-	 /* MISSING PIDs: CP520, CP530, CP790 */
-	{ 0, 0 }
-};
 
 
 /*
  * Globals...
  */
 
+cups_array_t		*all_quirks;	/* Array of printer quirks */
 usb_globals_t		g = { 0 };	/* Globals */
-libusb_device           **list;         /* List of connected USB devices */
+libusb_device		**all_list;	/* List of connected USB devices */
 
 
 /*
@@ -249,22 +150,24 @@ libusb_device           **list;         /* List of connected USB devices */
  */
 
 static int		close_device(usb_printer_t *printer);
+static int		compare_quirks(usb_quirk_t *a, usb_quirk_t *b);
 static usb_printer_t	*find_device(usb_cb_t cb, const void *data);
+static unsigned		find_quirks(int vendor_id, int product_id);
 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 void		load_quirks(void);
 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 int		printer_class_soft_reset(usb_printer_t *printer);
-static unsigned int	quirks(int vendor, int product);
 static void		*read_thread(void *reference);
 static void		*sidechannel_thread(void *reference);
 static void		soft_reset(void);
+static int		soft_reset_printer(usb_printer_t *printer);
 
 
 /*
@@ -274,6 +177,8 @@ static void		soft_reset(void);
 void
 list_devices(void)
 {
+  load_quirks();
+
   fputs("DEBUG: list_devices\n", stderr);
   find_device(list_cb, NULL);
 }
@@ -316,6 +221,8 @@ print_device(const char *uri,		/* I - Device URI */
   const char	*val;			/* Option value */
 
 
+  load_quirks();
+
  /*
   * See if the side-channel descriptor is valid...
   */
@@ -341,9 +248,9 @@ print_device(const char *uri,		/* I - Device URI */
 
  /*
   * Some devices need a reset after finishing a job, these devices are
-  * marked with the USBLP_QUIRK_RESET quirk.
+  * marked with the USB_QUIRK_SOFT_RESET quirk.
   */
-  g.printer->reset_after_job = (g.printer->quirks & USBLP_QUIRK_RESET ? 1 : 0);
+  g.printer->reset_after_job = (g.printer->quirks & USB_QUIRK_SOFT_RESET ? 1 : 0);
 
  /*
   * If we are printing data from a print driver on stdin, ignore SIGTERM
@@ -760,7 +667,7 @@ print_device(const char *uri,		/* I - Device URI */
   * Clean up ....
   */
 
-  libusb_free_device_list(list, 1);
+  libusb_free_device_list(all_list, 1);
   libusb_exit(NULL);
 
   return (status);
@@ -880,6 +787,23 @@ close_device(usb_printer_t *printer)	/* I - Printer */
 
 
 /*
+ * 'compare_quirks()' - Compare two quirks entries.
+ */
+
+static int				/* O - Result of comparison */
+compare_quirks(usb_quirk_t *a,		/* I - First quirk entry */
+               usb_quirk_t *b)		/* I - Second quirk entry */
+{
+  int result;				/* Result of comparison */
+
+  if ((result = b->vendor_id - a->vendor_id) == 0)
+    result = b->product_id - a->product_id;
+
+  return (result);
+}
+
+
+/*
  * 'find_device()' - Find or enumerate USB printers.
  */
 
@@ -923,7 +847,7 @@ find_device(usb_cb_t   cb,		/* I - Callback function */
   if (err)
   {
     fprintf(stderr, "DEBUG: Unable to initialize USB access via libusb, "
-                    "libusb error %i\n", err);
+                    "libusb error %i\n", (int)err);
     return (NULL);
   }
 
@@ -951,13 +875,13 @@ find_device(usb_cb_t   cb,		/* I - Callback function */
           !devdesc.idProduct)
 	continue;
 
-      printer.quirks = quirks(devdesc.idVendor, devdesc.idProduct);
+      printer.quirks = find_quirks(devdesc.idVendor, devdesc.idProduct);
 
      /*
       * Ignore blacklisted printers...
       */
 
-      if (printer.quirks & USBLP_QUIRK_BLACKLIST)
+      if (printer.quirks & USB_QUIRK_BLACKLIST)
         continue;
 
       for (conf = 0; conf < devdesc.bNumConfigurations; conf ++)
@@ -986,13 +910,13 @@ find_device(usb_cb_t   cb,		/* I - Callback function */
 
 	    if (((altptr->bInterfaceClass != LIBUSB_CLASS_PRINTER ||
 		  altptr->bInterfaceSubClass != 1) &&
-		 ((printer.quirks & USBLP_QUIRK_BAD_CLASS) == 0)) ||
+		 ((printer.quirks & USB_QUIRK_VENDOR_CLASS) == 0)) ||
 		(altptr->bInterfaceProtocol != 1 &&	/* Unidirectional */
 		 altptr->bInterfaceProtocol != 2) ||	/* Bidirectional */
 		altptr->bInterfaceProtocol < protocol)
 	      continue;
 
-	    if (printer.quirks & USBLP_QUIRK_BAD_CLASS)
+	    if (printer.quirks & USB_QUIRK_VENDOR_CLASS)
 	      fprintf(stderr, "DEBUG: Printer does not report class 7 and/or "
 		      "subclass 1 but works as a printer anyway\n");
 
@@ -1049,7 +973,7 @@ find_device(usb_cb_t   cb,		/* I - Callback function */
 	      {
 		fprintf(stderr, "DEBUG: Device protocol: %d\n",
 			printer.protocol);
-		if (printer.quirks & USBLP_QUIRK_BIDIR)
+		if (printer.quirks & USB_QUIRK_UNIDIR)
 		{
 		  printer.read_endp = -1;
 		  fprintf(stderr, "DEBUG: Printer reports bi-di support "
@@ -1069,7 +993,7 @@ find_device(usb_cb_t   cb,		/* I - Callback function */
 					   altsetting[printer.altset].
 					   endpoint[printer.write_endp].
 					   bEndpointAddress;
-		if (printer.quirks & USBLP_QUIRK_NO_REATTACH)
+		if (printer.quirks & USB_QUIRK_NO_REATTACH)
 		{
 		  printer.usblp_attached = 0;
 		  fprintf(stderr, "DEBUG: Printer does not like usblp "
@@ -1105,6 +1029,35 @@ find_device(usb_cb_t   cb,		/* I - Callback function */
 
 
 /*
+ * 'find_quirks()' - Find the quirks for the given printer, if any.
+ *
+ * First looks for an exact match, then looks for the vendor ID wildcard match.
+ */
+
+static unsigned				/* O - Quirks flags */
+find_quirks(int vendor_id,		/* I - Vendor ID */
+            int product_id)		/* I - Product ID */
+{
+  usb_quirk_t	key,			/* Search key */
+		*match;			/* Matching quirk entry */
+
+
+  key.vendor_id  = vendor_id;
+  key.product_id = product_id;
+
+  if ((match = cupsArrayFind(all_quirks, &key)) != NULL)
+    return (match->quirks);
+
+  key.product_id = 0;
+
+  if ((match = cupsArrayFind(all_quirks, &key)) != NULL)
+    return (match->quirks);
+
+  return (USB_QUIRK_WHITELIST);
+}
+
+
+/*
  * 'get_device_id()' - Get the IEEE-1284 device ID for the printer.
  */
 
@@ -1210,6 +1163,104 @@ list_cb(usb_printer_t *printer,		/* I - Printer */
 
 
 /*
+ * 'load_quirks()' - Load all quirks files in the /usr/share/cups/usb directory.
+ */
+
+static void
+load_quirks(void)
+{
+  const char	*datadir;		/* CUPS_DATADIR environment variable */
+  char		filename[1024],		/* Filename */
+		line[1024];		/* Line from file */
+  cups_dir_t	*dir;			/* Directory */
+  cups_dentry_t	*dent;			/* Directory entry */
+  cups_file_t	*fp;			/* Quirks file */
+  usb_quirk_t	*quirk;			/* New quirk */
+
+
+  all_quirks = cupsArrayNew((cups_array_func_t)compare_quirks, NULL);
+
+  if ((datadir = getenv("CUPS_DATADIR")) == NULL)
+    datadir = CUPS_DATADIR;
+
+  snprintf(filename, sizeof(filename), "%s/usb", datadir);
+  if ((dir = cupsDirOpen(filename)) == NULL)
+  {
+    perror(filename);
+    return;
+  }
+
+  fprintf(stderr, "DEBUG: Loading USB quirks from \"%s\".\n", filename);
+
+  while ((dent = cupsDirRead(dir)) != NULL)
+  {
+    if (!S_ISREG(dent->fileinfo.st_mode))
+      continue;
+
+    snprintf(filename, sizeof(filename), "%s/usb/%s", datadir, dent->filename);
+    if ((fp = cupsFileOpen(filename, "r")) == NULL)
+    {
+      perror(filename);
+      continue;
+    }
+
+    while (cupsFileGets(fp, line, sizeof(line)))
+    {
+     /*
+      * Skip blank and comment lines...
+      */
+
+      if (line[0] == '#' || !line[0])
+        continue;
+
+     /*
+      * Add a quirk...
+      */
+
+      if ((quirk = calloc(1, sizeof(usb_quirk_t))) == NULL)
+      {
+        perror("DEBUG: Unable to allocate memory for quirk");
+        break;
+      }
+
+      if (sscanf(line, "%x%x", &quirk->vendor_id, &quirk->product_id) < 1)
+      {
+        fprintf(stderr, "DEBUG: Bad line: %s\n", line);
+        free(quirk);
+        continue;
+      }
+
+      if (strstr(line, " blacklist"))
+        quirk->quirks |= USB_QUIRK_BLACKLIST;
+
+      if (strstr(line, " no-reattach"))
+        quirk->quirks |= USB_QUIRK_NO_REATTACH;
+
+      if (strstr(line, " soft-reset"))
+        quirk->quirks |= USB_QUIRK_SOFT_RESET;
+
+      if (strstr(line, " unidir"))
+        quirk->quirks |= USB_QUIRK_UNIDIR;
+
+      if (strstr(line, " usb-init"))
+        quirk->quirks |= USB_QUIRK_USB_INIT;
+
+      if (strstr(line, " vendor-class"))
+        quirk->quirks |= USB_QUIRK_VENDOR_CLASS;
+
+      cupsArrayAdd(all_quirks, quirk);
+    }
+
+    cupsFileClose(fp);
+  }
+
+  fprintf(stderr, "DEBUG: Loaded %d quirks.\n", cupsArrayCount(all_quirks));
+
+  cupsDirClose(dir);
+}
+
+
+/*
  * 'make_device_uri()' - Create a device URI for a USB printer.
  */
 
@@ -1636,65 +1687,6 @@ print_cb(usb_printer_t *printer,	/* I - Printer */
 
 
 /*
- * 'printer_class_soft_reset()' - Do the soft reset request specific to printers
- *
- * This soft reset is specific to the printer device class and is much less
- * invasive than the general USB reset libusb_reset_device(). Especially it
- * does never happen that the USB addressing and configuration changes. What
- * is actually done is that all buffers get flushed and the bulk IN and OUT
- * pipes get reset to their default states. This clears all stall conditions.
- * See http://cholla.mmto.org/computers/linux/usb/usbprint11.pdf
- */
-
-static int				/* O - 0 on success, < 0 on error */
-printer_class_soft_reset(usb_printer_t *printer) /* I - Printer */
-{
-  struct libusb_config_descriptor *confptr = NULL;
-                                        /* Pointer to current configuration */
-  int interface,
-      errcode;
-
-  if (libusb_get_config_descriptor(printer->device, printer->conf, &confptr)
-      < 0)
-    interface = printer->iface;
-  else
-    interface = confptr->interface[printer->iface].
-      altsetting[printer->altset].bInterfaceNumber;
-  libusb_free_config_descriptor(confptr);
-  if ((errcode = libusb_control_transfer(printer->handle,
-					 LIBUSB_REQUEST_TYPE_CLASS |
-					 LIBUSB_ENDPOINT_OUT |
-					 LIBUSB_RECIPIENT_OTHER,
-					 2, 0, interface, NULL, 0, 5000)) < 0)
-    errcode = libusb_control_transfer(printer->handle,
-				      LIBUSB_REQUEST_TYPE_CLASS |
-				      LIBUSB_ENDPOINT_OUT |
-				      LIBUSB_RECIPIENT_INTERFACE,
-				      2, 0, interface, NULL, 0, 5000);
-  return errcode;
-}
-
-
-/*
- * 'quirks()' - Get the known quirks of a given printer model
- */
-
-static unsigned int quirks(int vendor, int product)
-{
-  int i;
-
-  for (i = 0; quirk_printers[i].vendorId; i++)
-  {
-    if (vendor == quirk_printers[i].vendorId &&
-	(quirk_printers[i].productId == 0x0000 ||
-	 product == quirk_printers[i].productId))
-      return quirk_printers[i].quirks;
-  }
-  return 0;
-}
-
-
-/*
  * 'read_thread()' - Thread to read the backchannel data on.
  */
 
@@ -1917,13 +1909,15 @@ sidechannel_thread(void *reference)
  * 'soft_reset()' - Send a soft reset to the device.
  */
 
-static void soft_reset(void)
+static void
+soft_reset(void)
 {
   fd_set	  input_set;		/* Input set for select() */
   struct timeval  tv;			/* Time value */
   char		  buffer[2048];		/* Buffer */
   struct timespec cond_timeout;		/* pthread condition timeout */
 
+
  /*
   * Send an abort once a second until the I/O lock is released by the main
   * thread...
@@ -1968,7 +1962,7 @@ static void soft_reset(void)
   * Send the reset...
   */
 
-  printer_class_soft_reset(g.printer);
+  soft_reset_printer(g.printer);
 
  /*
   * Release the I/O lock...
@@ -1982,6 +1976,51 @@ static void soft_reset(void)
 
 
 /*
- * End of "$Id: usb-libusb.c 10979 2013-05-13 17:39:19Z msweet $".
+ * 'soft_reset_printer()' - Do the soft reset request specific to printers
+ *
+ * This soft reset is specific to the printer device class and is much less
+ * invasive than the general USB reset libusb_reset_device(). Especially it
+ * does never happen that the USB addressing and configuration changes. What
+ * is actually done is that all buffers get flushed and the bulk IN and OUT
+ * pipes get reset to their default states. This clears all stall conditions.
+ * See http://cholla.mmto.org/computers/linux/usb/usbprint11.pdf
+ */
+
+static int				/* O - 0 on success, < 0 on error */
+soft_reset_printer(
+    usb_printer_t *printer)		/* I - Printer */
+{
+  struct libusb_config_descriptor *confptr = NULL;
+                                        /* Pointer to current configuration */
+  int interface,			/* Interface to reset */
+      errcode;				/* Error code */
+
+
+  if (libusb_get_config_descriptor(printer->device, printer->conf,
+                                   &confptr) < 0)
+    interface = printer->iface;
+  else
+    interface = confptr->interface[printer->iface].
+                         altsetting[printer->altset].bInterfaceNumber;
+
+  libusb_free_config_descriptor(confptr);
+
+  if ((errcode = libusb_control_transfer(printer->handle,
+					 LIBUSB_REQUEST_TYPE_CLASS |
+					 LIBUSB_ENDPOINT_OUT |
+					 LIBUSB_RECIPIENT_OTHER,
+					 2, 0, interface, NULL, 0, 5000)) < 0)
+    errcode = libusb_control_transfer(printer->handle,
+				      LIBUSB_REQUEST_TYPE_CLASS |
+				      LIBUSB_ENDPOINT_OUT |
+				      LIBUSB_RECIPIENT_INTERFACE,
+				      2, 0, interface, NULL, 0, 5000);
+
+  return (errcode);
+}
+
+
+/*
+ * End of "$Id: usb-libusb.c 11173 2013-07-23 12:31:34Z msweet $".
  */
 
diff --git a/backend/usb-unix.c b/backend/usb-unix.c
index b06825f7..adcd254e 100644
--- a/backend/usb-unix.c
+++ b/backend/usb-unix.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: usb-unix.c 7810 2008-07-29 01:11:15Z mike $"
+ * "$Id: usb-unix.c 11173 2013-07-23 12:31:34Z msweet $"
  *
  *   USB port backend for CUPS.
  *
@@ -613,5 +613,5 @@ side_cb(int         print_fd,		/* I - Print file */
 
 
 /*
- * End of "$Id: usb-unix.c 7810 2008-07-29 01:11:15Z mike $".
+ * End of "$Id: usb-unix.c 11173 2013-07-23 12:31:34Z msweet $".
  */
diff --git a/backend/usb.c b/backend/usb.c
index 2e024e61..914a4acb 100644
--- a/backend/usb.c
+++ b/backend/usb.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: usb.c 7687 2008-06-24 01:28:36Z mike $"
+ * "$Id: usb.c 11173 2013-07-23 12:31:34Z msweet $"
  *
  *   USB port backend for CUPS.
  *
@@ -260,5 +260,5 @@ main(int  argc,				/* I - Number of command-line arguments (6 or 7) */
 
 
 /*
- * End of "$Id: usb.c 7687 2008-06-24 01:28:36Z mike $".
+ * End of "$Id: usb.c 11173 2013-07-23 12:31:34Z msweet $".
  */
diff --git a/berkeley/Makefile b/berkeley/Makefile
index 8a154c50..8f208ae4 100644
--- a/berkeley/Makefile
+++ b/berkeley/Makefile
@@ -1,5 +1,5 @@
 #
-# "$Id: Makefile 7871 2008-08-27 21:12:43Z mike $"
+# "$Id: Makefile 11173 2013-07-23 12:31:34Z msweet $"
 #
 #   Berkeley commands makefile for CUPS.
 #
@@ -163,5 +163,5 @@ include Dependencies
 
 
 #
-# End of "$Id: Makefile 7871 2008-08-27 21:12:43Z mike $".
+# End of "$Id: Makefile 11173 2013-07-23 12:31:34Z msweet $".
 #
diff --git a/berkeley/lpc.c b/berkeley/lpc.c
index e1003b1b..e402a780 100644
--- a/berkeley/lpc.c
+++ b/berkeley/lpc.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: lpc.c 7079 2007-11-30 01:58:31Z mike $"
+ * "$Id: lpc.c 11173 2013-07-23 12:31:34Z msweet $"
  *
  *   "lpc" command for CUPS.
  *
@@ -446,5 +446,5 @@ show_status(http_t     *http,		/* I - HTTP connection to server */
 
 
 /*
- * End of "$Id: lpc.c 7079 2007-11-30 01:58:31Z mike $".
+ * End of "$Id: lpc.c 11173 2013-07-23 12:31:34Z msweet $".
  */
diff --git a/berkeley/lpq.c b/berkeley/lpq.c
index 1071817e..d3839d5e 100644
--- a/berkeley/lpq.c
+++ b/berkeley/lpq.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: lpq.c 7460 2008-04-16 02:19:54Z mike $"
+ * "$Id: lpq.c 11173 2013-07-23 12:31:34Z msweet $"
  *
  *   "lpq" command for CUPS.
  *
@@ -679,5 +679,5 @@ usage(void)
 
 
 /*
- * End of "$Id: lpq.c 7460 2008-04-16 02:19:54Z mike $".
+ * End of "$Id: lpq.c 11173 2013-07-23 12:31:34Z msweet $".
  */
diff --git a/berkeley/lpr.c b/berkeley/lpr.c
index 5f983748..724a0c1e 100644
--- a/berkeley/lpr.c
+++ b/berkeley/lpr.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: lpr.c 7720 2008-07-11 22:46:21Z mike $"
+ * "$Id: lpr.c 11173 2013-07-23 12:31:34Z msweet $"
  *
  *   "lpr" command for CUPS.
  *
@@ -436,5 +436,5 @@ main(int  argc,				/* I - Number of command-line arguments */
 
 
 /*
- * End of "$Id: lpr.c 7720 2008-07-11 22:46:21Z mike $".
+ * End of "$Id: lpr.c 11173 2013-07-23 12:31:34Z msweet $".
  */
diff --git a/berkeley/lprm.c b/berkeley/lprm.c
index 5e12c74f..3427deff 100644
--- a/berkeley/lprm.c
+++ b/berkeley/lprm.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: lprm.c 7261 2008-01-28 23:09:31Z mike $"
+ * "$Id: lprm.c 11173 2013-07-23 12:31:34Z msweet $"
  *
  *   "lprm" command for CUPS.
  *
@@ -213,5 +213,5 @@ main(int  argc,			/* I - Number of command-line arguments */
 
 
 /*
- * End of "$Id: lprm.c 7261 2008-01-28 23:09:31Z mike $".
+ * End of "$Id: lprm.c 11173 2013-07-23 12:31:34Z msweet $".
  */
diff --git a/cgi-bin/Makefile b/cgi-bin/Makefile
index 15260420..a3d52658 100644
--- a/cgi-bin/Makefile
+++ b/cgi-bin/Makefile
@@ -1,5 +1,5 @@
 #
-# "$Id: Makefile 7871 2008-08-27 21:12:43Z mike $"
+# "$Id: Makefile 11173 2013-07-23 12:31:34Z msweet $"
 #
 #   CGI makefile for CUPS.
 #
@@ -378,5 +378,5 @@ include Dependencies
 
 
 #
-# End of "$Id: Makefile 7871 2008-08-27 21:12:43Z mike $".
+# End of "$Id: Makefile 11173 2013-07-23 12:31:34Z msweet $".
 #
diff --git a/cgi-bin/admin.c b/cgi-bin/admin.c
index d0f488e5..c30b590b 100644
--- a/cgi-bin/admin.c
+++ b/cgi-bin/admin.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: admin.c 8029 2008-10-08 21:07:45Z mike $"
+ * "$Id: admin.c 11173 2013-07-23 12:31:34Z msweet $"
  *
  *   Administration CGI for CUPS.
  *
@@ -4218,5 +4218,5 @@ get_points(double     number,		/* I - Original number */
 
 
 /*
- * End of "$Id: admin.c 8029 2008-10-08 21:07:45Z mike $".
+ * End of "$Id: admin.c 11173 2013-07-23 12:31:34Z msweet $".
  */
diff --git a/cgi-bin/cgi-private.h b/cgi-bin/cgi-private.h
index 412bdc39..348da082 100644
--- a/cgi-bin/cgi-private.h
+++ b/cgi-bin/cgi-private.h
@@ -1,5 +1,5 @@
 /*
- * "$Id: cgi-private.h 7940 2008-09-16 00:45:16Z mike $"
+ * "$Id: cgi-private.h 11173 2013-07-23 12:31:34Z msweet $"
  *
  *   Private CGI definitions for CUPS.
  *
@@ -32,5 +32,5 @@
 
 
 /*
- * End of "$Id: cgi-private.h 7940 2008-09-16 00:45:16Z mike $".
+ * End of "$Id: cgi-private.h 11173 2013-07-23 12:31:34Z msweet $".
  */
diff --git a/cgi-bin/cgi.h b/cgi-bin/cgi.h
index bceb5f51..4d76a026 100644
--- a/cgi-bin/cgi.h
+++ b/cgi-bin/cgi.h
@@ -1,5 +1,5 @@
 /*
- * "$Id: cgi.h 6649 2007-07-11 21:46:42Z mike $"
+ * "$Id: cgi.h 11173 2013-07-23 12:31:34Z msweet $"
  *
  *   CGI support library definitions for CUPS.
  *
@@ -115,5 +115,5 @@ extern const char	*cgiText(const char *message);
 #endif /* !_CUPS_CGI_H_ */
 
 /*
- * End of "$Id: cgi.h 6649 2007-07-11 21:46:42Z mike $".
+ * End of "$Id: cgi.h 11173 2013-07-23 12:31:34Z msweet $".
  */
diff --git a/cgi-bin/classes.c b/cgi-bin/classes.c
index 8d42e5cd..47bcedf6 100644
--- a/cgi-bin/classes.c
+++ b/cgi-bin/classes.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: classes.c 7940 2008-09-16 00:45:16Z mike $"
+ * "$Id: classes.c 11173 2013-07-23 12:31:34Z msweet $"
  *
  *   Class status CGI for CUPS.
  *
@@ -554,5 +554,5 @@ show_class(http_t     *http,		/* I - Connection to server */
 
 
 /*
- * End of "$Id: classes.c 7940 2008-09-16 00:45:16Z mike $".
+ * End of "$Id: classes.c 11173 2013-07-23 12:31:34Z msweet $".
  */
diff --git a/cgi-bin/help-index.c b/cgi-bin/help-index.c
index c48ffeb4..195c1f62 100644
--- a/cgi-bin/help-index.c
+++ b/cgi-bin/help-index.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: help-index.c 7717 2008-07-04 02:35:33Z mike $"
+ * "$Id: help-index.c 11173 2013-07-23 12:31:34Z msweet $"
  *
  *   Online help index routines for CUPS.
  *
@@ -1324,5 +1324,5 @@ help_sort_words(help_word_t *w1,	/* I - Second word */
 
 
 /*
- * End of "$Id: help-index.c 7717 2008-07-04 02:35:33Z mike $".
+ * End of "$Id: help-index.c 11173 2013-07-23 12:31:34Z msweet $".
  */
diff --git a/cgi-bin/help-index.h b/cgi-bin/help-index.h
index 676be675..4b039698 100644
--- a/cgi-bin/help-index.h
+++ b/cgi-bin/help-index.h
@@ -1,5 +1,5 @@
 /*
- * "$Id: help-index.h 7615 2008-05-25 07:17:07Z mike $"
+ * "$Id: help-index.h 11173 2013-07-23 12:31:34Z msweet $"
  *
  *   Online help index definitions for CUPS.
  *
@@ -83,5 +83,5 @@ extern help_index_t	*helpSearchIndex(help_index_t *hi, const char *query,
 #endif /* !_CUPS_HELP_INDEX_H_ */
 
 /*
- * End of "$Id: help-index.h 7615 2008-05-25 07:17:07Z mike $".
+ * End of "$Id: help-index.h 11173 2013-07-23 12:31:34Z msweet $".
  */
diff --git a/cgi-bin/help.c b/cgi-bin/help.c
index 215c98bc..c8fc66e1 100644
--- a/cgi-bin/help.c
+++ b/cgi-bin/help.c
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: help.c 11173 2013-07-23 12:31:34Z msweet $"
  *
  *   Online help CGI for CUPS.
  *
@@ -393,5 +393,5 @@ main(int  argc,				/* I - Number of command-line arguments */
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: help.c 11173 2013-07-23 12:31:34Z msweet $".
  */
diff --git a/cgi-bin/html.c b/cgi-bin/html.c
index ea2b3f70..b721ee3a 100644
--- a/cgi-bin/html.c
+++ b/cgi-bin/html.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: html.c 6649 2007-07-11 21:46:42Z mike $"
+ * "$Id: html.c 11173 2013-07-23 12:31:34Z msweet $"
  *
  *   HTML support functions for CUPS.
  *
@@ -235,5 +235,5 @@ cgi_null_passwd(const char *prompt)	/* I - Prompt string (unused) */
 
 
 /*
- * End of "$Id: html.c 6649 2007-07-11 21:46:42Z mike $".
+ * End of "$Id: html.c 11173 2013-07-23 12:31:34Z msweet $".
  */
diff --git a/cgi-bin/ipp-var.c b/cgi-bin/ipp-var.c
index cc461967..a1d7f381 100644
--- a/cgi-bin/ipp-var.c
+++ b/cgi-bin/ipp-var.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: ipp-var.c 7940 2008-09-16 00:45:16Z mike $"
+ * "$Id: ipp-var.c 11173 2013-07-23 12:31:34Z msweet $"
  *
  *   CGI <-> IPP variable routines for CUPS.
  *
@@ -1589,5 +1589,5 @@ cgiText(const char *message)		/* I - Message */
 
 
 /*
- * End of "$Id: ipp-var.c 7940 2008-09-16 00:45:16Z mike $".
+ * End of "$Id: ipp-var.c 11173 2013-07-23 12:31:34Z msweet $".
  */
diff --git a/cgi-bin/jobs.c b/cgi-bin/jobs.c
index 30aefa66..95c8d1d8 100644
--- a/cgi-bin/jobs.c
+++ b/cgi-bin/jobs.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: jobs.c 7237 2008-01-22 01:38:39Z mike $"
+ * "$Id: jobs.c 11173 2013-07-23 12:31:34Z msweet $"
  *
  *   Job status CGI for CUPS.
  *
@@ -210,5 +210,5 @@ do_job_op(http_t      *http,		/* I - HTTP connection */
 
 
 /*
- * End of "$Id: jobs.c 7237 2008-01-22 01:38:39Z mike $".
+ * End of "$Id: jobs.c 11173 2013-07-23 12:31:34Z msweet $".
  */
diff --git a/cgi-bin/makedocset.c b/cgi-bin/makedocset.c
index 6be2797b..079c59fe 100644
--- a/cgi-bin/makedocset.c
+++ b/cgi-bin/makedocset.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: makedocset.c 3833 2012-05-23 22:51:18Z msweet $"
+ * "$Id: makedocset.c 11173 2013-07-23 12:31:34Z msweet $"
  *
  *   Xcode documentation set generator.
  *
@@ -482,5 +482,5 @@ write_nodes(const char   *path,		/* I - File to write */
 
 
 /*
- * End of "$Id: makedocset.c 3833 2012-05-23 22:51:18Z msweet $".
+ * End of "$Id: makedocset.c 11173 2013-07-23 12:31:34Z msweet $".
  */
diff --git a/cgi-bin/printers.c b/cgi-bin/printers.c
index 36e99202..f61d4078 100644
--- a/cgi-bin/printers.c
+++ b/cgi-bin/printers.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: printers.c 7940 2008-09-16 00:45:16Z mike $"
+ * "$Id: printers.c 11173 2013-07-23 12:31:34Z msweet $"
  *
  *   Printer status CGI for CUPS.
  *
@@ -574,5 +574,5 @@ show_printer(http_t     *http,		/* I - Connection to server */
 
 
 /*
- * End of "$Id: printers.c 7940 2008-09-16 00:45:16Z mike $".
+ * End of "$Id: printers.c 11173 2013-07-23 12:31:34Z msweet $".
  */
diff --git a/cgi-bin/search.c b/cgi-bin/search.c
index f8d6c797..8fd8221a 100644
--- a/cgi-bin/search.c
+++ b/cgi-bin/search.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: search.c 7720 2008-07-11 22:46:21Z mike $"
+ * "$Id: search.c 11173 2013-07-23 12:31:34Z msweet $"
  *
  *   Search routines for CUPS.
  *
@@ -377,5 +377,5 @@ cgiFreeSearch(void *search)		/* I - Search context */
 
 
 /*
- * End of "$Id: search.c 7720 2008-07-11 22:46:21Z mike $".
+ * End of "$Id: search.c 11173 2013-07-23 12:31:34Z msweet $".
  */
diff --git a/cgi-bin/template.c b/cgi-bin/template.c
index 77bfbe3a..7c36c671 100644
--- a/cgi-bin/template.c
+++ b/cgi-bin/template.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: template.c 7219 2008-01-14 22:00:02Z mike $"
+ * "$Id: template.c 11173 2013-07-23 12:31:34Z msweet $"
  *
  *   CGI template function.
  *
@@ -729,5 +729,5 @@ cgi_puturi(const char *s,		/* I - String to output */
 
 
 /*
- * End of "$Id: template.c 7219 2008-01-14 22:00:02Z mike $".
+ * End of "$Id: template.c 11173 2013-07-23 12:31:34Z msweet $".
  */
diff --git a/cgi-bin/testcgi.c b/cgi-bin/testcgi.c
index 88fcce4f..e59986af 100644
--- a/cgi-bin/testcgi.c
+++ b/cgi-bin/testcgi.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: testcgi.c 6649 2007-07-11 21:46:42Z mike $"
+ * "$Id: testcgi.c 11173 2013-07-23 12:31:34Z msweet $"
  *
  *   CGI test program for CUPS.
  *
@@ -71,5 +71,5 @@ main(int  argc,				/* I - Number of command-line arguments */
 
 
 /*
- * End of "$Id: testcgi.c 6649 2007-07-11 21:46:42Z mike $".
+ * End of "$Id: testcgi.c 11173 2013-07-23 12:31:34Z msweet $".
  */
diff --git a/cgi-bin/testhi.c b/cgi-bin/testhi.c
index 3defe45e..a257b701 100644
--- a/cgi-bin/testhi.c
+++ b/cgi-bin/testhi.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: testhi.c 6649 2007-07-11 21:46:42Z mike $"
+ * "$Id: testhi.c 11173 2013-07-23 12:31:34Z msweet $"
  *
  *   Help index test program for CUPS.
  *
@@ -109,5 +109,5 @@ list_nodes(const char   *title,		/* I - Title string */
 
 
 /*
- * End of "$Id: testhi.c 6649 2007-07-11 21:46:42Z mike $".
+ * End of "$Id: testhi.c 11173 2013-07-23 12:31:34Z msweet $".
  */
diff --git a/cgi-bin/testtemplate.c b/cgi-bin/testtemplate.c
index a257fc06..979296ea 100644
--- a/cgi-bin/testtemplate.c
+++ b/cgi-bin/testtemplate.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: testtemplate.c 6649 2007-07-11 21:46:42Z mike $"
+ * "$Id: testtemplate.c 11173 2013-07-23 12:31:34Z msweet $"
  *
  *   CGI template test program for CUPS.
  *
@@ -99,5 +99,5 @@ main(int  argc,				/* I - Number of command-line arguments */
 
 
 /*
- * End of "$Id: testtemplate.c 6649 2007-07-11 21:46:42Z mike $".
+ * End of "$Id: testtemplate.c 11173 2013-07-23 12:31:34Z msweet $".
  */
diff --git a/cgi-bin/var.c b/cgi-bin/var.c
index 8b8c026c..c124778d 100644
--- a/cgi-bin/var.c
+++ b/cgi-bin/var.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: var.c 7460 2008-04-16 02:19:54Z mike $"
+ * "$Id: var.c 11173 2013-07-23 12:31:34Z msweet $"
  *
  *   CGI form variable and array functions for CUPS.
  *
@@ -1307,5 +1307,5 @@ cgi_unlink_file(void)
 
 
 /*
- * End of "$Id: var.c 7460 2008-04-16 02:19:54Z mike $".
+ * End of "$Id: var.c 11173 2013-07-23 12:31:34Z msweet $".
  */
diff --git a/cgi-bin/websearch.c b/cgi-bin/websearch.c
index 20d8d7e4..91ed4b1d 100644
--- a/cgi-bin/websearch.c
+++ b/cgi-bin/websearch.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: websearch.c 1531 2009-05-22 21:50:50Z msweet $"
+ * "$Id: websearch.c 11173 2013-07-23 12:31:34Z msweet $"
  *
  *   Web search program for www.cups.org.
  *
@@ -112,5 +112,5 @@ list_nodes(help_index_t *hi,		/* I - Help index */
 
 
 /*
- * End of "$Id: websearch.c 1531 2009-05-22 21:50:50Z msweet $".
+ * End of "$Id: websearch.c 11173 2013-07-23 12:31:34Z msweet $".
  */
diff --git a/conf/Makefile b/conf/Makefile
index a68a58b1..1235324d 100644
--- a/conf/Makefile
+++ b/conf/Makefile
@@ -1,5 +1,5 @@
 #
-# "$Id: Makefile 7938 2008-09-11 23:53:59Z mike $"
+# "$Id: Makefile 11173 2013-07-23 12:31:34Z msweet $"
 #
 #   Configuration file makefile for CUPS.
 #
@@ -139,5 +139,5 @@ uninstall:
 
 
 #
-# End of "$Id: Makefile 7938 2008-09-11 23:53:59Z mike $".
+# End of "$Id: Makefile 11173 2013-07-23 12:31:34Z msweet $".
 #
diff --git a/conf/cups-files.conf.in b/conf/cups-files.conf.in
index ead92f53..d7e88b30 100644
--- a/conf/cups-files.conf.in
+++ b/conf/cups-files.conf.in
@@ -1,5 +1,5 @@
 #
-# "$Id: cups-files.conf.in 4185 2013-02-20 02:19:13Z msweet $"
+# "$Id: cups-files.conf.in 11221 2013-08-06 16:16:01Z msweet $"
 #
 # Sample file/directory/user/group configuration file for the CUPS scheduler.
 # See "man cups-files.conf" for a complete description of this file.
@@ -8,6 +8,9 @@
 # List of events that are considered fatal errors for the scheduler...
 #FatalErrors @CUPS_FATAL_ERRORS@
 
+# Do we call fsync() after writing configuration or status files?
+#SyncOnClose No
+
 # Default user and group for filters/backends/helper programs; this cannot be
 # any user or group that resolves to ID 0 for security reasons...
 #User @CUPS_USER@
@@ -94,5 +97,5 @@ PageLog @CUPS_LOGDIR@/page_log
 #TempDir @CUPS_REQUESTS@/tmp
 
 #
-# End of "$Id: cups-files.conf.in 4185 2013-02-20 02:19:13Z msweet $".
+# End of "$Id: cups-files.conf.in 11221 2013-08-06 16:16:01Z msweet $".
 #
diff --git a/conf/cupsd.conf.in b/conf/cupsd.conf.in
index 5ae2c9f0..9fe03659 100644
--- a/conf/cupsd.conf.in
+++ b/conf/cupsd.conf.in
@@ -1,5 +1,5 @@
 #
-# "$Id: cupsd.conf.in 7888 2008-08-29 21:16:56Z mike $"
+# "$Id: cupsd.conf.in 11173 2013-07-23 12:31:34Z msweet $"
 #
 # Sample configuration file for the CUPS scheduler.  See "man cupsd.conf" for a
 # complete description of this file.
@@ -130,5 +130,5 @@ WebInterface @CUPS_WEBIF@
 </Policy>
 
 #
-# End of "$Id: cupsd.conf.in 7888 2008-08-29 21:16:56Z mike $".
+# End of "$Id: cupsd.conf.in 11173 2013-07-23 12:31:34Z msweet $".
 #
diff --git a/conf/mime.convs.in b/conf/mime.convs.in
index 533fd955..d6bebf8e 100644
--- a/conf/mime.convs.in
+++ b/conf/mime.convs.in
@@ -1,5 +1,5 @@
 #
-# "$Id: mime.convs.in 6761 2007-08-02 17:58:59Z mike $"
+# "$Id: mime.convs.in 11173 2013-07-23 12:31:34Z msweet $"
 #
 #   DO NOT EDIT THIS FILE, AS IT IS OVERWRITTEN WHEN YOU INSTALL NEW
 #   VERSIONS OF CUPS.  Instead, create a "local.convs" file that
@@ -59,5 +59,5 @@ application/vnd.cups-raster	image/pwg-raster		100	rastertopwg
 @DEFAULT_RAW_PRINTING@application/octet-stream	application/vnd.cups-raw	0	-
 
 #
-# End of "$Id: mime.convs.in 6761 2007-08-02 17:58:59Z mike $".
+# End of "$Id: mime.convs.in 11173 2013-07-23 12:31:34Z msweet $".
 #
diff --git a/conf/snmp.conf.in b/conf/snmp.conf.in
index 43855ab6..5d7d52c0 100644
--- a/conf/snmp.conf.in
+++ b/conf/snmp.conf.in
@@ -1,5 +1,5 @@
 #
-# "$Id$"
+# "$Id: snmp.conf.in 11173 2013-07-23 12:31:34Z msweet $"
 #
 #   Sample SNMP configuration file for CUPS.  See "man cups-snmp.conf" for a
 #   complete description of this file.
@@ -9,5 +9,5 @@
 @CUPS_SNMP_COMMUNITY@
 
 #
-# End of "$Id$".
+# End of "$Id: snmp.conf.in 11173 2013-07-23 12:31:34Z msweet $".
 #
diff --git a/config-scripts/cups-common.m4 b/config-scripts/cups-common.m4
index 922e1190..06e675a5 100644
--- a/config-scripts/cups-common.m4
+++ b/config-scripts/cups-common.m4
@@ -20,7 +20,7 @@ dnl Set the name of the config header file...
 AC_CONFIG_HEADER(config.h)
 
 dnl Version number information...
-CUPS_VERSION=1.6.3
+CUPS_VERSION=1.6.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'`"
@@ -225,7 +225,9 @@ dnl See if we have libusb...
 AC_ARG_ENABLE(libusb, [  --enable-libusb         use libusb for USB printing])
 
 LIBUSB=""
+USBQUIRKS=""
 AC_SUBST(LIBUSB)
+AC_SUBST(USBQUIRKS)
 
 if test "x$PKGCONFIG" != x; then
 	if test x$enable_libusb = xyes -o $uname != Darwin; then
@@ -235,6 +237,7 @@ if test "x$PKGCONFIG" != x; then
 			AC_DEFINE(HAVE_LIBUSB)
 			CFLAGS="$CFLAGS `$PKGCONFIG --cflags libusb-1.0`"
 			LIBUSB="`$PKGCONFIG --libs libusb-1.0`"
+			USBQUIRKS="\$(DATADIR)/usb"
 		else
 			AC_MSG_RESULT(no)
 		fi
diff --git a/config.h.in b/config.h.in
index 83d067eb..edff532c 100644
--- a/config.h.in
+++ b/config.h.in
@@ -1,5 +1,5 @@
 /*
- * "$Id: config.h.in 7918 2008-09-08 22:03:01Z mike $"
+ * "$Id: config.h.in 11173 2013-07-23 12:31:34Z msweet $"
  *
  *   Configuration file for CUPS.
  *
@@ -743,5 +743,5 @@ static __inline int _cups_abs(int i) { return (i < 0 ? -i : i); }
 #endif /* !_CUPS_CONFIG_H_ */
 
 /*
- * End of "$Id: config.h.in 7918 2008-09-08 22:03:01Z mike $".
+ * End of "$Id: config.h.in 11173 2013-07-23 12:31:34Z msweet $".
  */
diff --git a/configure b/configure
index fe2e0bf4..8582cb84 100755
--- a/configure
+++ b/configure
@@ -725,6 +725,7 @@ ARFLAGS
 LIBZ
 INSTALL_GZIP
 LIBWRAP
+USBQUIRKS
 LIBUSB
 LIBMXML
 EGREP
@@ -2508,7 +2509,7 @@ esac
 ac_config_headers="$ac_config_headers config.h"
 
 
-CUPS_VERSION=1.6.3
+CUPS_VERSION=1.6.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'`"
@@ -5224,6 +5225,8 @@ fi
 
 
 LIBUSB=""
+USBQUIRKS=""
+
 
 
 if test "x$PKGCONFIG" != x; then
@@ -5237,6 +5240,7 @@ $as_echo "yes" >&6; }
 
 			CFLAGS="$CFLAGS `$PKGCONFIG --cflags libusb-1.0`"
 			LIBUSB="`$PKGCONFIG --libs libusb-1.0`"
+			USBQUIRKS="\$(DATADIR)/usb"
 		else
 			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
diff --git a/configure.in b/configure.in
index 3951e905..33a7ba2c 100644
--- a/configure.in
+++ b/configure.in
@@ -1,5 +1,5 @@
 dnl
-dnl "$Id: configure.in 7833 2008-08-04 20:55:13Z mike $"
+dnl "$Id: configure.in 11173 2013-07-23 12:31:34Z msweet $"
 dnl
 dnl   Configuration script for CUPS.
 dnl
@@ -93,5 +93,5 @@ AC_OUTPUT(Makedefs
 chmod +x cups-config
 
 dnl
-dnl End of "$Id: configure.in 7833 2008-08-04 20:55:13Z mike $".
+dnl End of "$Id: configure.in 11173 2013-07-23 12:31:34Z msweet $".
 dnl
diff --git a/cups-config.in b/cups-config.in
index 7ba10447..ee9a0ea7 100755
--- a/cups-config.in
+++ b/cups-config.in
@@ -1,6 +1,6 @@
 #! /bin/sh
 #
-# "$Id: cups-config.in 9926 2011-08-27 09:23:01Z mike $"
+# "$Id: cups-config.in 11173 2013-07-23 12:31:34Z msweet $"
 #
 #   CUPS configuration utility.
 #
@@ -142,5 +142,5 @@ while test $# -gt 0; do
 done
 
 #
-# End of "$Id: cups-config.in 9926 2011-08-27 09:23:01Z mike $".
+# End of "$Id: cups-config.in 11173 2013-07-23 12:31:34Z msweet $".
 #
diff --git a/cups/Makefile b/cups/Makefile
index 22bb191b..662a00b4 100644
--- a/cups/Makefile
+++ b/cups/Makefile
@@ -1,5 +1,5 @@
 #
-# "$Id: Makefile 7871 2008-08-27 21:12:43Z mike $"
+# "$Id: Makefile 11173 2013-07-23 12:31:34Z msweet $"
 #
 #   API library Makefile for CUPS.
 #
@@ -629,5 +629,5 @@ include Dependencies
 
 
 #
-# End of "$Id: Makefile 7871 2008-08-27 21:12:43Z mike $".
+# End of "$Id: Makefile 11173 2013-07-23 12:31:34Z msweet $".
 #
diff --git a/cups/adminutil.c b/cups/adminutil.c
index 440e443b..a5e2612a 100644
--- a/cups/adminutil.c
+++ b/cups/adminutil.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: adminutil.c 7850 2008-08-20 00:07:25Z mike $"
+ * "$Id: adminutil.c 11173 2013-07-23 12:31:34Z msweet $"
  *
  *   Administration utility API definitions for CUPS.
  *
@@ -2337,5 +2337,5 @@ write_option(cups_file_t     *dstfp,	/* I - PPD file */
 
 
 /*
- * End of "$Id: adminutil.c 7850 2008-08-20 00:07:25Z mike $".
+ * End of "$Id: adminutil.c 11173 2013-07-23 12:31:34Z msweet $".
  */
diff --git a/cups/adminutil.h b/cups/adminutil.h
index 82606157..d00452e7 100644
--- a/cups/adminutil.h
+++ b/cups/adminutil.h
@@ -1,5 +1,5 @@
 /*
- * "$Id: adminutil.h 7026 2007-10-19 00:57:45Z mike $"
+ * "$Id: adminutil.h 11173 2013-07-23 12:31:34Z msweet $"
  *
  *   Administration utility API definitions for CUPS.
  *
@@ -77,5 +77,5 @@ extern int	cupsAdminSetServerSettings(http_t *http,
 #endif /* !_CUPS_ADMINUTIL_H_ */
 
 /*
- * End of "$Id: adminutil.h 7026 2007-10-19 00:57:45Z mike $".
+ * End of "$Id: adminutil.h 11173 2013-07-23 12:31:34Z msweet $".
  */
diff --git a/cups/array-private.h b/cups/array-private.h
index e5296948..b9d0b7f4 100644
--- a/cups/array-private.h
+++ b/cups/array-private.h
@@ -1,5 +1,5 @@
 /*
- * "$Id: array-private.h 3448 2011-10-04 06:53:26Z msweet $"
+ * "$Id: array-private.h 11173 2013-07-23 12:31:34Z msweet $"
  *
  *   Private array definitions for CUPS.
  *
@@ -47,5 +47,5 @@ extern cups_array_t	*_cupsArrayNewStrings(const char *s) _CUPS_API_1_5;
 #endif /* !_CUPS_ARRAY_PRIVATE_H_ */
 
 /*
- * End of "$Id: array-private.h 3448 2011-10-04 06:53:26Z msweet $".
+ * End of "$Id: array-private.h 11173 2013-07-23 12:31:34Z msweet $".
  */
diff --git a/cups/array.c b/cups/array.c
index 2fb7701c..cd8f64d3 100644
--- a/cups/array.c
+++ b/cups/array.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: array.c 7616 2008-05-28 00:34:13Z mike $"
+ * "$Id: array.c 11173 2013-07-23 12:31:34Z msweet $"
  *
  *   Sorted array routines for CUPS.
  *
@@ -1322,5 +1322,5 @@ cups_array_find(cups_array_t *a,	/* I - Array */
 
 
 /*
- * End of "$Id: array.c 7616 2008-05-28 00:34:13Z mike $".
+ * End of "$Id: array.c 11173 2013-07-23 12:31:34Z msweet $".
  */
diff --git a/cups/array.h b/cups/array.h
index 466a2721..235fcc98 100644
--- a/cups/array.h
+++ b/cups/array.h
@@ -1,5 +1,5 @@
 /*
- * "$Id: array.h 7266 2008-01-29 02:15:29Z mike $"
+ * "$Id: array.h 11173 2013-07-23 12:31:34Z msweet $"
  *
  *   Sorted array definitions for CUPS.
  *
@@ -88,5 +88,5 @@ extern void		*cupsArrayUserData(cups_array_t *a) _CUPS_API_1_2;
 #endif /* !_CUPS_ARRAY_H_ */
 
 /*
- * End of "$Id: array.h 7266 2008-01-29 02:15:29Z mike $".
+ * End of "$Id: array.h 11173 2013-07-23 12:31:34Z msweet $".
  */
diff --git a/cups/attr.c b/cups/attr.c
index da7a7253..10d88dd5 100644
--- a/cups/attr.c
+++ b/cups/attr.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: attr.c 7584 2008-05-16 22:55:53Z mike $"
+ * "$Id: attr.c 11173 2013-07-23 12:31:34Z msweet $"
  *
  *   PPD model-specific attribute routines for CUPS.
  *
@@ -331,5 +331,5 @@ _ppdNormalizeMakeAndModel(
 
 
 /*
- * End of "$Id: attr.c 7584 2008-05-16 22:55:53Z mike $".
+ * End of "$Id: attr.c 11173 2013-07-23 12:31:34Z msweet $".
  */
diff --git a/cups/auth.c b/cups/auth.c
index 659d9185..e1fc2c9f 100644
--- a/cups/auth.c
+++ b/cups/auth.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: auth.c 7720 2008-07-11 22:46:21Z mike $"
+ * "$Id: auth.c 11173 2013-07-23 12:31:34Z msweet $"
  *
  *   Authentication functions for CUPS.
  *
@@ -881,5 +881,5 @@ cups_local_auth(http_t *http)		/* I - HTTP connection to server */
 
 
 /*
- * End of "$Id: auth.c 7720 2008-07-11 22:46:21Z mike $".
+ * End of "$Id: auth.c 11173 2013-07-23 12:31:34Z msweet $".
  */
diff --git a/cups/backchannel.c b/cups/backchannel.c
index 3ee1dbc9..ffae80b7 100644
--- a/cups/backchannel.c
+++ b/cups/backchannel.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: backchannel.c 7616 2008-05-28 00:34:13Z mike $"
+ * "$Id: backchannel.c 11173 2013-07-23 12:31:34Z msweet $"
  *
  *   Backchannel functions for CUPS.
  *
@@ -195,5 +195,5 @@ cups_setup(fd_set         *set,		/* I - Set for select() */
 
 
 /*
- * End of "$Id: backchannel.c 7616 2008-05-28 00:34:13Z mike $".
+ * End of "$Id: backchannel.c 11173 2013-07-23 12:31:34Z msweet $".
  */
diff --git a/cups/backend.c b/cups/backend.c
index 6f8a6b2e..22b379e7 100644
--- a/cups/backend.c
+++ b/cups/backend.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: backend.c 7810 2008-07-29 01:11:15Z mike $"
+ * "$Id: backend.c 11173 2013-07-23 12:31:34Z msweet $"
  *
  *   Backend functions for CUPS.
  *
@@ -150,5 +150,5 @@ quote_string(const char *s)		/* I - String to write */
 
 
 /*
- * End of "$Id: backend.c 7810 2008-07-29 01:11:15Z mike $".
+ * End of "$Id: backend.c 11173 2013-07-23 12:31:34Z msweet $".
  */
diff --git a/cups/backend.h b/cups/backend.h
index d2e37ff8..565960dd 100644
--- a/cups/backend.h
+++ b/cups/backend.h
@@ -1,5 +1,5 @@
 /*
- * "$Id: backend.h 7810 2008-07-29 01:11:15Z mike $"
+ * "$Id: backend.h 11173 2013-07-23 12:31:34Z msweet $"
  *
  *   Backend definitions for CUPS.
  *
@@ -74,5 +74,5 @@ extern void		cupsBackendReport(const char *device_scheme,
 #endif /* !_CUPS_BACKEND_H_ */
 
 /*
- * End of "$Id: backend.h 7810 2008-07-29 01:11:15Z mike $".
+ * End of "$Id: backend.h 11173 2013-07-23 12:31:34Z msweet $".
  */
diff --git a/cups/conflicts.c b/cups/conflicts.c
index f0d01b0c..dcfd84db 100644
--- a/cups/conflicts.c
+++ b/cups/conflicts.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: conflicts.c 3794 2012-04-23 22:44:16Z msweet $"
+ * "$Id: conflicts.c 11173 2013-07-23 12:31:34Z msweet $"
  *
  *   Option marking routines for CUPS.
  *
@@ -1210,5 +1210,5 @@ ppd_test_constraints(
 
 
 /*
- * End of "$Id: conflicts.c 3794 2012-04-23 22:44:16Z msweet $".
+ * End of "$Id: conflicts.c 11173 2013-07-23 12:31:34Z msweet $".
  */
diff --git a/cups/cups-private.h b/cups/cups-private.h
index 027d3a16..6ef16b4c 100644
--- a/cups/cups-private.h
+++ b/cups/cups-private.h
@@ -1,5 +1,5 @@
 /*
- * "$Id: cups-private.h 9596 2011-03-11 18:26:36Z mike $"
+ * "$Id: cups-private.h 11173 2013-07-23 12:31:34Z msweet $"
  *
  *   Private definitions for CUPS.
  *
@@ -268,5 +268,5 @@ extern char		*_cupsUserDefault(char *name, size_t namesize);
 #endif /* !_CUPS_CUPS_PRIVATE_H_ */
 
 /*
- * End of "$Id: cups-private.h 9596 2011-03-11 18:26:36Z mike $".
+ * End of "$Id: cups-private.h 11173 2013-07-23 12:31:34Z msweet $".
  */
diff --git a/cups/cups.h b/cups/cups.h
index 4edf3d03..b6a26744 100644
--- a/cups/cups.h
+++ b/cups/cups.h
@@ -1,5 +1,5 @@
 /*
- * "$Id: cups.h 8781 2009-08-28 17:34:54Z mike $"
+ * "$Id: cups.h 11173 2013-07-23 12:31:34Z msweet $"
  *
  *   API definitions for CUPS.
  *
@@ -52,10 +52,10 @@ extern "C" {
  * Constants...
  */
 
-#  define CUPS_VERSION			1.0603
+#  define CUPS_VERSION			1.0604
 #  define CUPS_VERSION_MAJOR		1
 #  define CUPS_VERSION_MINOR		6
-#  define CUPS_VERSION_PATCH		3
+#  define CUPS_VERSION_PATCH		4
 
 #  define CUPS_BC_FD			3
 					/* Back-channel file descriptor for
@@ -597,5 +597,5 @@ extern http_status_t	cupsStartDestDocument(http_t *http, cups_dest_t *dest,
 #endif /* !_CUPS_CUPS_H_ */
 
 /*
- * End of "$Id: cups.h 8781 2009-08-28 17:34:54Z mike $".
+ * End of "$Id: cups.h 11173 2013-07-23 12:31:34Z msweet $".
  */
diff --git a/cups/custom.c b/cups/custom.c
index 4c4cc8ac..09c3b71a 100644
--- a/cups/custom.c
+++ b/cups/custom.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: custom.c 6649 2007-07-11 21:46:42Z mike $"
+ * "$Id: custom.c 11173 2013-07-23 12:31:34Z msweet $"
  *
  *   PPD custom option routines for CUPS.
  *
@@ -118,5 +118,5 @@ ppdNextCustomParam(ppd_coption_t *opt)	/* I - Custom option */
 
 
 /*
- * End of "$Id: custom.c 6649 2007-07-11 21:46:42Z mike $".
+ * End of "$Id: custom.c 11173 2013-07-23 12:31:34Z msweet $".
  */
diff --git a/cups/debug-private.h b/cups/debug-private.h
index 26c75a37..7a817ad8 100644
--- a/cups/debug-private.h
+++ b/cups/debug-private.h
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: debug-private.h 11173 2013-07-23 12:31:34Z msweet $"
  *
  *   Private debugging macros for CUPS.
  *
@@ -113,5 +113,5 @@ extern int	_cups_gettimeofday(struct timeval *tv, void *tz);
 #endif /* !_CUPS_DEBUG_PRIVATE_H_ */
 
 /*
- * End of "$Id$".
+ * End of "$Id: debug-private.h 11173 2013-07-23 12:31:34Z msweet $".
  */
diff --git a/cups/debug.c b/cups/debug.c
index dce94278..846d98b3 100644
--- a/cups/debug.c
+++ b/cups/debug.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: debug.c 3643 2012-02-13 16:35:48Z msweet $"
+ * "$Id: debug.c 11173 2013-07-23 12:31:34Z msweet $"
  *
  *   Debugging functions for CUPS.
  *
@@ -654,5 +654,5 @@ _cups_debug_set(const char *logfile,	/* I - Log file or NULL */
 
 
 /*
- * End of "$Id: debug.c 3643 2012-02-13 16:35:48Z msweet $".
+ * End of "$Id: debug.c 11173 2013-07-23 12:31:34Z msweet $".
  */
diff --git a/cups/dest-job.c b/cups/dest-job.c
index dc47f042..a11386c1 100644
--- a/cups/dest-job.c
+++ b/cups/dest-job.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: dest-job.c 3833 2012-05-23 22:51:18Z msweet $"
+ * "$Id: dest-job.c 11173 2013-07-23 12:31:34Z msweet $"
  *
  *   Destination job support for CUPS.
  *
@@ -354,5 +354,5 @@ cupsStartDestDocument(
 
 
 /*
- * End of "$Id: dest-job.c 3833 2012-05-23 22:51:18Z msweet $".
+ * End of "$Id: dest-job.c 11173 2013-07-23 12:31:34Z msweet $".
  */
diff --git a/cups/dest-localization.c b/cups/dest-localization.c
index 13980567..4d8bff69 100644
--- a/cups/dest-localization.c
+++ b/cups/dest-localization.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: dest-localization.c 3833 2012-05-23 22:51:18Z msweet $"
+ * "$Id: dest-localization.c 11173 2013-07-23 12:31:34Z msweet $"
  *
  *   Destination localization support for CUPS.
  *
@@ -382,5 +382,5 @@ cups_scan_strings(char *buffer)		/* I - Start of string */
 
 
 /*
- * End of "$Id: dest-localization.c 3833 2012-05-23 22:51:18Z msweet $".
+ * End of "$Id: dest-localization.c 11173 2013-07-23 12:31:34Z msweet $".
  */
diff --git a/cups/dest-options.c b/cups/dest-options.c
index 234dd135..08bd16da 100644
--- a/cups/dest-options.c
+++ b/cups/dest-options.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: dest-options.c 4185 2013-02-20 02:19:13Z msweet $"
+ * "$Id: dest-options.c 11173 2013-07-23 12:31:34Z msweet $"
  *
  *   Destination option/media support for CUPS.
  *
@@ -1759,5 +1759,5 @@ cups_test_constraints(
 
 
 /*
- * End of "$Id: dest-options.c 4185 2013-02-20 02:19:13Z msweet $".
+ * End of "$Id: dest-options.c 11173 2013-07-23 12:31:34Z msweet $".
  */
diff --git a/cups/dest.c b/cups/dest.c
index acd64e73..9999c0cc 100644
--- a/cups/dest.c
+++ b/cups/dest.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: dest.c 9568 2011-02-25 06:13:56Z mike $"
+ * "$Id: dest.c 11173 2013-07-23 12:31:34Z msweet $"
  *
  *   User-defined destination (and option) support for CUPS.
  *
@@ -3887,5 +3887,5 @@ cups_make_string(
 
 
 /*
- * End of "$Id: dest.c 9568 2011-02-25 06:13:56Z mike $".
+ * End of "$Id: dest.c 11173 2013-07-23 12:31:34Z msweet $".
  */
diff --git a/cups/dir.c b/cups/dir.c
index b98f07c8..ede139d3 100644
--- a/cups/dir.c
+++ b/cups/dir.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: dir.c 7279 2008-01-31 01:50:44Z mike $"
+ * "$Id: dir.c 11173 2013-07-23 12:31:34Z msweet $"
  *
  *   Directory routines for CUPS.
  *
@@ -468,5 +468,5 @@ cupsDirRewind(cups_dir_t *dp)		/* I - Directory pointer */
 #endif /* WIN32 */
 
 /*
- * End of "$Id: dir.c 7279 2008-01-31 01:50:44Z mike $".
+ * End of "$Id: dir.c 11173 2013-07-23 12:31:34Z msweet $".
  */
diff --git a/cups/dir.h b/cups/dir.h
index 362ea201..a16871f8 100644
--- a/cups/dir.h
+++ b/cups/dir.h
@@ -1,5 +1,5 @@
 /*
- * "$Id: dir.h 7026 2007-10-19 00:57:45Z mike $"
+ * "$Id: dir.h 11173 2013-07-23 12:31:34Z msweet $"
  *
  *   Public directory definitions for CUPS.
  *
@@ -65,5 +65,5 @@ extern void		cupsDirRewind(cups_dir_t *dp) _CUPS_API_1_2;
 #endif /* !_CUPS_DIR_H_ */
 
 /*
- * End of "$Id: dir.h 7026 2007-10-19 00:57:45Z mike $".
+ * End of "$Id: dir.h 11173 2013-07-23 12:31:34Z msweet $".
  */
diff --git a/cups/emit.c b/cups/emit.c
index 650e8479..15f2fcda 100644
--- a/cups/emit.c
+++ b/cups/emit.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: emit.c 7863 2008-08-26 03:39:59Z mike $"
+ * "$Id: emit.c 11173 2013-07-23 12:31:34Z msweet $"
  *
  *   PPD code emission routines for CUPS.
  *
@@ -1225,5 +1225,5 @@ ppd_handle_media(ppd_file_t *ppd)	/* I - PPD file */
 
 
 /*
- * End of "$Id: emit.c 7863 2008-08-26 03:39:59Z mike $".
+ * End of "$Id: emit.c 11173 2013-07-23 12:31:34Z msweet $".
  */
diff --git a/cups/encode.c b/cups/encode.c
index 17c0baeb..ee0f955f 100644
--- a/cups/encode.c
+++ b/cups/encode.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: encode.c 7696 2008-06-26 00:54:42Z mike $"
+ * "$Id: encode.c 11173 2013-07-23 12:31:34Z msweet $"
  *
  *   Option encoding routines for CUPS.
  *
@@ -660,5 +660,5 @@ compare_ipp_options(_ipp_option_t *a,	/* I - First option */
 
 
 /*
- * End of "$Id: encode.c 7696 2008-06-26 00:54:42Z mike $".
+ * End of "$Id: encode.c 11173 2013-07-23 12:31:34Z msweet $".
  */
diff --git a/cups/file-private.h b/cups/file-private.h
index bb83c40c..ed617002 100644
--- a/cups/file-private.h
+++ b/cups/file-private.h
@@ -1,5 +1,5 @@
 /*
- * "$Id: file-private.h 3275 2011-05-20 07:26:13Z msweet $"
+ * "$Id: file-private.h 11173 2013-07-23 12:31:34Z msweet $"
  *
  *   Private file definitions for CUPS.
  *
@@ -133,5 +133,5 @@ extern void			_cupsFileCheckFilter(void *context,
 #endif /* !_CUPS_FILE_PRIVATE_H_ */
 
 /*
- * End of "$Id: file-private.h 3275 2011-05-20 07:26:13Z msweet $".
+ * End of "$Id: file-private.h 11173 2013-07-23 12:31:34Z msweet $".
  */
diff --git a/cups/file.c b/cups/file.c
index 1918ec5b..062d1a2d 100644
--- a/cups/file.c
+++ b/cups/file.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: file.c 7672 2008-06-18 22:03:02Z mike $"
+ * "$Id: file.c 11173 2013-07-23 12:31:34Z msweet $"
  *
  *   File functions for CUPS.
  *
@@ -2710,5 +2710,5 @@ cups_write(cups_file_t *fp,		/* I - CUPS file */
 
 
 /*
- * End of "$Id: file.c 7672 2008-06-18 22:03:02Z mike $".
+ * End of "$Id: file.c 11173 2013-07-23 12:31:34Z msweet $".
  */
diff --git a/cups/file.h b/cups/file.h
index 1428c576..fb63d642 100644
--- a/cups/file.h
+++ b/cups/file.h
@@ -1,5 +1,5 @@
 /*
- * "$Id: file.h 7460 2008-04-16 02:19:54Z mike $"
+ * "$Id: file.h 11173 2013-07-23 12:31:34Z msweet $"
  *
  *   Public file definitions for CUPS.
  *
@@ -112,5 +112,5 @@ extern ssize_t		cupsFileWrite(cups_file_t *fp, const char *buf,
 #endif /* !_CUPS_FILE_H_ */
 
 /*
- * End of "$Id: file.h 7460 2008-04-16 02:19:54Z mike $".
+ * End of "$Id: file.h 11173 2013-07-23 12:31:34Z msweet $".
  */
diff --git a/cups/getdevices.c b/cups/getdevices.c
index 3416c5e7..89f5b8db 100644
--- a/cups/getdevices.c
+++ b/cups/getdevices.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: getdevices.c 3794 2012-04-23 22:44:16Z msweet $"
+ * "$Id: getdevices.c 11173 2013-07-23 12:31:34Z msweet $"
  *
  *   cupsGetDevices implementation for CUPS.
  *
@@ -279,5 +279,5 @@ cupsGetDevices(
 
 
 /*
- * End of "$Id: getdevices.c 3794 2012-04-23 22:44:16Z msweet $".
+ * End of "$Id: getdevices.c 11173 2013-07-23 12:31:34Z msweet $".
  */
diff --git a/cups/getifaddrs.c b/cups/getifaddrs.c
index 6c9cc554..e227276b 100644
--- a/cups/getifaddrs.c
+++ b/cups/getifaddrs.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: getifaddrs.c 6649 2007-07-11 21:46:42Z mike $"
+ * "$Id: getifaddrs.c 11173 2013-07-23 12:31:34Z msweet $"
  *
  *   Network interface functions for CUPS.
  *
@@ -262,5 +262,5 @@ _cups_freeifaddrs(struct ifaddrs *addrs)/* I - Interface list to free */
 
 
 /*
- * End of "$Id: getifaddrs.c 6649 2007-07-11 21:46:42Z mike $".
+ * End of "$Id: getifaddrs.c 11173 2013-07-23 12:31:34Z msweet $".
  */
diff --git a/cups/getputfile.c b/cups/getputfile.c
index 7e12fe9f..c7534ec6 100644
--- a/cups/getputfile.c
+++ b/cups/getputfile.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: getputfile.c 7359 2008-02-29 19:01:35Z mike $"
+ * "$Id: getputfile.c 11173 2013-07-23 12:31:34Z msweet $"
  *
  *   Get/put file functions for CUPS.
  *
@@ -498,5 +498,5 @@ cupsPutFile(http_t     *http,		/* I - Connection to server or @code CUPS_HTTP_DE
 
 
 /*
- * End of "$Id: getputfile.c 7359 2008-02-29 19:01:35Z mike $".
+ * End of "$Id: getputfile.c 11173 2013-07-23 12:31:34Z msweet $".
  */
diff --git a/cups/globals.c b/cups/globals.c
index 418452fc..8493a082 100644
--- a/cups/globals.c
+++ b/cups/globals.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: globals.c 7870 2008-08-27 18:14:10Z mike $"
+ * "$Id: globals.c 11173 2013-07-23 12:31:34Z msweet $"
  *
  *   Global variable access routines for CUPS.
  *
@@ -380,5 +380,5 @@ cups_globals_init(void)
 
 
 /*
- * End of "$Id: globals.c 7870 2008-08-27 18:14:10Z mike $".
+ * End of "$Id: globals.c 11173 2013-07-23 12:31:34Z msweet $".
  */
diff --git a/cups/http-addr.c b/cups/http-addr.c
index 4b09d8ea..74218de5 100644
--- a/cups/http-addr.c
+++ b/cups/http-addr.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: http-addr.c 7910 2008-09-06 00:25:17Z mike $"
+ * "$Id: http-addr.c 11173 2013-07-23 12:31:34Z msweet $"
  *
  *   HTTP address routines for CUPS.
  *
@@ -699,5 +699,5 @@ httpGetHostname(http_t *http,		/* I - HTTP connection or NULL */
 
 
 /*
- * End of "$Id: http-addr.c 7910 2008-09-06 00:25:17Z mike $".
+ * End of "$Id: http-addr.c 11173 2013-07-23 12:31:34Z msweet $".
  */
diff --git a/cups/http-addrlist.c b/cups/http-addrlist.c
index f9cd1f3e..71600076 100644
--- a/cups/http-addrlist.c
+++ b/cups/http-addrlist.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: http-addrlist.c 7910 2008-09-06 00:25:17Z mike $"
+ * "$Id: http-addrlist.c 11173 2013-07-23 12:31:34Z msweet $"
  *
  *   HTTP address list routines for CUPS.
  *
@@ -841,5 +841,5 @@ httpAddrGetList(const char *hostname,	/* I - Hostname, IP address, or NULL for p
 
 
 /*
- * End of "$Id: http-addrlist.c 7910 2008-09-06 00:25:17Z mike $".
+ * End of "$Id: http-addrlist.c 11173 2013-07-23 12:31:34Z msweet $".
  */
diff --git a/cups/http-private.h b/cups/http-private.h
index ec58de0e..a99b381a 100644
--- a/cups/http-private.h
+++ b/cups/http-private.h
@@ -1,5 +1,5 @@
 /*
- * "$Id: http-private.h 7850 2008-08-20 00:07:25Z mike $"
+ * "$Id: http-private.h 11173 2013-07-23 12:31:34Z msweet $"
  *
  *   Private HTTP definitions for CUPS.
  *
@@ -390,5 +390,5 @@ extern int		_httpWait(http_t *http, int msec, int usessl);
 #endif /* !_CUPS_HTTP_PRIVATE_H_ */
 
 /*
- * End of "$Id: http-private.h 7850 2008-08-20 00:07:25Z mike $".
+ * End of "$Id: http-private.h 11173 2013-07-23 12:31:34Z msweet $".
  */
diff --git a/cups/http-support.c b/cups/http-support.c
index 146719dc..d15d9046 100644
--- a/cups/http-support.c
+++ b/cups/http-support.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: http-support.c 7952 2008-09-17 00:56:20Z mike $"
+ * "$Id: http-support.c 11173 2013-07-23 12:31:34Z msweet $"
  *
  *   HTTP support routines for CUPS.
  *
@@ -2360,5 +2360,5 @@ http_resolve_cb(
 
 
 /*
- * End of "$Id: http-support.c 7952 2008-09-17 00:56:20Z mike $".
+ * End of "$Id: http-support.c 11173 2013-07-23 12:31:34Z msweet $".
  */
diff --git a/cups/http.c b/cups/http.c
index 70509d75..5c77d3dc 100644
--- a/cups/http.c
+++ b/cups/http.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: http.c 7850 2008-08-20 00:07:25Z mike $"
+ * "$Id: http.c 11173 2013-07-23 12:31:34Z msweet $"
  *
  *   HTTP routines for CUPS.
  *
@@ -4766,5 +4766,5 @@ http_write_ssl(http_t     *http,	/* I - Connection to server */
 
 
 /*
- * End of "$Id: http.c 7850 2008-08-20 00:07:25Z mike $".
+ * End of "$Id: http.c 11173 2013-07-23 12:31:34Z msweet $".
  */
diff --git a/cups/http.h b/cups/http.h
index 3f259d3b..a882ff79 100644
--- a/cups/http.h
+++ b/cups/http.h
@@ -1,5 +1,5 @@
 /*
- * "$Id: http.h 7026 2007-10-19 00:57:45Z mike $"
+ * "$Id: http.h 11173 2013-07-23 12:31:34Z msweet $"
  *
  *   Hyper-Text Transport Protocol definitions for CUPS.
  *
@@ -483,5 +483,5 @@ extern int		httpReconnect2(http_t *http, int msec, int *cancel)
 #endif /* !_CUPS_HTTP_H_ */
 
 /*
- * End of "$Id: http.h 7026 2007-10-19 00:57:45Z mike $".
+ * End of "$Id: http.h 11173 2013-07-23 12:31:34Z msweet $".
  */
diff --git a/cups/ipp-private.h b/cups/ipp-private.h
index 1d3003c3..abf2d23c 100644
--- a/cups/ipp-private.h
+++ b/cups/ipp-private.h
@@ -1,5 +1,5 @@
 /*
- * "$Id: ipp-private.h 7259 2008-01-28 22:26:04Z mike $"
+ * "$Id: ipp-private.h 11173 2013-07-23 12:31:34Z msweet $"
  *
  *   Private IPP definitions for CUPS.
  *
@@ -74,5 +74,5 @@ extern _ipp_option_t	*_ippFindOption(const char *name);
 #endif /* !_CUPS_IPP_H_ */
 
 /*
- * End of "$Id: ipp-private.h 7259 2008-01-28 22:26:04Z mike $".
+ * End of "$Id: ipp-private.h 11173 2013-07-23 12:31:34Z msweet $".
  */
diff --git a/cups/ipp-support.c b/cups/ipp-support.c
index 96cd1490..815828b7 100644
--- a/cups/ipp-support.c
+++ b/cups/ipp-support.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: ipp-support.c 9371 2010-11-17 06:21:32Z mike $"
+ * "$Id: ipp-support.c 11173 2013-07-23 12:31:34Z msweet $"
  *
  *   Internet Printing Protocol support functions for CUPS.
  *
@@ -1086,5 +1086,5 @@ ipp_col_string(ipp_t  *col,		/* I - Collection attribute */
 
 
 /*
- * End of "$Id: ipp-support.c 9371 2010-11-17 06:21:32Z mike $".
+ * End of "$Id: ipp-support.c 11173 2013-07-23 12:31:34Z msweet $".
  */
diff --git a/cups/ipp.c b/cups/ipp.c
index 03847921..1a8beed5 100644
--- a/cups/ipp.c
+++ b/cups/ipp.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: ipp.c 10102 2011-11-02 23:52:39Z mike $"
+ * "$Id: ipp.c 11173 2013-07-23 12:31:34Z msweet $"
  *
  *   Internet Printing Protocol functions for CUPS.
  *
@@ -5570,5 +5570,5 @@ ipp_write_file(int         *fd,		/* I - File descriptor */
 
 
 /*
- * End of "$Id: ipp.c 10102 2011-11-02 23:52:39Z mike $".
+ * End of "$Id: ipp.c 11173 2013-07-23 12:31:34Z msweet $".
  */
diff --git a/cups/ipp.h b/cups/ipp.h
index 2fb1995e..b9de668d 100644
--- a/cups/ipp.h
+++ b/cups/ipp.h
@@ -1,5 +1,5 @@
 /*
- * "$Id: ipp.h 7847 2008-08-19 04:22:14Z mike $"
+ * "$Id: ipp.h 11173 2013-07-23 12:31:34Z msweet $"
  *
  *   Internet Printing Protocol definitions for CUPS.
  *
@@ -667,5 +667,5 @@ extern int		ippSetVersion(ipp_t *ipp, int major, int minor)
 #endif /* !_CUPS_IPP_H_ */
 
 /*
- * End of "$Id: ipp.h 7847 2008-08-19 04:22:14Z mike $".
+ * End of "$Id: ipp.h 11173 2013-07-23 12:31:34Z msweet $".
  */
diff --git a/cups/langprintf.c b/cups/langprintf.c
index 1a9f8b78..54cef2c7 100644
--- a/cups/langprintf.c
+++ b/cups/langprintf.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: langprintf.c 7802 2008-07-28 18:50:45Z mike $"
+ * "$Id: langprintf.c 11173 2013-07-23 12:31:34Z msweet $"
  *
  *   Localized printf/puts functions for CUPS.
  *
@@ -348,5 +348,5 @@ _cupsSetLocale(char *argv[])		/* IO - Command-line arguments */
 
 
 /*
- * End of "$Id: langprintf.c 7802 2008-07-28 18:50:45Z mike $".
+ * End of "$Id: langprintf.c 11173 2013-07-23 12:31:34Z msweet $".
  */
diff --git a/cups/language-private.h b/cups/language-private.h
index cf5b482b..8b44b8b8 100644
--- a/cups/language-private.h
+++ b/cups/language-private.h
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: language-private.h 11173 2013-07-23 12:31:34Z msweet $"
  *
  *   Private localization support for CUPS.
  *
@@ -82,5 +82,5 @@ extern void		_cupsSetLocale(char *argv[]);
 #endif /* !_CUPS_LANGUAGE_PRIVATE_H_ */
 
 /*
- * End of "$Id$".
+ * End of "$Id: language-private.h 11173 2013-07-23 12:31:34Z msweet $".
  */
diff --git a/cups/language.c b/cups/language.c
index 49f03823..b35a8653 100644
--- a/cups/language.c
+++ b/cups/language.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: language.c 7558 2008-05-12 23:46:44Z mike $"
+ * "$Id: language.c 11173 2013-07-23 12:31:34Z msweet $"
  *
  *   I18N/language support for CUPS.
  *
@@ -1563,5 +1563,5 @@ cups_unquote(char       *d,		/* O - Unquoted string */
 
 
 /*
- * End of "$Id: language.c 7558 2008-05-12 23:46:44Z mike $".
+ * End of "$Id: language.c 11173 2013-07-23 12:31:34Z msweet $".
  */
diff --git a/cups/language.h b/cups/language.h
index 91d2012b..d2ad208b 100644
--- a/cups/language.h
+++ b/cups/language.h
@@ -1,5 +1,5 @@
 /*
- * "$Id: language.h 6649 2007-07-11 21:46:42Z mike $"
+ * "$Id: language.h 11173 2013-07-23 12:31:34Z msweet $"
  *
  *   Multi-language support for CUPS.
  *
@@ -111,5 +111,5 @@ extern cups_lang_t	*cupsLangGet(const char *language);
 #endif /* !_CUPS_LANGUAGE_H_ */
 
 /*
- * End of "$Id: language.h 6649 2007-07-11 21:46:42Z mike $".
+ * End of "$Id: language.h 11173 2013-07-23 12:31:34Z msweet $".
  */
diff --git a/cups/localize.c b/cups/localize.c
index 7bb0fedd..30ccda4e 100644
--- a/cups/localize.c
+++ b/cups/localize.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: localize.c 7679 2008-06-19 23:37:45Z mike $"
+ * "$Id: localize.c 11173 2013-07-23 12:31:34Z msweet $"
  *
  *   PPD localization routines for CUPS.
  *
@@ -775,5 +775,5 @@ ppd_ll_CC(char *ll_CC,			/* O - Country-specific locale name */
 
 
 /*
- * End of "$Id: localize.c 7679 2008-06-19 23:37:45Z mike $".
+ * End of "$Id: localize.c 11173 2013-07-23 12:31:34Z msweet $".
  */
diff --git a/cups/mark.c b/cups/mark.c
index dc2257f3..86bcc095 100644
--- a/cups/mark.c
+++ b/cups/mark.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: mark.c 9042 2010-03-24 00:45:34Z mike $"
+ * "$Id: mark.c 11173 2013-07-23 12:31:34Z msweet $"
  *
  *   Option marking routines for CUPS.
  *
@@ -1097,5 +1097,5 @@ ppd_mark_option(ppd_file_t *ppd,	/* I - PPD file */
 
 
 /*
- * End of "$Id: mark.c 9042 2010-03-24 00:45:34Z mike $".
+ * End of "$Id: mark.c 11173 2013-07-23 12:31:34Z msweet $".
  */
diff --git a/cups/md5-private.h b/cups/md5-private.h
index 3667cf0b..5fe826c6 100644
--- a/cups/md5-private.h
+++ b/cups/md5-private.h
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: md5-private.h 11173 2013-07-23 12:31:34Z msweet $"
  *
  *   Private MD5 definitions for CUPS.
  *
@@ -75,5 +75,5 @@ void _cupsMD5Finish(_cups_md5_state_t *pms, unsigned char digest[16]);
 #endif /* !_CUPS_MD5_PRIVATE_H_ */
 
 /*
- * End of "$Id$".
+ * End of "$Id: md5-private.h 11173 2013-07-23 12:31:34Z msweet $".
  */
diff --git a/cups/md5.c b/cups/md5.c
index f7c42ad2..90789382 100644
--- a/cups/md5.c
+++ b/cups/md5.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: md5.c 9042 2010-03-24 00:45:34Z mike $"
+ * "$Id: md5.c 11173 2013-07-23 12:31:34Z msweet $"
  *
  *   Private MD5 implementation for CUPS.
  *
@@ -342,5 +342,5 @@ _cupsMD5Finish(_cups_md5_state_t *pms, unsigned char digest[16])
 
 
 /*
- * End of "$Id: md5.c 9042 2010-03-24 00:45:34Z mike $".
+ * End of "$Id: md5.c 11173 2013-07-23 12:31:34Z msweet $".
  */
diff --git a/cups/md5passwd.c b/cups/md5passwd.c
index 777073a0..b18e384b 100644
--- a/cups/md5passwd.c
+++ b/cups/md5passwd.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: md5passwd.c 6649 2007-07-11 21:46:42Z mike $"
+ * "$Id: md5passwd.c 11173 2013-07-23 12:31:34Z msweet $"
  *
  *   MD5 password support for CUPS.
  *
@@ -138,5 +138,5 @@ httpMD5String(const unsigned char *sum,	/* I - MD5 sum data */
 
 
 /*
- * End of "$Id: md5passwd.c 6649 2007-07-11 21:46:42Z mike $".
+ * End of "$Id: md5passwd.c 11173 2013-07-23 12:31:34Z msweet $".
  */
diff --git a/cups/notify.c b/cups/notify.c
index 9d520f17..d07745d1 100644
--- a/cups/notify.c
+++ b/cups/notify.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: notify.c 7337 2008-02-22 04:44:04Z mike $"
+ * "$Id: notify.c 11173 2013-07-23 12:31:34Z msweet $"
  *
  *   Notification routines for CUPS.
  *
@@ -198,5 +198,5 @@ cupsNotifyText(cups_lang_t *lang,	/* I - Language data */
 
 
 /*
- * End of "$Id: notify.c 7337 2008-02-22 04:44:04Z mike $".
+ * End of "$Id: notify.c 11173 2013-07-23 12:31:34Z msweet $".
  */
diff --git a/cups/options.c b/cups/options.c
index 8efe0b49..b1b2d411 100644
--- a/cups/options.c
+++ b/cups/options.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: options.c 8181 2008-12-10 17:29:57Z mike $"
+ * "$Id: options.c 11173 2013-07-23 12:31:34Z msweet $"
  *
  *   Option routines for CUPS.
  *
@@ -707,5 +707,5 @@ cups_find_option(
 
 
 /*
- * End of "$Id: options.c 8181 2008-12-10 17:29:57Z mike $".
+ * End of "$Id: options.c 11173 2013-07-23 12:31:34Z msweet $".
  */
diff --git a/cups/page.c b/cups/page.c
index b5c5e34c..ab3eec46 100644
--- a/cups/page.c
+++ b/cups/page.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: page.c 7791 2008-07-24 00:55:30Z mike $"
+ * "$Id: page.c 11173 2013-07-23 12:31:34Z msweet $"
  *
  *   Page size functions for CUPS.
  *
@@ -392,5 +392,5 @@ ppdPageLength(ppd_file_t *ppd,	/* I - PPD file */
 
 
 /*
- * End of "$Id: page.c 7791 2008-07-24 00:55:30Z mike $".
+ * End of "$Id: page.c 11173 2013-07-23 12:31:34Z msweet $".
  */
diff --git a/cups/ppd-cache.c b/cups/ppd-cache.c
index ca1c7737..2905051c 100644
--- a/cups/ppd-cache.c
+++ b/cups/ppd-cache.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: ppd-cache.c 4185 2013-02-20 02:19:13Z msweet $"
+ * "$Id: ppd-cache.c 11173 2013-07-23 12:31:34Z msweet $"
  *
  *   PPD cache implementation for CUPS.
  *
@@ -2631,5 +2631,5 @@ pwg_unppdize_name(const char *ppd,	/* I - PPD keyword */
 
 
 /*
- * End of "$Id: ppd-cache.c 4185 2013-02-20 02:19:13Z msweet $".
+ * End of "$Id: ppd-cache.c 11173 2013-07-23 12:31:34Z msweet $".
  */
diff --git a/cups/ppd-private.h b/cups/ppd-private.h
index b9d79c89..2a2696ce 100644
--- a/cups/ppd-private.h
+++ b/cups/ppd-private.h
@@ -1,5 +1,5 @@
 /*
- * "$Id: ppd-private.h 3683 2012-02-16 22:03:53Z msweet $"
+ * "$Id: ppd-private.h 11173 2013-07-23 12:31:34Z msweet $"
  *
  *   Private PPD definitions for CUPS.
  *
@@ -211,5 +211,5 @@ extern const char	*_pwgPageSizeForMedia(_pwg_media_t *media,
 #endif /* !_CUPS_PPD_PRIVATE_H_ */
 
 /*
- * End of "$Id: ppd-private.h 3683 2012-02-16 22:03:53Z msweet $".
+ * End of "$Id: ppd-private.h 11173 2013-07-23 12:31:34Z msweet $".
  */
diff --git a/cups/ppd.c b/cups/ppd.c
index 1ff51b24..dd8097d3 100644
--- a/cups/ppd.c
+++ b/cups/ppd.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: ppd.c 9900 2011-08-17 20:59:46Z mike $"
+ * "$Id: ppd.c 11173 2013-07-23 12:31:34Z msweet $"
  *
  *   PPD file routines for CUPS.
  *
@@ -3394,5 +3394,5 @@ ppd_update_filters(ppd_file_t      *ppd,/* I - PPD file */
 
 
 /*
- * End of "$Id: ppd.c 9900 2011-08-17 20:59:46Z mike $".
+ * End of "$Id: ppd.c 11173 2013-07-23 12:31:34Z msweet $".
  */
diff --git a/cups/ppd.h b/cups/ppd.h
index 3e281bd4..b8fa365b 100644
--- a/cups/ppd.h
+++ b/cups/ppd.h
@@ -1,5 +1,5 @@
 /*
- * "$Id: ppd.h 7791 2008-07-24 00:55:30Z mike $"
+ * "$Id: ppd.h 11173 2013-07-23 12:31:34Z msweet $"
  *
  *   PostScript Printer Description definitions for CUPS.
  *
@@ -476,5 +476,5 @@ extern int		ppdPageSizeLimits(ppd_file_t *ppd,
 #endif /* !_CUPS_PPD_H_ */
 
 /*
- * End of "$Id: ppd.h 7791 2008-07-24 00:55:30Z mike $".
+ * End of "$Id: ppd.h 11173 2013-07-23 12:31:34Z msweet $".
  */
diff --git a/cups/pwg-media.c b/cups/pwg-media.c
index 0c563555..54574f1d 100644
--- a/cups/pwg-media.c
+++ b/cups/pwg-media.c
@@ -1,9 +1,9 @@
 /*
- * "$Id: pwg-media.c 10979 2013-05-13 17:39:19Z msweet $"
+ * "$Id: pwg-media.c 11241 2013-08-14 20:41:32Z msweet $"
  *
  *   PWG media name API implementation for CUPS.
  *
- *   Copyright 2009-2012 by Apple Inc.
+ *   Copyright 2009-2013 by Apple Inc.
  *
  *   These coded instructions, statements, and computer programs are the
  *   property of Apple Inc. and are protected by Federal copyright
@@ -15,6 +15,19 @@
  *
  * Contents:
  *
+ *   _pwgFormatInches()      - Convert and format PWG units as inches.
+ *   _pwgFormatMillimeters() - Convert and format PWG units as millimeters.
+ *   _pwgGenerateSize()      - Generate a PWG size keyword.
+ *   _pwgInitSize()	     - Initialize a PWG size using IPP job template
+ *			       attributes.
+ *   _pwgMediaForLegacy()    - Find a PWG media size by ISO/IPP legacy name.
+ *   _pwgMediaForPPD()	     - Find a PWG media size by Adobe PPD name.
+ *   _pwgMediaForPWG()	     - Find a PWG media size by 5101.1 self-describing
+ *			       name.
+ *   _pwgMediaForSize()      - Get the PWG media name for a given size.
+ *   pwg_compare_legacy()    - Compare two sizes using the legacy names.
+ *   pwg_compare_ppd()	     - Compare two sizes using the PPD names.
+ *   pwg_compare_pwg()	     - Compare two sizes using the PWG names.
  */
 
 /*
@@ -208,13 +221,11 @@ static _pwg_media_t const cups_pwg_media[] =
   _PWG_MEDIA_MM("prc_5_110x220mm", NULL, "EnvPRC5", 110, 220),
   _PWG_MEDIA_MM("prc_8_120x309mm", NULL, "EnvPRC8", 120, 309),
   _PWG_MEDIA_MM("prc_6_120x320mm", NULL, NULL, 120, 320),
-  _PWG_MEDIA_MM("prc_3_125x176mm", NULL, "EnvPRC3", 125, 176),
   _PWG_MEDIA_MM("prc_16k_146x215mm", NULL, "PRC16K", 146, 215),
   _PWG_MEDIA_MM("prc_7_160x230mm", NULL, "EnvPRC7", 160, 230),
   _PWG_MEDIA_MM("om_juuro-ku-kai_198x275mm", NULL, NULL, 198, 275),
   _PWG_MEDIA_MM("om_pa-kai_267x389mm", NULL, NULL, 267, 389),
   _PWG_MEDIA_MM("om_dai-pa-kai_275x395mm", NULL, NULL, 275, 395),
-  _PWG_MEDIA_MM("prc_10_324x458mm", NULL, "EnvPRC10", 324, 458),
 
   /* Other English Standard Sheet Media Sizes */
   _PWG_MEDIA_IN("oe_photo-l_3.5x5in", NULL, "3.5x5", 3.5, 5),
@@ -222,7 +233,6 @@ static _pwg_media_t const cups_pwg_media[] =
   /* Other Metric Standard Sheet Media Sizes */
   _PWG_MEDIA_MM("om_small-photo_100x150mm", NULL, "om_small-photo", 100, 150),
   _PWG_MEDIA_MM("om_italian_110x230mm", NULL, "EnvItalian", 110, 230),
-  _PWG_MEDIA_MM("om_postfix_114x229mm", NULL, NULL, 114, 229),
   _PWG_MEDIA_MM("om_large-photo_200x300", NULL, "om_large-photo", 200, 300),
   _PWG_MEDIA_MM("om_folio_210x330mm", "folio", "Folio", 210, 330),
   _PWG_MEDIA_MM("om_folio-sp_215x315mm", NULL, "FolioSP", 215, 315),
@@ -924,5 +934,5 @@ pwg_compare_pwg(_pwg_media_t *a,	/* I - First size */
 
 
 /*
- * End of "$Id: pwg-media.c 10979 2013-05-13 17:39:19Z msweet $".
+ * End of "$Id: pwg-media.c 11241 2013-08-14 20:41:32Z msweet $".
  */
diff --git a/cups/pwg-private.h b/cups/pwg-private.h
index 3c7a1a7b..113a1e7c 100644
--- a/cups/pwg-private.h
+++ b/cups/pwg-private.h
@@ -1,5 +1,5 @@
 /*
- * "$Id: pwg-private.h 3833 2012-05-23 22:51:18Z msweet $"
+ * "$Id: pwg-private.h 11173 2013-07-23 12:31:34Z msweet $"
  *
  *   Private PWG media API definitions for CUPS.
  *
@@ -100,5 +100,5 @@ extern _pwg_media_t	*_pwgMediaForSize(int width, int length);
 #endif /* !_CUPS_PWG_PRIVATE_H_ */
 
 /*
- * End of "$Id: pwg-private.h 3833 2012-05-23 22:51:18Z msweet $".
+ * End of "$Id: pwg-private.h 11173 2013-07-23 12:31:34Z msweet $".
  */
diff --git a/cups/raster-private.h b/cups/raster-private.h
index ebd5d721..77ec7c26 100644
--- a/cups/raster-private.h
+++ b/cups/raster-private.h
@@ -1,5 +1,5 @@
 /*
- * "$Id: raster-private.h 3794 2012-04-23 22:44:16Z msweet $"
+ * "$Id: raster-private.h 11173 2013-07-23 12:31:34Z msweet $"
  *
  *   Private image library definitions for CUPS.
  *
@@ -62,5 +62,5 @@ extern void		_cupsRasterClearError(void);
 #endif /* !_CUPS_RASTER_PRIVATE_H_ */
 
 /*
- * End of "$Id: raster-private.h 3794 2012-04-23 22:44:16Z msweet $".
+ * End of "$Id: raster-private.h 11173 2013-07-23 12:31:34Z msweet $".
  */
diff --git a/cups/raster.h b/cups/raster.h
index a0bbdda2..c638f5a5 100644
--- a/cups/raster.h
+++ b/cups/raster.h
@@ -1,5 +1,5 @@
 /*
- * "$Id: raster.h 3794 2012-04-23 22:44:16Z msweet $"
+ * "$Id: raster.h 11173 2013-07-23 12:31:34Z msweet $"
  *
  *   Raster file definitions for CUPS.
  *
@@ -401,5 +401,5 @@ extern cups_raster_t	*cupsRasterOpenIO(cups_raster_iocb_t iocb, void *ctx,
 #endif /* !_CUPS_RASTER_H_ */
 
 /*
- * End of "$Id: raster.h 3794 2012-04-23 22:44:16Z msweet $".
+ * End of "$Id: raster.h 11173 2013-07-23 12:31:34Z msweet $".
  */
diff --git a/cups/request.c b/cups/request.c
index 59ac6dd2..9afe1e51 100644
--- a/cups/request.c
+++ b/cups/request.c
@@ -1,9 +1,9 @@
 /*
- * "$Id: request.c 7946 2008-09-16 23:27:54Z mike $"
+ * "$Id: request.c 11176 2013-07-23 13:24:57Z msweet $"
  *
  *   IPP utilities for CUPS.
  *
- *   Copyright 2007-2012 by Apple Inc.
+ *   Copyright 2007-2013 by Apple Inc.
  *   Copyright 1997-2007 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -1010,10 +1010,16 @@ _cupsConnect(void)
       * Same server, see if the connection is still established...
       */
 
-      char ch;				/* Connection check byte */
+      char	ch;			/* Connection check byte */
+      ssize_t	n;			/* Number of bytes */
 
-      if (recv(cg->http->fd, &ch, 1, MSG_PEEK | MSG_DONTWAIT) < 0 &&
-          errno != EWOULDBLOCK)
+#ifdef WIN32
+      if ((n = recv(cg->http->fd, &ch, 1, MSG_PEEK)) == 0 ||
+          (n < 0 && WSAGetLastError() != WSAEWOULDBLOCK))
+#else
+      if ((n = recv(cg->http->fd, &ch, 1, MSG_PEEK | MSG_DONTWAIT)) == 0 ||
+          (n < 0 && errno != EWOULDBLOCK))
+#endif /* WIN32 */
       {
        /*
         * Nope, close the connection...
@@ -1164,5 +1170,5 @@ _cupsSetHTTPError(http_status_t status)	/* I - HTTP status code */
 
 
 /*
- * End of "$Id: request.c 7946 2008-09-16 23:27:54Z mike $".
+ * End of "$Id: request.c 11176 2013-07-23 13:24:57Z msweet $".
  */
diff --git a/cups/sidechannel.c b/cups/sidechannel.c
index 7bd626ea..169d7219 100644
--- a/cups/sidechannel.c
+++ b/cups/sidechannel.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: sidechannel.c 7720 2008-07-11 22:46:21Z mike $"
+ * "$Id: sidechannel.c 11173 2013-07-23 12:31:34Z msweet $"
  *
  *   Side-channel API code for CUPS.
  *
@@ -638,5 +638,5 @@ cupsSideChannelWrite(
 
 
 /*
- * End of "$Id: sidechannel.c 7720 2008-07-11 22:46:21Z mike $".
+ * End of "$Id: sidechannel.c 11173 2013-07-23 12:31:34Z msweet $".
  */
diff --git a/cups/sidechannel.h b/cups/sidechannel.h
index 5f97257e..19494b2c 100644
--- a/cups/sidechannel.h
+++ b/cups/sidechannel.h
@@ -1,5 +1,5 @@
 /*
- * "$Id: sidechannel.h 7616 2008-05-28 00:34:13Z mike $"
+ * "$Id: sidechannel.h 11173 2013-07-23 12:31:34Z msweet $"
  *
  *   Side-channel API definitions for CUPS.
  *
@@ -143,5 +143,5 @@ extern cups_sc_status_t	cupsSideChannelSNMPWalk(const char *oid, double timeout,
 #endif /* !_CUPS_SIDECHANNEL_H_ */
 
 /*
- * End of "$Id: sidechannel.h 7616 2008-05-28 00:34:13Z mike $".
+ * End of "$Id: sidechannel.h 11173 2013-07-23 12:31:34Z msweet $".
  */
diff --git a/cups/snmp-private.h b/cups/snmp-private.h
index 9661243b..e0c3608d 100644
--- a/cups/snmp-private.h
+++ b/cups/snmp-private.h
@@ -1,5 +1,5 @@
 /*
- * "$Id: snmp-private.h 3794 2012-04-23 22:44:16Z msweet $"
+ * "$Id: snmp-private.h 11173 2013-07-23 12:31:34Z msweet $"
  *
  *   Private SNMP definitions for CUPS.
  *
@@ -142,5 +142,5 @@ extern int		_cupsSNMPWrite(int fd, http_addr_t *address, int version,
 
 
 /*
- * End of "$Id: snmp-private.h 3794 2012-04-23 22:44:16Z msweet $".
+ * End of "$Id: snmp-private.h 11173 2013-07-23 12:31:34Z msweet $".
  */
diff --git a/cups/snmp.c b/cups/snmp.c
index 0c0e5209..419bcfb5 100644
--- a/cups/snmp.c
+++ b/cups/snmp.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: snmp.c 3794 2012-04-23 22:44:16Z msweet $"
+ * "$Id: snmp.c 11173 2013-07-23 12:31:34Z msweet $"
  *
  *   SNMP functions for CUPS.
  *
@@ -1733,5 +1733,5 @@ snmp_set_error(cups_snmp_t *packet,	/* I - Packet */
 
 
 /*
- * End of "$Id: snmp.c 3794 2012-04-23 22:44:16Z msweet $".
+ * End of "$Id: snmp.c 11173 2013-07-23 12:31:34Z msweet $".
  */
diff --git a/cups/snprintf.c b/cups/snprintf.c
index fcebf895..4e4d91f6 100644
--- a/cups/snprintf.c
+++ b/cups/snprintf.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: snprintf.c 6649 2007-07-11 21:46:42Z mike $"
+ * "$Id: snprintf.c 11173 2013-07-23 12:31:34Z msweet $"
  *
  *   snprintf functions for CUPS.
  *
@@ -357,6 +357,6 @@ _cups_snprintf(char       *buffer,	/* O - Output buffer */
 
 
 /*
- * End of "$Id: snprintf.c 6649 2007-07-11 21:46:42Z mike $".
+ * End of "$Id: snprintf.c 11173 2013-07-23 12:31:34Z msweet $".
  */
 
diff --git a/cups/sspi.c b/cups/sspi.c
index ff79e5a6..97e9654f 100644
--- a/cups/sspi.c
+++ b/cups/sspi.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: sspi.c 3247 2011-05-12 06:22:31Z msweet $"
+ * "$Id: sspi.c 11173 2013-07-23 12:31:34Z msweet $"
  *
  *   Windows SSPI SSL implementation for CUPS.
  *
@@ -1481,5 +1481,5 @@ cleanup:
 
 
 /*
- * End of "$Id: sspi.c 3247 2011-05-12 06:22:31Z msweet $".
+ * End of "$Id: sspi.c 11173 2013-07-23 12:31:34Z msweet $".
  */
diff --git a/cups/string-private.h b/cups/string-private.h
index bef1aea8..c0bded38 100644
--- a/cups/string-private.h
+++ b/cups/string-private.h
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: string-private.h 11173 2013-07-23 12:31:34Z msweet $"
  *
  *   Private string definitions for CUPS.
  *
@@ -196,5 +196,5 @@ extern double	_cupsStrScand(const char *buf, char **bufptr,
 #endif /* !_CUPS_STRING_H_ */
 
 /*
- * End of "$Id$".
+ * End of "$Id: string-private.h 11173 2013-07-23 12:31:34Z msweet $".
  */
diff --git a/cups/string.c b/cups/string.c
index 538a2638..85754243 100644
--- a/cups/string.c
+++ b/cups/string.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: string.c 7460 2008-04-16 02:19:54Z mike $"
+ * "$Id: string.c 11173 2013-07-23 12:31:34Z msweet $"
  *
  *   String functions for CUPS.
  *
@@ -755,5 +755,5 @@ compare_sp_items(_cups_sp_item_t *a,	/* I - First item */
 
 
 /*
- * End of "$Id: string.c 7460 2008-04-16 02:19:54Z mike $".
+ * End of "$Id: string.c 11173 2013-07-23 12:31:34Z msweet $".
  */
diff --git a/cups/tempfile.c b/cups/tempfile.c
index ac59d9f8..e992f40e 100644
--- a/cups/tempfile.c
+++ b/cups/tempfile.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: tempfile.c 7337 2008-02-22 04:44:04Z mike $"
+ * "$Id: tempfile.c 11173 2013-07-23 12:31:34Z msweet $"
  *
  *   Temp file utilities for CUPS.
  *
@@ -229,5 +229,5 @@ cupsTempFile2(char *filename,		/* I - Pointer to buffer */
 
 
 /*
- * End of "$Id: tempfile.c 7337 2008-02-22 04:44:04Z mike $".
+ * End of "$Id: tempfile.c 11173 2013-07-23 12:31:34Z msweet $".
  */
diff --git a/cups/testadmin.c b/cups/testadmin.c
index a16025c3..fac75282 100644
--- a/cups/testadmin.c
+++ b/cups/testadmin.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: testadmin.c 7720 2008-07-11 22:46:21Z mike $"
+ * "$Id: testadmin.c 11173 2013-07-23 12:31:34Z msweet $"
  *
  *   Admin function test program for CUPS.
  *
@@ -116,5 +116,5 @@ show_settings(
 
 
 /*
- * End of "$Id: testadmin.c 7720 2008-07-11 22:46:21Z mike $".
+ * End of "$Id: testadmin.c 11173 2013-07-23 12:31:34Z msweet $".
  */
diff --git a/cups/testarray.c b/cups/testarray.c
index 2e254c24..a73da610 100644
--- a/cups/testarray.c
+++ b/cups/testarray.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: testarray.c 6649 2007-07-11 21:46:42Z mike $"
+ * "$Id: testarray.c 11173 2013-07-23 12:31:34Z msweet $"
  *
  *   Array test program for CUPS.
  *
@@ -476,5 +476,5 @@ load_words(const char   *filename,	/* I - File to load */
 
 
 /*
- * End of "$Id: testarray.c 6649 2007-07-11 21:46:42Z mike $".
+ * End of "$Id: testarray.c 11173 2013-07-23 12:31:34Z msweet $".
  */
diff --git a/cups/testconflicts.c b/cups/testconflicts.c
index 0ccca825..9b21356d 100644
--- a/cups/testconflicts.c
+++ b/cups/testconflicts.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: testconflicts.c 3755 2012-03-30 05:59:14Z msweet $"
+ * "$Id: testconflicts.c 11173 2013-07-23 12:31:34Z msweet $"
  *
  *   PPD constraint test program for CUPS.
  *
@@ -134,5 +134,5 @@ main(int  argc,				/* I - Number of command-line arguments */
 
 
 /*
- * End of "$Id: testconflicts.c 3755 2012-03-30 05:59:14Z msweet $".
+ * End of "$Id: testconflicts.c 11173 2013-07-23 12:31:34Z msweet $".
  */
diff --git a/cups/testcups.c b/cups/testcups.c
index 18bb39cc..e151f4a1 100644
--- a/cups/testcups.c
+++ b/cups/testcups.c
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: testcups.c 11173 2013-07-23 12:31:34Z msweet $"
  *
  *   CUPS API test program for CUPS.
  *
@@ -566,5 +566,5 @@ show_diffs(cups_dest_t *a,		/* I - First destination */
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: testcups.c 11173 2013-07-23 12:31:34Z msweet $".
  */
diff --git a/cups/testfile.c b/cups/testfile.c
index 2aa3fb99..207e4103 100644
--- a/cups/testfile.c
+++ b/cups/testfile.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: testfile.c 7720 2008-07-11 22:46:21Z mike $"
+ * "$Id: testfile.c 11173 2013-07-23 12:31:34Z msweet $"
  *
  *   File test program for CUPS.
  *
@@ -817,5 +817,5 @@ read_write_tests(int compression)	/* I - Use compression? */
 
 
 /*
- * End of "$Id: testfile.c 7720 2008-07-11 22:46:21Z mike $".
+ * End of "$Id: testfile.c 11173 2013-07-23 12:31:34Z msweet $".
  */
diff --git a/cups/testhttp.c b/cups/testhttp.c
index 10fb6245..c93a28a9 100644
--- a/cups/testhttp.c
+++ b/cups/testhttp.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: testhttp.c 7742 2008-07-15 20:23:09Z mike $"
+ * "$Id: testhttp.c 11173 2013-07-23 12:31:34Z msweet $"
  *
  *   HTTP test program for CUPS.
  *
@@ -600,5 +600,5 @@ main(int  argc,				/* I - Number of command-line arguments */
 
 
 /*
- * End of "$Id: testhttp.c 7742 2008-07-15 20:23:09Z mike $".
+ * End of "$Id: testhttp.c 11173 2013-07-23 12:31:34Z msweet $".
  */
diff --git a/cups/testi18n.c b/cups/testi18n.c
index 725c01b2..0fa0bcc6 100644
--- a/cups/testi18n.c
+++ b/cups/testi18n.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: testi18n.c 7560 2008-05-13 06:34:04Z mike $"
+ * "$Id: testi18n.c 11173 2013-07-23 12:31:34Z msweet $"
  *
  *   Internationalization test for CUPS.
  *
@@ -615,5 +615,5 @@ print_utf8(const char	     *msg,	/* I - Message String */
 
 
 /*
- * End of "$Id: testi18n.c 7560 2008-05-13 06:34:04Z mike $"
+ * End of "$Id: testi18n.c 11173 2013-07-23 12:31:34Z msweet $"
  */
diff --git a/cups/testipp.c b/cups/testipp.c
index 5655b6be..d9d7bee3 100644
--- a/cups/testipp.c
+++ b/cups/testipp.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: testipp.c 6649 2007-07-11 21:46:42Z mike $"
+ * "$Id: testipp.c 11173 2013-07-23 12:31:34Z msweet $"
  *
  *   IPP test program for CUPS.
  *
@@ -1001,5 +1001,5 @@ write_cb(_ippdata_t   *data,		/* I - Data */
 
 
 /*
- * End of "$Id: testipp.c 6649 2007-07-11 21:46:42Z mike $".
+ * End of "$Id: testipp.c 11173 2013-07-23 12:31:34Z msweet $".
  */
diff --git a/cups/testlang.c b/cups/testlang.c
index 2cec8b6b..0f8942f8 100644
--- a/cups/testlang.c
+++ b/cups/testlang.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: testlang.c 6649 2007-07-11 21:46:42Z mike $"
+ * "$Id: testlang.c 11173 2013-07-23 12:31:34Z msweet $"
  *
  *   Localization test program for CUPS.
  *
@@ -110,5 +110,5 @@ main(int  argc,				/* I - Number of command-line arguments */
 
 
 /*
- * End of "$Id: testlang.c 6649 2007-07-11 21:46:42Z mike $".
+ * End of "$Id: testlang.c 11173 2013-07-23 12:31:34Z msweet $".
  */
diff --git a/cups/testoptions.c b/cups/testoptions.c
index d14b64f8..144f1616 100644
--- a/cups/testoptions.c
+++ b/cups/testoptions.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: testoptions.c 1992 2010-03-24 14:32:08Z msweet $"
+ * "$Id: testoptions.c 11173 2013-07-23 12:31:34Z msweet $"
  *
  *   Option test program for CUPS.
  *
@@ -112,5 +112,5 @@ main(int  argc,				/* I - Number of command-line arguments */
 
 
 /*
- * End of "$Id: testoptions.c 1992 2010-03-24 14:32:08Z msweet $".
+ * End of "$Id: testoptions.c 11173 2013-07-23 12:31:34Z msweet $".
  */
diff --git a/cups/testppd.c b/cups/testppd.c
index 5e291ce8..d66be19e 100644
--- a/cups/testppd.c
+++ b/cups/testppd.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: testppd.c 7897 2008-09-02 19:33:19Z mike $"
+ * "$Id: testppd.c 11173 2013-07-23 12:31:34Z msweet $"
  *
  *   PPD test program for CUPS.
  *
@@ -1098,5 +1098,5 @@ main(int  argc,				/* I - Number of command-line arguments */
 
 
 /*
- * End of "$Id: testppd.c 7897 2008-09-02 19:33:19Z mike $".
+ * End of "$Id: testppd.c 11173 2013-07-23 12:31:34Z msweet $".
  */
diff --git a/cups/testpwg.c b/cups/testpwg.c
index ef3279f7..9b6741e0 100644
--- a/cups/testpwg.c
+++ b/cups/testpwg.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: testpwg.c 3794 2012-04-23 22:44:16Z msweet $"
+ * "$Id: testpwg.c 11173 2013-07-23 12:31:34Z msweet $"
  *
  *   PWG test program for CUPS.
  *
@@ -521,5 +521,5 @@ test_ppd_cache(_ppd_cache_t *pc,	/* I - PWG mapping data */
 
 
 /*
- * End of "$Id: testpwg.c 3794 2012-04-23 22:44:16Z msweet $".
+ * End of "$Id: testpwg.c 11173 2013-07-23 12:31:34Z msweet $".
  */
diff --git a/cups/testsnmp.c b/cups/testsnmp.c
index b60c2b79..809584fd 100644
--- a/cups/testsnmp.c
+++ b/cups/testsnmp.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: testsnmp.c 3411 2011-09-07 22:31:27Z msweet $"
+ * "$Id: testsnmp.c 11173 2013-07-23 12:31:34Z msweet $"
  *
  *   SNMP test program for CUPS.
  *
@@ -300,5 +300,5 @@ usage(void)
 
 
 /*
- * End of "$Id: testsnmp.c 3411 2011-09-07 22:31:27Z msweet $".
+ * End of "$Id: testsnmp.c 11173 2013-07-23 12:31:34Z msweet $".
  */
diff --git a/cups/thread-private.h b/cups/thread-private.h
index 3409be44..8682222d 100644
--- a/cups/thread-private.h
+++ b/cups/thread-private.h
@@ -1,5 +1,5 @@
 /*
- * "$Id: thread-private.h 3794 2012-04-23 22:44:16Z msweet $"
+ * "$Id: thread-private.h 11173 2013-07-23 12:31:34Z msweet $"
  *
  *   Private threading definitions for CUPS.
  *
@@ -94,5 +94,5 @@ extern int	_cupsThreadCreate(_cups_thread_func_t func, void *arg);
 #endif /* !_CUPS_THREAD_PRIVATE_H_ */
 
 /*
- * End of "$Id: thread-private.h 3794 2012-04-23 22:44:16Z msweet $".
+ * End of "$Id: thread-private.h 11173 2013-07-23 12:31:34Z msweet $".
  */
diff --git a/cups/thread.c b/cups/thread.c
index 0f623298..7f1ea213 100644
--- a/cups/thread.c
+++ b/cups/thread.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: thread.c 3794 2012-04-23 22:44:16Z msweet $"
+ * "$Id: thread.c 11173 2013-07-23 12:31:34Z msweet $"
  *
  *   Threading primitives for CUPS.
  *
@@ -332,5 +332,5 @@ _cupsThreadCreate(
 
 
 /*
- * End of "$Id: thread.c 3794 2012-04-23 22:44:16Z msweet $".
+ * End of "$Id: thread.c 11173 2013-07-23 12:31:34Z msweet $".
  */
diff --git a/cups/transcode.c b/cups/transcode.c
index 8c58dab6..22892209 100644
--- a/cups/transcode.c
+++ b/cups/transcode.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: transcode.c 9306 2010-09-16 21:43:57Z mike $"
+ * "$Id: transcode.c 11173 2013-07-23 12:31:34Z msweet $"
  *
  *   Transcoding support for CUPS.
  *
@@ -716,5 +716,5 @@ cupsUTF32ToUTF8(
 
 
 /*
- * End of "$Id: transcode.c 9306 2010-09-16 21:43:57Z mike $"
+ * End of "$Id: transcode.c 11173 2013-07-23 12:31:34Z msweet $"
  */
diff --git a/cups/transcode.h b/cups/transcode.h
index e2db9513..7c7840ec 100644
--- a/cups/transcode.h
+++ b/cups/transcode.h
@@ -1,5 +1,5 @@
 /*
- * "$Id: transcode.h 7026 2007-10-19 00:57:45Z mike $"
+ * "$Id: transcode.h 11173 2013-07-23 12:31:34Z msweet $"
  *
  *   Transcoding definitions for CUPS.
  *
@@ -77,5 +77,5 @@ extern int	cupsUTF32ToUTF8(cups_utf8_t *dest,
 
 
 /*
- * End of "$Id: transcode.h 7026 2007-10-19 00:57:45Z mike $"
+ * End of "$Id: transcode.h 11173 2013-07-23 12:31:34Z msweet $"
  */
diff --git a/cups/usersys.c b/cups/usersys.c
index 3ef68536..73d47f55 100644
--- a/cups/usersys.c
+++ b/cups/usersys.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: usersys.c 8498 2009-04-13 17:03:15Z mike $"
+ * "$Id: usersys.c 11173 2013-07-23 12:31:34Z msweet $"
  *
  *   User, system, and password routines for CUPS.
  *
@@ -1057,5 +1057,5 @@ cups_read_client_conf(
 
 
 /*
- * End of "$Id: usersys.c 8498 2009-04-13 17:03:15Z mike $".
+ * End of "$Id: usersys.c 11173 2013-07-23 12:31:34Z msweet $".
  */
diff --git a/cups/util.c b/cups/util.c
index 07a660d9..87cf327e 100644
--- a/cups/util.c
+++ b/cups/util.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: util.c 7850 2008-08-20 00:07:25Z mike $"
+ * "$Id: util.c 11173 2013-07-23 12:31:34Z msweet $"
  *
  *   Printing utilities for CUPS.
  *
@@ -1844,5 +1844,5 @@ cups_get_printer_uri(
 
 
 /*
- * End of "$Id: util.c 7850 2008-08-20 00:07:25Z mike $".
+ * End of "$Id: util.c 11173 2013-07-23 12:31:34Z msweet $".
  */
diff --git a/cups/versioning.h b/cups/versioning.h
index ad2b5d2f..9ccf18ff 100644
--- a/cups/versioning.h
+++ b/cups/versioning.h
@@ -1,5 +1,5 @@
 /*
- * "$Id: versioning.h 3794 2012-04-23 22:44:16Z msweet $"
+ * "$Id: versioning.h 11173 2013-07-23 12:31:34Z msweet $"
  *
  *   API versioning definitions for CUPS.
  *
@@ -86,5 +86,5 @@
 #endif /* !_CUPS_VERSIONING_H_ */
 
 /*
- * End of "$Id: versioning.h 3794 2012-04-23 22:44:16Z msweet $".
+ * End of "$Id: versioning.h 11173 2013-07-23 12:31:34Z msweet $".
  */
diff --git a/data/Makefile b/data/Makefile
index 7df82609..5adc9e91 100644
--- a/data/Makefile
+++ b/data/Makefile
@@ -1,5 +1,5 @@
 #
-# "$Id: Makefile 7871 2008-08-27 21:12:43Z mike $"
+# "$Id: Makefile 11173 2013-07-23 12:31:34Z msweet $"
 #
 #   Datafile makefile for CUPS.
 #
@@ -146,5 +146,5 @@ uninstall:
 
 
 #
-# End of "$Id: Makefile 7871 2008-08-27 21:12:43Z mike $".
+# End of "$Id: Makefile 11173 2013-07-23 12:31:34Z msweet $".
 #
diff --git a/data/epson.h b/data/epson.h
index 1b0fe9fe..ee6b8af9 100644
--- a/data/epson.h
+++ b/data/epson.h
@@ -1,5 +1,5 @@
 /*
- * "$Id: epson.h 624 2008-02-16 00:27:39Z msweet $"
+ * "$Id: epson.h 11173 2013-07-23 12:31:34Z msweet $"
  *
  *   This file contains model number definitions for the CUPS sample
  *   ESC/P driver.
@@ -23,5 +23,5 @@
 
 
 /*
- * End of "$Id: epson.h 624 2008-02-16 00:27:39Z msweet $".
+ * End of "$Id: epson.h 11173 2013-07-23 12:31:34Z msweet $".
  */
diff --git a/data/hp.h b/data/hp.h
index 3a5ba3da..30de5788 100644
--- a/data/hp.h
+++ b/data/hp.h
@@ -1,5 +1,5 @@
 /*
- * "$Id: hp.h 624 2008-02-16 00:27:39Z msweet $"
+ * "$Id: hp.h 11173 2013-07-23 12:31:34Z msweet $"
  *
  *   This file contains model number definitions for the CUPS sample
  *   HP driver.
@@ -20,5 +20,5 @@
 
 
 /*
- * End of "$Id: hp.h 624 2008-02-16 00:27:39Z msweet $".
+ * End of "$Id: hp.h 11173 2013-07-23 12:31:34Z msweet $".
  */
diff --git a/data/label.h b/data/label.h
index 38cdc37b..23450ded 100644
--- a/data/label.h
+++ b/data/label.h
@@ -1,5 +1,5 @@
 /*
- * "$Id: label.h 624 2008-02-16 00:27:39Z msweet $"
+ * "$Id: label.h 11173 2013-07-23 12:31:34Z msweet $"
  *
  *   This file contains model number definitions for the CUPS sample
  *   label printer driver.
@@ -24,5 +24,5 @@
 #define INTELLITECH_PCL	0x20		/* Intellitech PCL-based printers */
 
 /*
- * End of "$Id: label.h 624 2008-02-16 00:27:39Z msweet $".
+ * End of "$Id: label.h 11173 2013-07-23 12:31:34Z msweet $".
  */
diff --git a/desktop/Makefile b/desktop/Makefile
index c4fdd767..e3826366 100644
--- a/desktop/Makefile
+++ b/desktop/Makefile
@@ -1,5 +1,5 @@
 #
-# "$Id: Makefile 1725 2009-10-15 18:50:47Z msweet $"
+# "$Id: Makefile 11173 2013-07-23 12:31:34Z msweet $"
 #
 #   Desktop makefile for CUPS.
 #
@@ -131,5 +131,5 @@ uninstall:
 
 
 #
-# End of "$Id: Makefile 1725 2009-10-15 18:50:47Z msweet $".
+# End of "$Id: Makefile 11173 2013-07-23 12:31:34Z msweet $".
 #
diff --git a/doc/Makefile b/doc/Makefile
index ae010948..c7267479 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -1,5 +1,5 @@
 #
-# "$Id: Makefile 7941 2008-09-16 00:46:13Z mike $"
+# "$Id: Makefile 11173 2013-07-23 12:31:34Z msweet $"
 #
 #   Documentation makefile for CUPS.
 #
diff --git a/doc/help/ref-cups-files-conf.html.in b/doc/help/ref-cups-files-conf.html.in
index fa922cb2..07049d94 100644
--- a/doc/help/ref-cups-files-conf.html.in
+++ b/doc/help/ref-cups-files-conf.html.in
@@ -437,6 +437,31 @@ to resolve relative paths in the <VAR>cupsd.conf</VAR> file. The
 default server directory is <VAR>/etc/cups</VAR>.</P>
 
 
+<H2 CLASS="title"><SPAN CLASS="info">CUPS 1.6.4</SPAN><A NAME="SyncOnClose">SyncOnClose</A></H2>
+
+<H3>Examples</H3>
+
+<PRE CLASS="command">
+SyncOnClose No
+SyncOnClose Yes
+</PRE>
+
+<H3>Description</H3>
+
+<P>The <CODE>SyncOnClose</CODE> directive determines whether the scheduler
+flushes changes to configuration and state files to disk. The default is
+<CODE>No</CODE> which relies on the operating system to schedule a suitable
+time to write changes to disk.</P>
+
+<BLOCKQUOTE><B>Note:</B>
+
+<P>Setting <CODE>SyncOnClose</CODE> to <CODE>Yes</CODE> makes the scheduler use the <CODE>fsync(2)</CODE> system call to write all changes to disk, however the drive or network file system server may still delay writing data to disk. Do not depend on this functionality to prevent data loss in the event of unexpected hardware failure.</P>
+
+<P>Enabling <CODE>SyncOnClose</CODE> may also cause the scheduler to periodically become unresponsive while it waits for changes to be written.</P>
+
+</BLOCKQUOTE>
+
+
 <H2 CLASS="title"><A NAME="SystemGroup">SystemGroup</A></H2>
 
 <H3>Examples</H3>
diff --git a/examples/Makefile b/examples/Makefile
index f4737a64..2a3b1b7a 100644
--- a/examples/Makefile
+++ b/examples/Makefile
@@ -1,5 +1,5 @@
 #
-# "$Id: Makefile 3247 2011-05-12 06:22:31Z msweet $"
+# "$Id: Makefile 11173 2013-07-23 12:31:34Z msweet $"
 #
 #   PPD compiler example makefile for CUPS.
 #
@@ -124,5 +124,5 @@ uninstall:
 
 
 #
-# End of "$Id: Makefile 3247 2011-05-12 06:22:31Z msweet $".
+# End of "$Id: Makefile 11173 2013-07-23 12:31:34Z msweet $".
 #
diff --git a/examples/ppdx.c b/examples/ppdx.c
index 920f8db1..86961f04 100644
--- a/examples/ppdx.c
+++ b/examples/ppdx.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: ppdx.c 3833 2012-05-23 22:51:18Z msweet $"
+ * "$Id: ppdx.c 11173 2013-07-23 12:31:34Z msweet $"
  *
  *   Example code for encoding and decoding large amounts of data in a PPD file.
  *   This would typically be used in a driver to save configuration/state
@@ -310,5 +310,5 @@ ppdxWriteData(const char *name,		/* I - Base name of keyword */
 
 
 /*
- * End of "$Id: ppdx.c 3833 2012-05-23 22:51:18Z msweet $".
+ * End of "$Id: ppdx.c 11173 2013-07-23 12:31:34Z msweet $".
  */
diff --git a/examples/ppdx.h b/examples/ppdx.h
index 14f34b34..40a459db 100644
--- a/examples/ppdx.h
+++ b/examples/ppdx.h
@@ -1,5 +1,5 @@
 /*
- * "$Id: ppdx.h 3833 2012-05-23 22:51:18Z msweet $"
+ * "$Id: ppdx.h 11173 2013-07-23 12:31:34Z msweet $"
  *
  *   Header for PPD data encoding example code.
  *
@@ -78,5 +78,5 @@ extern void	ppdxWriteData(const char *name, const void *data,
 #endif /* !_PPDX_H */
 
 /*
- * End of "$Id: ppdx.h 3833 2012-05-23 22:51:18Z msweet $".
+ * End of "$Id: ppdx.h 11173 2013-07-23 12:31:34Z msweet $".
  */
diff --git a/examples/testppdx.c b/examples/testppdx.c
index 372f3d55..daa147bb 100644
--- a/examples/testppdx.c
+++ b/examples/testppdx.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: testppdx.c 3833 2012-05-23 22:51:18Z msweet $"
+ * "$Id: testppdx.c 11173 2013-07-23 12:31:34Z msweet $"
  *
  *   Test program for PPD data encoding example code.
  *
@@ -113,5 +113,5 @@ main(void)
 
 
 /*
- * End of "$Id: testppdx.c 3833 2012-05-23 22:51:18Z msweet $".
+ * End of "$Id: testppdx.c 11173 2013-07-23 12:31:34Z msweet $".
  */
diff --git a/filter/Makefile b/filter/Makefile
index 85f9d8a3..ea27f123 100644
--- a/filter/Makefile
+++ b/filter/Makefile
@@ -1,5 +1,5 @@
 #
-# "$Id: Makefile 7871 2008-08-27 21:12:43Z mike $"
+# "$Id: Makefile 11173 2013-07-23 12:31:34Z msweet $"
 #
 #   Filter makefile for CUPS.
 #
@@ -396,5 +396,5 @@ include Dependencies
 
 
 #
-# End of "$Id: Makefile 7871 2008-08-27 21:12:43Z mike $".
+# End of "$Id: Makefile 11173 2013-07-23 12:31:34Z msweet $".
 #
diff --git a/filter/commandtops.c b/filter/commandtops.c
index a75809c2..f44a5efe 100644
--- a/filter/commandtops.c
+++ b/filter/commandtops.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: commandtops.c 3794 2012-04-23 22:44:16Z msweet $"
+ * "$Id: commandtops.c 11173 2013-07-23 12:31:34Z msweet $"
  *
  *   PostScript command filter for CUPS.
  *
@@ -534,5 +534,5 @@ report_levels(ppd_file_t *ppd,		/* I - PPD file */
 
 
 /*
- * End of "$Id: commandtops.c 3794 2012-04-23 22:44:16Z msweet $".
+ * End of "$Id: commandtops.c 11173 2013-07-23 12:31:34Z msweet $".
  */
diff --git a/filter/common.c b/filter/common.c
index 689253cc..6f62642f 100644
--- a/filter/common.c
+++ b/filter/common.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: common.c 6649 2007-07-11 21:46:42Z mike $"
+ * "$Id: common.c 11173 2013-07-23 12:31:34Z msweet $"
  *
  *   Common filter routines for CUPS.
  *
@@ -531,5 +531,5 @@ WriteTextComment(const char *name,	/* I - Comment name ("Title", etc.) */
 
 
 /*
- * End of "$Id: common.c 6649 2007-07-11 21:46:42Z mike $".
+ * End of "$Id: common.c 11173 2013-07-23 12:31:34Z msweet $".
  */
diff --git a/filter/common.h b/filter/common.h
index 3501085a..49f36de3 100644
--- a/filter/common.h
+++ b/filter/common.h
@@ -1,5 +1,5 @@
 /*
- * "$Id: common.h 6649 2007-07-11 21:46:42Z mike $"
+ * "$Id: common.h 11173 2013-07-23 12:31:34Z msweet $"
  *
  *   Common filter definitions for CUPS.
  *
@@ -74,5 +74,5 @@ extern void	WriteTextComment(const char *name, const char *value);
 
 
 /*
- * End of "$Id: common.h 6649 2007-07-11 21:46:42Z mike $".
+ * End of "$Id: common.h 11173 2013-07-23 12:31:34Z msweet $".
  */
diff --git a/filter/error.c b/filter/error.c
index 08edebb6..a91f0cae 100644
--- a/filter/error.c
+++ b/filter/error.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: error.c 7460 2008-04-16 02:19:54Z mike $"
+ * "$Id: error.c 11173 2013-07-23 12:31:34Z msweet $"
  *
  *   Raster error handling for CUPS.
  *
@@ -282,5 +282,5 @@ get_error_buffer(void)
 
 
 /*
- * End of "$Id: error.c 7460 2008-04-16 02:19:54Z mike $".
+ * End of "$Id: error.c 11173 2013-07-23 12:31:34Z msweet $".
  */
diff --git a/filter/gziptoany.c b/filter/gziptoany.c
index 09a636b1..079a8c7f 100644
--- a/filter/gziptoany.c
+++ b/filter/gziptoany.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: gziptoany.c 6649 2007-07-11 21:46:42Z mike $"
+ * "$Id: gziptoany.c 11173 2013-07-23 12:31:34Z msweet $"
  *
  *   GZIP/raw pre-filter for CUPS.
  *
@@ -108,5 +108,5 @@ main(int  argc,				/* I - Number of command-line arguments */
 
 
 /*
- * End of "$Id: gziptoany.c 6649 2007-07-11 21:46:42Z mike $".
+ * End of "$Id: gziptoany.c 11173 2013-07-23 12:31:34Z msweet $".
  */
diff --git a/filter/interpret.c b/filter/interpret.c
index 7723f656..2a2f3524 100644
--- a/filter/interpret.c
+++ b/filter/interpret.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: interpret.c 7852 2008-08-21 04:19:45Z mike $"
+ * "$Id: interpret.c 11173 2013-07-23 12:31:34Z msweet $"
  *
  *   PPD command interpreter for CUPS.
  *
@@ -1684,5 +1684,5 @@ DEBUG_stack(_cups_ps_stack_t *st)	/* I - Stack */
 
 
 /*
- * End of "$Id: interpret.c 7852 2008-08-21 04:19:45Z mike $".
+ * End of "$Id: interpret.c 11173 2013-07-23 12:31:34Z msweet $".
  */
diff --git a/filter/pstops.c b/filter/pstops.c
index bcc8d2b4..3f7d0f40 100644
--- a/filter/pstops.c
+++ b/filter/pstops.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: pstops.c 7977 2008-09-23 23:44:33Z mike $"
+ * "$Id: pstops.c 11173 2013-07-23 12:31:34Z msweet $"
  *
  *   PostScript filter for CUPS.
  *
@@ -3429,5 +3429,5 @@ write_options(
 
 
 /*
- * End of "$Id: pstops.c 7977 2008-09-23 23:44:33Z mike $".
+ * End of "$Id: pstops.c 11173 2013-07-23 12:31:34Z msweet $".
  */
diff --git a/filter/raster.c b/filter/raster.c
index 1ecd90de..29522e59 100644
--- a/filter/raster.c
+++ b/filter/raster.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: raster.c 7720 2008-07-11 22:46:21Z mike $"
+ * "$Id: raster.c 11173 2013-07-23 12:31:34Z msweet $"
  *
  *   Raster file routines for CUPS.
  *
@@ -1475,5 +1475,5 @@ cups_write_fd(void          *ctx,	/* I - File descriptor pointer */
 
 
 /*
- * End of "$Id: raster.c 7720 2008-07-11 22:46:21Z mike $".
+ * End of "$Id: raster.c 11173 2013-07-23 12:31:34Z msweet $".
  */
diff --git a/filter/rasterbench.c b/filter/rasterbench.c
index 0e3c47af..b21df913 100644
--- a/filter/rasterbench.c
+++ b/filter/rasterbench.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: rasterbench.c 7376 2008-03-19 21:07:45Z mike $"
+ * "$Id: rasterbench.c 11173 2013-07-23 12:31:34Z msweet $"
  *
  *   Raster benchmark program for CUPS.
  *
@@ -351,5 +351,5 @@ write_test(int         fd,		/* I - File descriptor to write to */
 
 
 /*
- * End of "$Id: rasterbench.c 7376 2008-03-19 21:07:45Z mike $".
+ * End of "$Id: rasterbench.c 11173 2013-07-23 12:31:34Z msweet $".
  */
diff --git a/filter/rastertoepson.c b/filter/rastertoepson.c
index 08135bcc..8533b77a 100644
--- a/filter/rastertoepson.c
+++ b/filter/rastertoepson.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: rastertoepson.c 7450 2008-04-14 19:39:02Z mike $"
+ * "$Id: rastertoepson.c 11173 2013-07-23 12:31:34Z msweet $"
  *
  *   EPSON ESC/P and ESC/P2 filter for CUPS.
  *
@@ -1153,5 +1153,5 @@ main(int  argc,				/* I - Number of command-line arguments */
 
 
 /*
- * End of "$Id: rastertoepson.c 7450 2008-04-14 19:39:02Z mike $".
+ * End of "$Id: rastertoepson.c 11173 2013-07-23 12:31:34Z msweet $".
  */
diff --git a/filter/rastertohp.c b/filter/rastertohp.c
index b7390c12..e016e5f3 100644
--- a/filter/rastertohp.c
+++ b/filter/rastertohp.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: rastertohp.c 7834 2008-08-04 21:02:09Z mike $"
+ * "$Id: rastertohp.c 11173 2013-07-23 12:31:34Z msweet $"
  *
  *   Hewlett-Packard Page Control Language filter for CUPS.
  *
@@ -882,5 +882,5 @@ main(int  argc,				/* I - Number of command-line arguments */
 
 
 /*
- * End of "$Id: rastertohp.c 7834 2008-08-04 21:02:09Z mike $".
+ * End of "$Id: rastertohp.c 11173 2013-07-23 12:31:34Z msweet $".
  */
diff --git a/filter/rastertolabel.c b/filter/rastertolabel.c
index 4c0860cc..cb2847c5 100644
--- a/filter/rastertolabel.c
+++ b/filter/rastertolabel.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: rastertolabel.c 7720 2008-07-11 22:46:21Z mike $"
+ * "$Id: rastertolabel.c 11173 2013-07-23 12:31:34Z msweet $"
  *
  *   Label printer filter for CUPS.
  *
@@ -1308,5 +1308,5 @@ main(int  argc,				/* I - Number of command-line arguments */
 
 
 /*
- * End of "$Id: rastertolabel.c 7720 2008-07-11 22:46:21Z mike $".
+ * End of "$Id: rastertolabel.c 11173 2013-07-23 12:31:34Z msweet $".
  */
diff --git a/filter/rastertopwg.c b/filter/rastertopwg.c
index 97dab1cb..70118855 100644
--- a/filter/rastertopwg.c
+++ b/filter/rastertopwg.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: rastertopwg.c 3427 2011-09-20 18:40:57Z msweet $"
+ * "$Id: rastertopwg.c 11173 2013-07-23 12:31:34Z msweet $"
  *
  *   CUPS raster to PWG raster format filter for CUPS.
  *
@@ -457,5 +457,5 @@ main(int  argc,				/* I - Number of command-line args */
 
 
 /*
- * End of "$Id: rastertopwg.c 3427 2011-09-20 18:40:57Z msweet $".
+ * End of "$Id: rastertopwg.c 11173 2013-07-23 12:31:34Z msweet $".
  */
diff --git a/filter/testraster.c b/filter/testraster.c
index 4519aa25..dc5dbe6e 100644
--- a/filter/testraster.c
+++ b/filter/testraster.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: testraster.c 7376 2008-03-19 21:07:45Z mike $"
+ * "$Id: testraster.c 11173 2013-07-23 12:31:34Z msweet $"
  *
  *   Raster test program routines for CUPS.
  *
@@ -1074,5 +1074,5 @@ print_changes(
 
 
 /*
- * End of "$Id: testraster.c 7376 2008-03-19 21:07:45Z mike $".
+ * End of "$Id: testraster.c 11173 2013-07-23 12:31:34Z msweet $".
  */
diff --git a/locale/Makefile b/locale/Makefile
index 18049741..22aca435 100644
--- a/locale/Makefile
+++ b/locale/Makefile
@@ -1,5 +1,5 @@
 #
-# "$Id: Makefile 7871 2008-08-27 21:12:43Z mike $"
+# "$Id: Makefile 11173 2013-07-23 12:31:34Z msweet $"
 #
 #   Locale file makefile for CUPS.
 #
@@ -218,5 +218,5 @@ include Dependencies
 
 
 #
-# End of "$Id: Makefile 7871 2008-08-27 21:12:43Z mike $".
+# End of "$Id: Makefile 11173 2013-07-23 12:31:34Z msweet $".
 #
diff --git a/locale/checkpo.c b/locale/checkpo.c
index 73cad3ca..002e64ff 100644
--- a/locale/checkpo.c
+++ b/locale/checkpo.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: checkpo.c 7223 2008-01-16 23:41:19Z mike $"
+ * "$Id: checkpo.c 11173 2013-07-23 12:31:34Z msweet $"
  *
  *   Verify that translations in the .po file have the same number and type of
  *   printf-style format strings.
@@ -409,5 +409,5 @@ free_formats(cups_array_t *fmts)	/* I - Array of format strings */
 
 
 /*
- * End of "$Id: checkpo.c 7223 2008-01-16 23:41:19Z mike $".
+ * End of "$Id: checkpo.c 11173 2013-07-23 12:31:34Z msweet $".
  */
diff --git a/locale/po2strings.c b/locale/po2strings.c
index 0b7d1f32..22dd494f 100644
--- a/locale/po2strings.c
+++ b/locale/po2strings.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: po2strings.c 6921 2007-09-06 13:38:37Z mike $"
+ * "$Id: po2strings.c 11173 2013-07-23 12:31:34Z msweet $"
  *
  *   Convert a GNU gettext .po file to an Apple .strings file.
  *
@@ -290,5 +290,5 @@ main(int  argc,				/* I - Number of command-line args */
 
 
 /*
- * End of "$Id: po2strings.c 6921 2007-09-06 13:38:37Z mike $".
+ * End of "$Id: po2strings.c 11173 2013-07-23 12:31:34Z msweet $".
  */
diff --git a/locale/strings2po.c b/locale/strings2po.c
index 52eeeeff..fb208041 100644
--- a/locale/strings2po.c
+++ b/locale/strings2po.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: strings2po.c 7720 2008-07-11 22:46:21Z mike $"
+ * "$Id: strings2po.c 11173 2013-07-23 12:31:34Z msweet $"
  *
  * Convert Apple .strings file (UTF-16 BE text file) to GNU gettext .po files.
  *
@@ -171,5 +171,5 @@ write_po(FILE       *po,		/* I - .po file */
 
 
 /*
- * End of "$Id: strings2po.c 7720 2008-07-11 22:46:21Z mike $".
+ * End of "$Id: strings2po.c 11173 2013-07-23 12:31:34Z msweet $".
  */
diff --git a/locale/translate.c b/locale/translate.c
index 53f79991..8004825d 100644
--- a/locale/translate.c
+++ b/locale/translate.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: translate.c 7922 2008-09-10 15:56:47Z mike $"
+ * "$Id: translate.c 11173 2013-07-23 12:31:34Z msweet $"
  *
  *   HTTP-based translation program for CUPS.
  *
@@ -435,5 +435,5 @@ write_string(cups_file_t *fp,		/* I - File to write to */
 
 
 /*
- * End of "$Id: translate.c 7922 2008-09-10 15:56:47Z mike $".
+ * End of "$Id: translate.c 11173 2013-07-23 12:31:34Z msweet $".
  */
diff --git a/man/Makefile b/man/Makefile
index f7930411..c5d68a50 100644
--- a/man/Makefile
+++ b/man/Makefile
@@ -1,5 +1,5 @@
 #
-# "$Id: Makefile 7930 2008-09-10 22:25:54Z mike $"
+# "$Id: Makefile 11173 2013-07-23 12:31:34Z msweet $"
 #
 #   Man page makefile for CUPS.
 #
@@ -237,5 +237,5 @@ mantohtml:	mantohtml.o
 
 
 #
-# End of "$Id: Makefile 7930 2008-09-10 22:25:54Z mike $".
+# End of "$Id: Makefile 11173 2013-07-23 12:31:34Z msweet $".
 #
diff --git a/man/client.conf.man.in b/man/client.conf.man.in
index 14eecb0e..36b70d54 100644
--- a/man/client.conf.man.in
+++ b/man/client.conf.man.in
@@ -1,5 +1,5 @@
 .\"
-.\" "$Id: client.conf.man.in 6649 2007-07-11 21:46:42Z mike $"
+.\" "$Id: client.conf.man.in 11173 2013-07-23 12:31:34Z msweet $"
 .\"
 .\"   client.conf man page for CUPS.
 .\"
@@ -61,5 +61,5 @@ http://localhost:631/help
 .SH COPYRIGHT
 Copyright 2007-2013 by Apple Inc.
 .\"
-.\" End of "$Id: client.conf.man.in 6649 2007-07-11 21:46:42Z mike $".
+.\" End of "$Id: client.conf.man.in 11173 2013-07-23 12:31:34Z msweet $".
 .\"
diff --git a/man/cups-deviced.man.in b/man/cups-deviced.man.in
index ab9a871a..8961882b 100644
--- a/man/cups-deviced.man.in
+++ b/man/cups-deviced.man.in
@@ -1,5 +1,5 @@
 .\"
-.\" "$Id: cups-deviced.man.in 7646 2008-06-16 17:26:20Z mike $"
+.\" "$Id: cups-deviced.man.in 11173 2013-07-23 12:31:34Z msweet $"
 .\"
 .\"   cups-deviced man page for CUPS.
 .\"
@@ -40,5 +40,5 @@ http://localhost:631/help
 .SH COPYRIGHT
 Copyright 2007-2013 by Apple Inc.
 .\"
-.\" End of "$Id: cups-deviced.man.in 7646 2008-06-16 17:26:20Z mike $".
+.\" End of "$Id: cups-deviced.man.in 11173 2013-07-23 12:31:34Z msweet $".
 .\"
diff --git a/man/cups-driverd.man.in b/man/cups-driverd.man.in
index 3f015a43..d40fa541 100644
--- a/man/cups-driverd.man.in
+++ b/man/cups-driverd.man.in
@@ -1,5 +1,5 @@
 .\"
-.\" "$Id: cups-driverd.man.in 7662 2008-06-17 14:34:20Z mike $"
+.\" "$Id: cups-driverd.man.in 11173 2013-07-23 12:31:34Z msweet $"
 .\"
 .\"   cups-driverd man page for CUPS.
 .\"
@@ -118,5 +118,5 @@ http://localhost:631/help
 .SH COPYRIGHT
 Copyright 2007-2013 by Apple Inc.
 .\"
-.\" End of "$Id: cups-driverd.man.in 7662 2008-06-17 14:34:20Z mike $".
+.\" End of "$Id: cups-driverd.man.in 11173 2013-07-23 12:31:34Z msweet $".
 .\"
diff --git a/man/cups-files.conf.man.in b/man/cups-files.conf.man.in
index 4d34e169..559ea45f 100644
--- a/man/cups-files.conf.man.in
+++ b/man/cups-files.conf.man.in
@@ -1,5 +1,5 @@
 .\"
-.\" "$Id: cups-files.conf.man.in 4185 2013-02-20 02:19:13Z msweet $"
+.\" "$Id: cups-files.conf.man.in 11221 2013-08-06 16:16:01Z msweet $"
 .\"
 .\"   cupsd.conf man page for CUPS.
 .\"
@@ -12,7 +12,7 @@
 .\"   which should have been included with this file.  If this file is
 .\"   file is missing or damaged, see the license at "http://www.cups.org/".
 .\"
-.TH cups-files.conf 5 "CUPS" "19 November 2012" "Apple Inc."
+.TH cups-files.conf 5 "CUPS" "26 July 2013" "Apple Inc."
 .SH NAME
 cups-files.conf \- file and directory configuration file for cups
 .SH DESCRIPTION
@@ -122,6 +122,12 @@ ServerRoot directory
 .br
 Specifies the directory where the server configuration files can be found.
 .TP 5
+SyncOnClose Yes
+.TP 5
+SyncOnClose No
+Specifies whether the scheduler calls \fIfsync(2)\fR after writing configuration
+or state files. The default is No.
+.TP 5
 SystemGroup group-name [group-name ...]
 .br
 Specifies the group(s) to use for System class authentication.
@@ -142,5 +148,5 @@ http://localhost:631/help
 .SH COPYRIGHT
 Copyright 2007-2013 by Apple Inc.
 .\"
-.\" End of "$Id: cups-files.conf.man.in 4185 2013-02-20 02:19:13Z msweet $".
+.\" End of "$Id: cups-files.conf.man.in 11221 2013-08-06 16:16:01Z msweet $".
 .\"
diff --git a/man/cups-lpd.man.in b/man/cups-lpd.man.in
index 4289962b..e030b61d 100644
--- a/man/cups-lpd.man.in
+++ b/man/cups-lpd.man.in
@@ -1,5 +1,5 @@
 .\"
-.\" "$Id: cups-lpd.man.in 7835 2008-08-09 06:37:04Z mike $"
+.\" "$Id: cups-lpd.man.in 11173 2013-07-23 12:31:34Z msweet $"
 .\"
 .\"   cups-lpd man page for CUPS.
 .\"
@@ -120,5 +120,5 @@ http://localhost:631/help
 .SH COPYRIGHT
 Copyright 2007-2013 by Apple Inc.
 .\"
-.\" End of "$Id: cups-lpd.man.in 7835 2008-08-09 06:37:04Z mike $".
+.\" End of "$Id: cups-lpd.man.in 11173 2013-07-23 12:31:34Z msweet $".
 .\"
diff --git a/man/cups-snmp.man.in b/man/cups-snmp.man.in
index cbe3bb13..797a038d 100644
--- a/man/cups-snmp.man.in
+++ b/man/cups-snmp.man.in
@@ -1,5 +1,5 @@
 .\"
-.\" "$Id: cups-snmp.man.in 4185 2013-02-20 02:19:13Z msweet $"
+.\" "$Id: cups-snmp.man.in 11173 2013-07-23 12:31:34Z msweet $"
 .\"
 .\"   SNMP backend man page for CUPS.
 .\"
@@ -55,5 +55,5 @@ http://localhost:631/help
 .SH COPYRIGHT
 Copyright 2007-2013 by Apple Inc.
 .\"
-.\" End of "$Id: cups-snmp.man.in 4185 2013-02-20 02:19:13Z msweet $".
+.\" End of "$Id: cups-snmp.man.in 11173 2013-07-23 12:31:34Z msweet $".
 .\"
diff --git a/man/cupsaddsmb.man.in b/man/cupsaddsmb.man.in
index 75598ab6..335cf688 100644
--- a/man/cupsaddsmb.man.in
+++ b/man/cupsaddsmb.man.in
@@ -1,5 +1,5 @@
 .\"
-.\" "$Id: cupsaddsmb.man.in 7600 2008-05-20 21:06:23Z mike $"
+.\" "$Id: cupsaddsmb.man.in 11173 2013-07-23 12:31:34Z msweet $"
 .\"
 .\"   cupsaddsmb man page for CUPS.
 .\"
@@ -12,7 +12,7 @@
 .\"   which should have been included with this file.  If this file is
 .\"   file is missing or damaged, see the license at "http://www.cups.org/".
 .\"
-.TH cupsaddsmb 8 "CUPS" "25 July 2007" "Apple Inc."
+.TH cupsaddsmb 8 "CUPS" "8 July 2013" "Apple Inc."
 .SH NAME
 cupsaddsmb \- export printers to samba for windows clients
 
@@ -115,17 +115,14 @@ drivers and
 %WINDIR%\\SYSTEM32\\SPOOL\\DRIVERS\\X64\\3 folder for 64-bit
 drivers.
 .LP
-The CUPS printer driver is preferred over the Microsoft driver
-since it supports the page-label, job-billing, and
-job-hold-until options fully on all printers. However, currently
-only Windows 2000 and higher is supported by the Microsoft
+However, currently only Windows 2000 and higher is supported by the Microsoft
 driver, so you will also need to get the Adobe driver to support
 Windows 95, 98, and Me clients. The Adobe and Microsoft drivers
 for Windows 2000 are identical.
 .LP
 Once you have extracted the driver files, copy the 32-bit drivers
-to the \fI@CUPS_DATADIR@/drivers\fR directory and the 64-bit
-drivers to the \fI@CUPS_DATADIR@/drivers/x64\fR directory exactly
+to the \fI/usr/share/cups/drivers\fR directory and the 64-bit
+drivers to the \fI/usr/share/cups/drivers/x64\fR directory exactly
 as named below:
 .nf
 
@@ -140,39 +137,6 @@ as named below:
 you use the lowercase filenames shown above, otherwise
 \fIcupsaddsmb\fR will fail to export the drivers.
 
-.SH CUPS POSTSCRIPT DRIVERS FOR WINDOWS
-\fIcupsaddsmb\fR can use the CUPS v6 PostScript printer driver
-for Windows, which is available for download from the CUPS web
-site.
-.LP
-The CUPS printer driver is preferred over the Adobe and
-Microsoft drivers since it supports the page-label, job-billing,
-and job-hold-until options fully on all printers. However,
-currently only Windows 2000 and higher is supported by the CUPS
-driver, so you will also need to get the Adobe driver to support
-Windows 95, 98, and Me clients.
-.LP
-Once you have extracted the driver files, copy the 32-bit drivers
-to the \fI@CUPS_DATADIR@/drivers\fR directory and the 64-bit
-drivers to the \fI@CUPS_DATADIR@/drivers/x64\fR directory exactly
-as named below:
-.nf
-
-    [Windows 2000 and higher]
-    cups6.inf (from www.cups.org)
-    cups6.ini (from www.cups.org)
-    cupsps6.dll (from www.cups.org)
-    cupsui6.dll (from www.cups.org)
-    ps5ui.dll (from your Windows system)
-    pscript.hlp (from your Windows system)
-    pscript.ntf (from your Windows system)
-    pscript5.dll (from your Windows system)
-.fi
-.LP
-\fBNote:\fR Unlike Windows, case is significant - make sure that
-you use the lowercase filenames shown above, otherwise
-\fIcupsaddsmb\fR will fail to export the drivers.
-
 .SH ADOBE POSTSCRIPT DRIVERS FOR WINDOWS 95, 98, AND ME
 \fIcupsaddsmb\fR can use the Adobe PostScript printer driver for
 Windows 95, 98, and ME, which are available for download from the
@@ -204,11 +168,9 @@ Getting the full set of Windows driver files should be easier.
 .SH SEE ALSO
 \fIsmbd(8)\fR, \fIsmb.conf(5)\fR,
 http://localhost:631/help
-.br
-http://www.cups.org/windows/
 
 .SH COPYRIGHT
 Copyright 2007-2013 by Apple Inc.
 .\"
-.\" End of "$Id: cupsaddsmb.man.in 7600 2008-05-20 21:06:23Z mike $".
+.\" End of "$Id: cupsaddsmb.man.in 11173 2013-07-23 12:31:34Z msweet $".
 .\"
diff --git a/man/cupsd.conf.man.in b/man/cupsd.conf.man.in
index a29d36c1..c362d095 100644
--- a/man/cupsd.conf.man.in
+++ b/man/cupsd.conf.man.in
@@ -1,5 +1,5 @@
 .\"
-.\" "$Id: cupsd.conf.man.in 7935 2008-09-11 01:54:11Z mike $"
+.\" "$Id: cupsd.conf.man.in 11173 2013-07-23 12:31:34Z msweet $"
 .\"
 .\"   cupsd.conf man page for CUPS.
 .\"
@@ -521,5 +521,5 @@ http://localhost:631/help
 .SH COPYRIGHT
 Copyright 2007-2013 by Apple Inc.
 .\"
-.\" End of "$Id: cupsd.conf.man.in 7935 2008-09-11 01:54:11Z mike $".
+.\" End of "$Id: cupsd.conf.man.in 11173 2013-07-23 12:31:34Z msweet $".
 .\"
diff --git a/man/cupsd.man.in b/man/cupsd.man.in
index 3ab21e72..69bdc230 100644
--- a/man/cupsd.man.in
+++ b/man/cupsd.man.in
@@ -1,5 +1,5 @@
 .\"
-.\" "$Id: cupsd.man.in 7600 2008-05-20 21:06:23Z mike $"
+.\" "$Id: cupsd.man.in 11173 2013-07-23 12:31:34Z msweet $"
 .\"
 .\"   cupsd man page for CUPS.
 .\"
@@ -68,5 +68,5 @@ http://localhost:631/help
 .SH COPYRIGHT
 Copyright 2007-2013 by Apple Inc.
 .\"
-.\" End of "$Id: cupsd.man.in 7600 2008-05-20 21:06:23Z mike $".
+.\" End of "$Id: cupsd.man.in 11173 2013-07-23 12:31:34Z msweet $".
 .\"
diff --git a/man/lpoptions.man.in b/man/lpoptions.man.in
index 6007071c..343d20d6 100644
--- a/man/lpoptions.man.in
+++ b/man/lpoptions.man.in
@@ -1,5 +1,5 @@
 .\"
-.\" "$Id: lpoptions.man.in 7889 2008-08-29 22:03:35Z mike $"
+.\" "$Id: lpoptions.man.in 11173 2013-07-23 12:31:34Z msweet $"
 .\"
 .\"   lpoptions man page for CUPS.
 .\"
@@ -131,5 +131,5 @@ http://localhost:631/help
 .SH COPYRIGHT
 Copyright 2007-2013 by Apple Inc.
 .\"
-.\" End of "$Id: lpoptions.man.in 7889 2008-08-29 22:03:35Z mike $".
+.\" End of "$Id: lpoptions.man.in 11173 2013-07-23 12:31:34Z msweet $".
 .\"
diff --git a/man/mantohtml.c b/man/mantohtml.c
index 3c18e82a..8974d208 100644
--- a/man/mantohtml.c
+++ b/man/mantohtml.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: mantohtml.c 7720 2008-07-11 22:46:21Z mike $"
+ * "$Id: mantohtml.c 11173 2013-07-23 12:31:34Z msweet $"
  *
  *   Man page to HTML conversion program.
  *
@@ -716,5 +716,5 @@ strmove(char       *d,			/* I - Destination */
 
 
 /*
- * End of "$Id: mantohtml.c 7720 2008-07-11 22:46:21Z mike $".
+ * End of "$Id: mantohtml.c 11173 2013-07-23 12:31:34Z msweet $".
  */
diff --git a/monitor/Makefile b/monitor/Makefile
index 7e42112a..c512db09 100644
--- a/monitor/Makefile
+++ b/monitor/Makefile
@@ -1,5 +1,5 @@
 #
-# "$Id: Makefile 7871 2008-08-27 21:12:43Z mike $"
+# "$Id: Makefile 11173 2013-07-23 12:31:34Z msweet $"
 #
 #   Port monitor makefile for CUPS.
 #
@@ -142,5 +142,5 @@ include Dependencies
 
 
 #
-# End of "$Id: Makefile 7871 2008-08-27 21:12:43Z mike $".
+# End of "$Id: Makefile 11173 2013-07-23 12:31:34Z msweet $".
 #
diff --git a/monitor/bcp.c b/monitor/bcp.c
index ffd32d57..103c92e6 100644
--- a/monitor/bcp.c
+++ b/monitor/bcp.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: bcp.c 6800 2007-08-16 18:28:44Z mike $"
+ * "$Id: bcp.c 11173 2013-07-23 12:31:34Z msweet $"
  *
  *   TBCP port monitor for CUPS.
  *
@@ -288,5 +288,5 @@ pswrite(const char *buf,		/* I - Buffer to write */
 
 
 /*
- * End of "$Id: bcp.c 6800 2007-08-16 18:28:44Z mike $".
+ * End of "$Id: bcp.c 11173 2013-07-23 12:31:34Z msweet $".
  */
diff --git a/monitor/tbcp.c b/monitor/tbcp.c
index 4170d493..a65aaec7 100644
--- a/monitor/tbcp.c
+++ b/monitor/tbcp.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: tbcp.c 6800 2007-08-16 18:28:44Z mike $"
+ * "$Id: tbcp.c 11173 2013-07-23 12:31:34Z msweet $"
  *
  *   TBCP port monitor for CUPS.
  *
@@ -281,5 +281,5 @@ pswrite(const char *buf,		/* I - Buffer to write */
 
 
 /*
- * End of "$Id: tbcp.c 6800 2007-08-16 18:28:44Z mike $".
+ * End of "$Id: tbcp.c 11173 2013-07-23 12:31:34Z msweet $".
  */
diff --git a/notifier/Makefile b/notifier/Makefile
index 5587c208..df7a188c 100644
--- a/notifier/Makefile
+++ b/notifier/Makefile
@@ -1,5 +1,5 @@
 #
-# "$Id: Makefile 7920 2008-09-10 01:04:10Z mike $"
+# "$Id: Makefile 11173 2013-07-23 12:31:34Z msweet $"
 #
 #   Notifier makefile for CUPS.
 #
@@ -158,5 +158,5 @@ include Dependencies
 
 
 #
-# End of "$Id: Makefile 7920 2008-09-10 01:04:10Z mike $".
+# End of "$Id: Makefile 11173 2013-07-23 12:31:34Z msweet $".
 #
diff --git a/notifier/dbus.c b/notifier/dbus.c
index baf4f99a..08449d3c 100644
--- a/notifier/dbus.c
+++ b/notifier/dbus.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: dbus.c 3643 2012-02-13 16:35:48Z msweet $"
+ * "$Id: dbus.c 11173 2013-07-23 12:31:34Z msweet $"
  *
  *   D-Bus notifier for CUPS.
  *
@@ -623,5 +623,5 @@ main(void)
 
 
 /*
- * End of "$Id: dbus.c 3643 2012-02-13 16:35:48Z msweet $".
+ * End of "$Id: dbus.c 11173 2013-07-23 12:31:34Z msweet $".
  */
diff --git a/notifier/mailto.c b/notifier/mailto.c
index da2db951..fce6aec0 100644
--- a/notifier/mailto.c
+++ b/notifier/mailto.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: mailto.c 7460 2008-04-16 02:19:54Z mike $"
+ * "$Id: mailto.c 11173 2013-07-23 12:31:34Z msweet $"
  *
  *   "mailto" notifier for CUPS.
  *
@@ -642,5 +642,5 @@ print_attributes(ipp_t *ipp,		/* I - IPP request */
 
 
 /*
- * End of "$Id: mailto.c 7460 2008-04-16 02:19:54Z mike $".
+ * End of "$Id: mailto.c 11173 2013-07-23 12:31:34Z msweet $".
  */
diff --git a/notifier/rss.c b/notifier/rss.c
index deee6b5b..14898471 100644
--- a/notifier/rss.c
+++ b/notifier/rss.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: rss.c 7824 2008-08-01 21:11:55Z mike $"
+ * "$Id: rss.c 11173 2013-07-23 12:31:34Z msweet $"
  *
  *   RSS notifier for CUPS.
  *
@@ -737,5 +737,5 @@ xml_escape(const char *s)		/* I - String to escape */
 
 
 /*
- * End of "$Id: rss.c 7824 2008-08-01 21:11:55Z mike $".
+ * End of "$Id: rss.c 11173 2013-07-23 12:31:34Z msweet $".
  */
diff --git a/notifier/testnotify.c b/notifier/testnotify.c
index faa846d0..3186b6fa 100644
--- a/notifier/testnotify.c
+++ b/notifier/testnotify.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: testnotify.c 6649 2007-07-11 21:46:42Z mike $"
+ * "$Id: testnotify.c 11173 2013-07-23 12:31:34Z msweet $"
  *
  *   Test notifier for CUPS.
  *
@@ -123,5 +123,5 @@ print_attributes(ipp_t *ipp,		/* I - IPP request */
 
 
 /*
- * End of "$Id: testnotify.c 6649 2007-07-11 21:46:42Z mike $".
+ * End of "$Id: testnotify.c 11173 2013-07-23 12:31:34Z msweet $".
  */
diff --git a/packaging/cups.list.in b/packaging/cups.list.in
index 0c4ba904..3eb7f417 100644
--- a/packaging/cups.list.in
+++ b/packaging/cups.list.in
@@ -1,5 +1,5 @@
 #
-# "$Id: cups.list.in 7930 2008-09-10 22:25:54Z mike $"
+# "$Id: cups.list.in 11173 2013-07-23 12:31:34Z msweet $"
 #
 #   ESP Package Manager (EPM) file list for CUPS.
 #
@@ -736,5 +736,5 @@ f 0444 root sys $XINETD/cups-lpd scheduler/cups-lpd.xinetd
 %subpackage
 
 #
-# End of "$Id: cups.list.in 7930 2008-09-10 22:25:54Z mike $".
+# End of "$Id: cups.list.in 11173 2013-07-23 12:31:34Z msweet $".
 #
diff --git a/packaging/cups.spec b/packaging/cups.spec
index 4a13fe92..93a1e1da 100644
--- a/packaging/cups.spec
+++ b/packaging/cups.spec
@@ -1,5 +1,5 @@
 #
-# "$Id: cups.spec.in 7718 2008-07-10 23:04:22Z mike $"
+# "$Id: cups.spec.in 11173 2013-07-23 12:31:34Z msweet $"
 #
 #   RPM "spec" file for CUPS.
 #
@@ -35,12 +35,12 @@
 
 Summary: CUPS
 Name: cups
-Version: 1.6.3
+Version: 1.6.4
 Release: 1
 Epoch: 1
 License: GPL
 Group: System Environment/Daemons
-Source: http://www.cups.org/software/1.6.3/cups-1.6.3-source.tar.bz2
+Source: http://www.cups.org/software/1.6.4/cups-1.6.4-source.tar.bz2
 Url: http://www.cups.org
 Packager: Anonymous <anonymous@foo.com>
 Vendor: Apple Inc.
@@ -221,6 +221,9 @@ rm -rf $RPM_BUILD_ROOT
 /usr/share/cups/ppdc/*
 %dir /usr/share/cups/templates
 /usr/share/cups/templates/*
+%dir /usr/share/cups/usb
+/usr/share/cups/usb/*
+
 %dir /usr/share/doc/cups
 /usr/share/doc/cups/*.*
 %dir /usr/share/doc/cups/help
@@ -361,5 +364,5 @@ rm -rf $RPM_BUILD_ROOT
 
 
 #
-# End of "$Id: cups.spec.in 7718 2008-07-10 23:04:22Z mike $".
+# End of "$Id: cups.spec.in 11173 2013-07-23 12:31:34Z msweet $".
 #
diff --git a/packaging/cups.spec.in b/packaging/cups.spec.in
index 3f9cc787..fd50b9d0 100644
--- a/packaging/cups.spec.in
+++ b/packaging/cups.spec.in
@@ -1,5 +1,5 @@
 #
-# "$Id: cups.spec.in 7718 2008-07-10 23:04:22Z mike $"
+# "$Id: cups.spec.in 11173 2013-07-23 12:31:34Z msweet $"
 #
 #   RPM "spec" file for CUPS.
 #
@@ -221,6 +221,9 @@ rm -rf $RPM_BUILD_ROOT
 /usr/share/cups/ppdc/*
 %dir /usr/share/cups/templates
 /usr/share/cups/templates/*
+%dir /usr/share/cups/usb
+/usr/share/cups/usb/*
+
 %dir /usr/share/doc/cups
 /usr/share/doc/cups/*.*
 %dir /usr/share/doc/cups/help
@@ -361,5 +364,5 @@ rm -rf $RPM_BUILD_ROOT
 
 
 #
-# End of "$Id: cups.spec.in 7718 2008-07-10 23:04:22Z mike $".
+# End of "$Id: cups.spec.in 11173 2013-07-23 12:31:34Z msweet $".
 #
diff --git a/ppdc/Makefile b/ppdc/Makefile
index 8d8668ed..c5231448 100644
--- a/ppdc/Makefile
+++ b/ppdc/Makefile
@@ -1,5 +1,5 @@
 #
-# "$Id: Makefile 3643 2012-02-13 16:35:48Z msweet $"
+# "$Id: Makefile 11173 2013-07-23 12:31:34Z msweet $"
 #
 #   Makefile for the CUPS PPD Compiler.
 #
@@ -400,5 +400,5 @@ include Dependencies
 
 
 #
-# End of "$Id: Makefile 3643 2012-02-13 16:35:48Z msweet $".
+# End of "$Id: Makefile 11173 2013-07-23 12:31:34Z msweet $".
 #
diff --git a/ppdc/genstrings.cxx b/ppdc/genstrings.cxx
index dee4b558..f3496c7a 100644
--- a/ppdc/genstrings.cxx
+++ b/ppdc/genstrings.cxx
@@ -1,5 +1,5 @@
 //
-// "$Id: genstrings.cxx 3275 2011-05-20 07:26:13Z msweet $"
+// "$Id: genstrings.cxx 11173 2013-07-23 12:31:34Z msweet $"
 //
 //   GNU gettext message generator for the CUPS PPD Compiler.
 //
@@ -211,5 +211,5 @@ write_cstring(const char *s)		/* I - String to write */
 
 
 //
-// End of "$Id: genstrings.cxx 3275 2011-05-20 07:26:13Z msweet $".
+// End of "$Id: genstrings.cxx 11173 2013-07-23 12:31:34Z msweet $".
 //
diff --git a/ppdc/ppdc-array.cxx b/ppdc/ppdc-array.cxx
index fcef51b2..603ceb61 100644
--- a/ppdc/ppdc-array.cxx
+++ b/ppdc/ppdc-array.cxx
@@ -1,5 +1,5 @@
 //
-// "$Id: ppdc-array.cxx 1378 2009-04-08 03:17:45Z msweet $"
+// "$Id: ppdc-array.cxx 11173 2013-07-23 12:31:34Z msweet $"
 //
 //   Array class for the CUPS PPD Compiler.
 //
@@ -164,5 +164,5 @@ ppdcArray::remove(ppdcShared *d)		// I - Data element
 
 
 //
-// End of "$Id: ppdc-array.cxx 1378 2009-04-08 03:17:45Z msweet $".
+// End of "$Id: ppdc-array.cxx 11173 2013-07-23 12:31:34Z msweet $".
 //
diff --git a/ppdc/ppdc-attr.cxx b/ppdc/ppdc-attr.cxx
index 4570f106..01286e7e 100644
--- a/ppdc/ppdc-attr.cxx
+++ b/ppdc/ppdc-attr.cxx
@@ -1,5 +1,5 @@
 //
-// "$Id: ppdc-attr.cxx 1378 2009-04-08 03:17:45Z msweet $"
+// "$Id: ppdc-attr.cxx 11173 2013-07-23 12:31:34Z msweet $"
 //
 //   Attribute class for the CUPS PPD Compiler.
 //
@@ -62,5 +62,5 @@ ppdcAttr::~ppdcAttr()
 
 
 //
-// End of "$Id: ppdc-attr.cxx 1378 2009-04-08 03:17:45Z msweet $".
+// End of "$Id: ppdc-attr.cxx 11173 2013-07-23 12:31:34Z msweet $".
 //
diff --git a/ppdc/ppdc-catalog.cxx b/ppdc/ppdc-catalog.cxx
index ecf7678c..ab237178 100644
--- a/ppdc/ppdc-catalog.cxx
+++ b/ppdc/ppdc-catalog.cxx
@@ -1,5 +1,5 @@
 //
-// "$Id: ppdc-catalog.cxx 3794 2012-04-23 22:44:16Z msweet $"
+// "$Id: ppdc-catalog.cxx 11173 2013-07-23 12:31:34Z msweet $"
 //
 //   Shared message catalog class for the CUPS PPD Compiler.
 //
@@ -893,5 +893,5 @@ put_utf16(cups_file_t *fp,		// I - File to write to
 
 
 //
-// End of "$Id: ppdc-catalog.cxx 3794 2012-04-23 22:44:16Z msweet $".
+// End of "$Id: ppdc-catalog.cxx 11173 2013-07-23 12:31:34Z msweet $".
 //
diff --git a/ppdc/ppdc-choice.cxx b/ppdc/ppdc-choice.cxx
index e9937feb..90872cb7 100644
--- a/ppdc/ppdc-choice.cxx
+++ b/ppdc/ppdc-choice.cxx
@@ -1,5 +1,5 @@
 //
-// "$Id: ppdc-choice.cxx 1378 2009-04-08 03:17:45Z msweet $"
+// "$Id: ppdc-choice.cxx 11173 2013-07-23 12:31:34Z msweet $"
 //
 //   Option choice class for the CUPS PPD Compiler.
 //
@@ -57,5 +57,5 @@ ppdcChoice::~ppdcChoice()
 
 
 //
-// End of "$Id: ppdc-choice.cxx 1378 2009-04-08 03:17:45Z msweet $".
+// End of "$Id: ppdc-choice.cxx 11173 2013-07-23 12:31:34Z msweet $".
 //
diff --git a/ppdc/ppdc-constraint.cxx b/ppdc/ppdc-constraint.cxx
index c0609798..948c329a 100644
--- a/ppdc/ppdc-constraint.cxx
+++ b/ppdc/ppdc-constraint.cxx
@@ -1,5 +1,5 @@
 //
-// "$Id: ppdc-constraint.cxx 1378 2009-04-08 03:17:45Z msweet $"
+// "$Id: ppdc-constraint.cxx 11173 2013-07-23 12:31:34Z msweet $"
 //
 //   Contraint class for the CUPS PPD Compiler.
 //
@@ -60,5 +60,5 @@ ppdcConstraint::~ppdcConstraint()
 
 
 //
-// End of "$Id: ppdc-constraint.cxx 1378 2009-04-08 03:17:45Z msweet $".
+// End of "$Id: ppdc-constraint.cxx 11173 2013-07-23 12:31:34Z msweet $".
 //
diff --git a/ppdc/ppdc-driver.cxx b/ppdc/ppdc-driver.cxx
index dbc8718a..61b2d24e 100644
--- a/ppdc/ppdc-driver.cxx
+++ b/ppdc/ppdc-driver.cxx
@@ -1,5 +1,5 @@
 //
-// "$Id: ppdc-driver.cxx 4185 2013-02-20 02:19:13Z msweet $"
+// "$Id: ppdc-driver.cxx 11173 2013-07-23 12:31:34Z msweet $"
 //
 //   PPD file compiler definitions for the CUPS PPD Compiler.
 //
@@ -1344,5 +1344,5 @@ ppdcDriver::write_ppd_file(
 
 
 //
-// End of "$Id: ppdc-driver.cxx 4185 2013-02-20 02:19:13Z msweet $".
+// End of "$Id: ppdc-driver.cxx 11173 2013-07-23 12:31:34Z msweet $".
 //
diff --git a/ppdc/ppdc-file.cxx b/ppdc/ppdc-file.cxx
index 0a24827f..3c243f31 100644
--- a/ppdc/ppdc-file.cxx
+++ b/ppdc/ppdc-file.cxx
@@ -1,5 +1,5 @@
 //
-// "$Id: ppdc-file.cxx 3755 2012-03-30 05:59:14Z msweet $"
+// "$Id: ppdc-file.cxx 11173 2013-07-23 12:31:34Z msweet $"
 //
 //   File class for the CUPS PPD Compiler.
 //
@@ -106,5 +106,5 @@ ppdcFile::peek()
 
 
 //
-// End of "$Id: ppdc-file.cxx 3755 2012-03-30 05:59:14Z msweet $".
+// End of "$Id: ppdc-file.cxx 11173 2013-07-23 12:31:34Z msweet $".
 //
diff --git a/ppdc/ppdc-filter.cxx b/ppdc/ppdc-filter.cxx
index cc1ae00f..0b0bf4bf 100644
--- a/ppdc/ppdc-filter.cxx
+++ b/ppdc/ppdc-filter.cxx
@@ -1,5 +1,5 @@
 //
-// "$Id: ppdc-filter.cxx 1378 2009-04-08 03:17:45Z msweet $"
+// "$Id: ppdc-filter.cxx 11173 2013-07-23 12:31:34Z msweet $"
 //
 //   Filter class for the CUPS PPD Compiler.
 //
@@ -56,5 +56,5 @@ ppdcFilter::~ppdcFilter()
 
 
 //
-// End of "$Id: ppdc-filter.cxx 1378 2009-04-08 03:17:45Z msweet $".
+// End of "$Id: ppdc-filter.cxx 11173 2013-07-23 12:31:34Z msweet $".
 //
diff --git a/ppdc/ppdc-font.cxx b/ppdc/ppdc-font.cxx
index c5dad4d8..d7b5f265 100644
--- a/ppdc/ppdc-font.cxx
+++ b/ppdc/ppdc-font.cxx
@@ -1,5 +1,5 @@
 //
-// "$Id: ppdc-font.cxx 1378 2009-04-08 03:17:45Z msweet $"
+// "$Id: ppdc-font.cxx 11173 2013-07-23 12:31:34Z msweet $"
 //
 //   Shared font class for the CUPS PPD Compiler.
 //
@@ -62,5 +62,5 @@ ppdcFont::~ppdcFont()
 
 
 //
-// End of "$Id: ppdc-font.cxx 1378 2009-04-08 03:17:45Z msweet $".
+// End of "$Id: ppdc-font.cxx 11173 2013-07-23 12:31:34Z msweet $".
 //
diff --git a/ppdc/ppdc-group.cxx b/ppdc/ppdc-group.cxx
index 00d0a7cb..56c847bd 100644
--- a/ppdc/ppdc-group.cxx
+++ b/ppdc/ppdc-group.cxx
@@ -1,5 +1,5 @@
 //
-// "$Id: ppdc-group.cxx 3275 2011-05-20 07:26:13Z msweet $"
+// "$Id: ppdc-group.cxx 11173 2013-07-23 12:31:34Z msweet $"
 //
 //   Group class for the CUPS PPD Compiler.
 //
@@ -99,5 +99,5 @@ ppdcGroup::find_option(const char *n)	// I - Name of option
 
 
 //
-// End of "$Id: ppdc-group.cxx 3275 2011-05-20 07:26:13Z msweet $".
+// End of "$Id: ppdc-group.cxx 11173 2013-07-23 12:31:34Z msweet $".
 //
diff --git a/ppdc/ppdc-import.cxx b/ppdc/ppdc-import.cxx
index d41cbb98..1c2a1c81 100644
--- a/ppdc/ppdc-import.cxx
+++ b/ppdc/ppdc-import.cxx
@@ -1,5 +1,5 @@
 //
-// "$Id: ppdc-import.cxx 3275 2011-05-20 07:26:13Z msweet $"
+// "$Id: ppdc-import.cxx 11173 2013-07-23 12:31:34Z msweet $"
 //
 //   PPD file import methods for the CUPS PPD Compiler.
 //
@@ -339,5 +339,5 @@ ppdcSource::import_ppd(const char *f)	// I - Filename
 
 
 //
-// End of "$Id: ppdc-import.cxx 3275 2011-05-20 07:26:13Z msweet $".
+// End of "$Id: ppdc-import.cxx 11173 2013-07-23 12:31:34Z msweet $".
 //
diff --git a/ppdc/ppdc-mediasize.cxx b/ppdc/ppdc-mediasize.cxx
index 48afd381..43bcf79e 100644
--- a/ppdc/ppdc-mediasize.cxx
+++ b/ppdc/ppdc-mediasize.cxx
@@ -1,5 +1,5 @@
 //
-// "$Id: ppdc-mediasize.cxx 1378 2009-04-08 03:17:45Z msweet $"
+// "$Id: ppdc-mediasize.cxx 11173 2013-07-23 12:31:34Z msweet $"
 //
 //   Shared media size class for the CUPS PPD Compiler.
 //
@@ -81,5 +81,5 @@ ppdcMediaSize::~ppdcMediaSize()
 
 
 //
-// End of "$Id: ppdc-mediasize.cxx 1378 2009-04-08 03:17:45Z msweet $".
+// End of "$Id: ppdc-mediasize.cxx 11173 2013-07-23 12:31:34Z msweet $".
 //
diff --git a/ppdc/ppdc-message.cxx b/ppdc/ppdc-message.cxx
index fbbe40c3..614c2379 100644
--- a/ppdc/ppdc-message.cxx
+++ b/ppdc/ppdc-message.cxx
@@ -1,5 +1,5 @@
 //
-// "$Id: ppdc-message.cxx 1378 2009-04-08 03:17:45Z msweet $"
+// "$Id: ppdc-message.cxx 11173 2013-07-23 12:31:34Z msweet $"
 //
 //   Shared message class for the CUPS PPD Compiler.
 //
@@ -54,5 +54,5 @@ ppdcMessage::~ppdcMessage()
 
 
 //
-// End of "$Id: ppdc-message.cxx 1378 2009-04-08 03:17:45Z msweet $".
+// End of "$Id: ppdc-message.cxx 11173 2013-07-23 12:31:34Z msweet $".
 //
diff --git a/ppdc/ppdc-option.cxx b/ppdc/ppdc-option.cxx
index 3fdc296a..6bbe1dbe 100644
--- a/ppdc/ppdc-option.cxx
+++ b/ppdc/ppdc-option.cxx
@@ -1,5 +1,5 @@
 //
-// "$Id: ppdc-option.cxx 3275 2011-05-20 07:26:13Z msweet $"
+// "$Id: ppdc-option.cxx 11173 2013-07-23 12:31:34Z msweet $"
 //
 //   Option class for the CUPS PPD Compiler.
 //
@@ -125,5 +125,5 @@ ppdcOption::set_defchoice(ppdcChoice *c)	// I - Choice
 
 
 //
-// End of "$Id: ppdc-option.cxx 3275 2011-05-20 07:26:13Z msweet $".
+// End of "$Id: ppdc-option.cxx 11173 2013-07-23 12:31:34Z msweet $".
 //
diff --git a/ppdc/ppdc-profile.cxx b/ppdc/ppdc-profile.cxx
index 244e34f4..0a63666a 100644
--- a/ppdc/ppdc-profile.cxx
+++ b/ppdc/ppdc-profile.cxx
@@ -1,5 +1,5 @@
 //
-// "$Id: ppdc-profile.cxx 1378 2009-04-08 03:17:45Z msweet $"
+// "$Id: ppdc-profile.cxx 11173 2013-07-23 12:31:34Z msweet $"
 //
 //   Color profile class for the CUPS PPD Compiler.
 //
@@ -61,5 +61,5 @@ ppdcProfile::~ppdcProfile()
 
 
 //
-// End of "$Id: ppdc-profile.cxx 1378 2009-04-08 03:17:45Z msweet $".
+// End of "$Id: ppdc-profile.cxx 11173 2013-07-23 12:31:34Z msweet $".
 //
diff --git a/ppdc/ppdc-shared.cxx b/ppdc/ppdc-shared.cxx
index e6b6167a..bd2983b3 100644
--- a/ppdc/ppdc-shared.cxx
+++ b/ppdc/ppdc-shared.cxx
@@ -1,5 +1,5 @@
 //
-// "$Id: ppdc-shared.cxx 1556 2009-06-10 19:02:58Z msweet $"
+// "$Id: ppdc-shared.cxx 11173 2013-07-23 12:31:34Z msweet $"
 //
 //   Shared data class for the CUPS PPD Compiler.
 //
@@ -84,5 +84,5 @@ ppdcShared::retain()
 
 
 //
-// End of "$Id: ppdc-shared.cxx 1556 2009-06-10 19:02:58Z msweet $".
+// End of "$Id: ppdc-shared.cxx 11173 2013-07-23 12:31:34Z msweet $".
 //
diff --git a/ppdc/ppdc-source.cxx b/ppdc/ppdc-source.cxx
index 518fdb92..46c1bddd 100644
--- a/ppdc/ppdc-source.cxx
+++ b/ppdc/ppdc-source.cxx
@@ -1,5 +1,5 @@
 //
-// "$Id: ppdc-source.cxx 3755 2012-03-30 05:59:14Z msweet $"
+// "$Id: ppdc-source.cxx 11173 2013-07-23 12:31:34Z msweet $"
 //
 //   Source class for the CUPS PPD Compiler.
 //
@@ -3847,5 +3847,5 @@ ppdcSource::write_file(const char *f)	// I - File to write
 
 
 //
-// End of "$Id: ppdc-source.cxx 3755 2012-03-30 05:59:14Z msweet $".
+// End of "$Id: ppdc-source.cxx 11173 2013-07-23 12:31:34Z msweet $".
 //
diff --git a/ppdc/ppdc-string.cxx b/ppdc/ppdc-string.cxx
index 32707ab5..f9dfb9ef 100644
--- a/ppdc/ppdc-string.cxx
+++ b/ppdc/ppdc-string.cxx
@@ -1,5 +1,5 @@
 //
-// "$Id: ppdc-string.cxx 1556 2009-06-10 19:02:58Z msweet $"
+// "$Id: ppdc-string.cxx 11173 2013-07-23 12:31:34Z msweet $"
 //
 //   Shared string class for the CUPS PPD Compiler.
 //
@@ -58,5 +58,5 @@ ppdcString::~ppdcString()
 
 
 //
-// End of "$Id: ppdc-string.cxx 1556 2009-06-10 19:02:58Z msweet $".
+// End of "$Id: ppdc-string.cxx 11173 2013-07-23 12:31:34Z msweet $".
 //
diff --git a/ppdc/ppdc-variable.cxx b/ppdc/ppdc-variable.cxx
index d60ef72f..22b926c3 100644
--- a/ppdc/ppdc-variable.cxx
+++ b/ppdc/ppdc-variable.cxx
@@ -1,5 +1,5 @@
 //
-// "$Id: ppdc-variable.cxx 1378 2009-04-08 03:17:45Z msweet $"
+// "$Id: ppdc-variable.cxx 11173 2013-07-23 12:31:34Z msweet $"
 //
 //   Variable class for the CUPS PPD Compiler.
 //
@@ -67,5 +67,5 @@ ppdcVariable::set_value(const char *v)
 
 
 //
-// End of "$Id: ppdc-variable.cxx 1378 2009-04-08 03:17:45Z msweet $".
+// End of "$Id: ppdc-variable.cxx 11173 2013-07-23 12:31:34Z msweet $".
 //
diff --git a/ppdc/ppdc.cxx b/ppdc/ppdc.cxx
index 6cb6bed2..55990c4e 100644
--- a/ppdc/ppdc.cxx
+++ b/ppdc/ppdc.cxx
@@ -1,5 +1,5 @@
 //
-// "$Id: ppdc.cxx 3794 2012-04-23 22:44:16Z msweet $"
+// "$Id: ppdc.cxx 11173 2013-07-23 12:31:34Z msweet $"
 //
 //   PPD file compiler main entry for the CUPS PPD Compiler.
 //
@@ -464,5 +464,5 @@ usage(void)
 
 
 //
-// End of "$Id: ppdc.cxx 3794 2012-04-23 22:44:16Z msweet $".
+// End of "$Id: ppdc.cxx 11173 2013-07-23 12:31:34Z msweet $".
 //
diff --git a/ppdc/ppdhtml.cxx b/ppdc/ppdhtml.cxx
index da2167b8..89d73935 100644
--- a/ppdc/ppdhtml.cxx
+++ b/ppdc/ppdhtml.cxx
@@ -1,5 +1,5 @@
 //
-// "$Id: ppdhtml.cxx 3071 2011-03-23 00:05:29Z msweet $"
+// "$Id: ppdhtml.cxx 11173 2013-07-23 12:31:34Z msweet $"
 //
 //   PPD to HTML utility for the CUPS PPD Compiler.
 //
@@ -182,5 +182,5 @@ usage(void)
 
 
 //
-// End of "$Id: ppdhtml.cxx 3071 2011-03-23 00:05:29Z msweet $".
+// End of "$Id: ppdhtml.cxx 11173 2013-07-23 12:31:34Z msweet $".
 //
diff --git a/ppdc/ppdi.cxx b/ppdc/ppdi.cxx
index cbc728b9..2ebe4103 100644
--- a/ppdc/ppdi.cxx
+++ b/ppdc/ppdi.cxx
@@ -1,5 +1,5 @@
 //
-// "$Id: ppdi.cxx 3071 2011-03-23 00:05:29Z msweet $"
+// "$Id: ppdi.cxx 11173 2013-07-23 12:31:34Z msweet $"
 //
 //   PPD file import utility for the CUPS PPD Compiler.
 //
@@ -138,5 +138,5 @@ usage(void)
 
 
 //
-// End of "$Id: ppdi.cxx 3071 2011-03-23 00:05:29Z msweet $".
+// End of "$Id: ppdi.cxx 11173 2013-07-23 12:31:34Z msweet $".
 //
diff --git a/ppdc/ppdmerge.cxx b/ppdc/ppdmerge.cxx
index 63966c0e..2564905a 100644
--- a/ppdc/ppdmerge.cxx
+++ b/ppdc/ppdmerge.cxx
@@ -1,5 +1,5 @@
 //
-// "$Id: ppdmerge.cxx 3275 2011-05-20 07:26:13Z msweet $"
+// "$Id: ppdmerge.cxx 11173 2013-07-23 12:31:34Z msweet $"
 //
 //   PPD file merge utility for the CUPS PPD Compiler.
 //
@@ -375,5 +375,5 @@ usage(void)
 
 
 //
-// End of "$Id: ppdmerge.cxx 3275 2011-05-20 07:26:13Z msweet $".
+// End of "$Id: ppdmerge.cxx 11173 2013-07-23 12:31:34Z msweet $".
 //
diff --git a/ppdc/ppdpo.cxx b/ppdc/ppdpo.cxx
index 65032a43..14e96d06 100644
--- a/ppdc/ppdpo.cxx
+++ b/ppdc/ppdpo.cxx
@@ -1,5 +1,5 @@
 //
-// "$Id: ppdpo.cxx 3794 2012-04-23 22:44:16Z msweet $"
+// "$Id: ppdpo.cxx 11173 2013-07-23 12:31:34Z msweet $"
 //
 //   PPD file message catalog program for the CUPS PPD Compiler.
 //
@@ -263,5 +263,5 @@ usage(void)
 
 
 //
-// End of "$Id: ppdpo.cxx 3794 2012-04-23 22:44:16Z msweet $".
+// End of "$Id: ppdpo.cxx 11173 2013-07-23 12:31:34Z msweet $".
 //
diff --git a/ppdc/testcatalog.cxx b/ppdc/testcatalog.cxx
index 0943dcc4..1e8ecaa4 100644
--- a/ppdc/testcatalog.cxx
+++ b/ppdc/testcatalog.cxx
@@ -1,5 +1,5 @@
 //
-// "$Id: testcatalog.cxx 1378 2009-04-08 03:17:45Z msweet $"
+// "$Id: testcatalog.cxx 11173 2013-07-23 12:31:34Z msweet $"
 //
 //   Test program for message catalog class.
 //
@@ -59,5 +59,5 @@ main(int  argc,				// I - Number of command-line arguments
 
 
 //
-// End of "$Id: testcatalog.cxx 1378 2009-04-08 03:17:45Z msweet $".
+// End of "$Id: testcatalog.cxx 11173 2013-07-23 12:31:34Z msweet $".
 //
diff --git a/scheduler/Makefile b/scheduler/Makefile
index f8a66f71..27905690 100644
--- a/scheduler/Makefile
+++ b/scheduler/Makefile
@@ -1,5 +1,5 @@
 #
-# "$Id: Makefile 7875 2008-08-27 22:53:31Z mike $"
+# "$Id: Makefile 11173 2013-07-23 12:31:34Z msweet $"
 #
 #   Scheduler Makefile for CUPS.
 #
@@ -559,5 +559,5 @@ include Dependencies
 
 
 #
-# End of "$Id: Makefile 7875 2008-08-27 22:53:31Z mike $".
+# End of "$Id: Makefile 11173 2013-07-23 12:31:34Z msweet $".
 #
diff --git a/scheduler/auth.c b/scheduler/auth.c
index 42a29d43..1169adf5 100644
--- a/scheduler/auth.c
+++ b/scheduler/auth.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: auth.c 7830 2008-08-04 20:38:50Z mike $"
+ * "$Id: auth.c 11173 2013-07-23 12:31:34Z msweet $"
  *
  *   Authorization routines for the CUPS scheduler.
  *
@@ -2607,5 +2607,5 @@ to64(char          *s,			/* O - Output string */
 
 
 /*
- * End of "$Id: auth.c 7830 2008-08-04 20:38:50Z mike $".
+ * End of "$Id: auth.c 11173 2013-07-23 12:31:34Z msweet $".
  */
diff --git a/scheduler/auth.h b/scheduler/auth.h
index fecee62d..89790239 100644
--- a/scheduler/auth.h
+++ b/scheduler/auth.h
@@ -1,5 +1,5 @@
 /*
- * "$Id: auth.h 7317 2008-02-15 22:29:27Z mike $"
+ * "$Id: auth.h 11173 2013-07-23 12:31:34Z msweet $"
  *
  *   Authorization definitions for the CUPS scheduler.
  *
@@ -147,5 +147,5 @@ extern cupsd_location_t	*cupsdNewLocation(const char *location);
 
 
 /*
- * End of "$Id: auth.h 7317 2008-02-15 22:29:27Z mike $".
+ * End of "$Id: auth.h 11173 2013-07-23 12:31:34Z msweet $".
  */
diff --git a/scheduler/banners.c b/scheduler/banners.c
index a4597964..87a1a68a 100644
--- a/scheduler/banners.c
+++ b/scheduler/banners.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: banners.c 7221 2008-01-16 22:20:08Z mike $"
+ * "$Id: banners.c 11173 2013-07-23 12:31:34Z msweet $"
  *
  *   Banner routines for the CUPS scheduler.
  *
@@ -220,5 +220,5 @@ free_banners(void)
 
 
 /*
- * End of "$Id: banners.c 7221 2008-01-16 22:20:08Z mike $".
+ * End of "$Id: banners.c 11173 2013-07-23 12:31:34Z msweet $".
  */
diff --git a/scheduler/banners.h b/scheduler/banners.h
index b215fe6a..4a91e8ad 100644
--- a/scheduler/banners.h
+++ b/scheduler/banners.h
@@ -1,5 +1,5 @@
 /*
- * "$Id: banners.h 6649 2007-07-11 21:46:42Z mike $"
+ * "$Id: banners.h 11173 2013-07-23 12:31:34Z msweet $"
  *
  *   Banner definitions for the CUPS scheduler.
  *
@@ -41,5 +41,5 @@ extern void		cupsdLoadBanners(const char *d);
 
 
 /*
- * End of "$Id: banners.h 6649 2007-07-11 21:46:42Z mike $".
+ * End of "$Id: banners.h 11173 2013-07-23 12:31:34Z msweet $".
  */
diff --git a/scheduler/cert.c b/scheduler/cert.c
index fa956034..cd47228c 100644
--- a/scheduler/cert.c
+++ b/scheduler/cert.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: cert.c 7673 2008-06-18 22:31:26Z mike $"
+ * "$Id: cert.c 11173 2013-07-23 12:31:34Z msweet $"
  *
  *   Authentication certificate routines for the CUPS scheduler.
  *
@@ -436,5 +436,5 @@ cupsdInitCerts(void)
 
 
 /*
- * End of "$Id: cert.c 7673 2008-06-18 22:31:26Z mike $".
+ * End of "$Id: cert.c 11173 2013-07-23 12:31:34Z msweet $".
  */
diff --git a/scheduler/cert.h b/scheduler/cert.h
index d479b2ec..26eaa9f6 100644
--- a/scheduler/cert.h
+++ b/scheduler/cert.h
@@ -1,5 +1,5 @@
 /*
- * "$Id: cert.h 7383 2008-03-20 20:58:07Z mike $"
+ * "$Id: cert.h 11173 2013-07-23 12:31:34Z msweet $"
  *
  *   Authentication certificate definitions for the CUPS scheduler.
  *
@@ -49,5 +49,5 @@ extern void		cupsdInitCerts(void);
 
 
 /*
- * End of "$Id: cert.h 7383 2008-03-20 20:58:07Z mike $".
+ * End of "$Id: cert.h 11173 2013-07-23 12:31:34Z msweet $".
  */
diff --git a/scheduler/classes.c b/scheduler/classes.c
index f5b5bcc6..1aed92cc 100644
--- a/scheduler/classes.c
+++ b/scheduler/classes.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: classes.c 10104 2011-11-04 06:37:03Z mike $"
+ * "$Id: classes.c 11173 2013-07-23 12:31:34Z msweet $"
  *
  *   Printer class routines for the CUPS scheduler.
  *
@@ -814,5 +814,5 @@ cupsdSaveAllClasses(void)
 
 
 /*
- * End of "$Id: classes.c 10104 2011-11-04 06:37:03Z mike $".
+ * End of "$Id: classes.c 11173 2013-07-23 12:31:34Z msweet $".
  */
diff --git a/scheduler/classes.h b/scheduler/classes.h
index 0170b97e..6d94de2f 100644
--- a/scheduler/classes.h
+++ b/scheduler/classes.h
@@ -1,5 +1,5 @@
 /*
- * "$Id: classes.h 6649 2007-07-11 21:46:42Z mike $"
+ * "$Id: classes.h 11173 2013-07-23 12:31:34Z msweet $"
  *
  *   Printer class definitions for the CUPS scheduler.
  *
@@ -31,5 +31,5 @@ extern void		cupsdSaveAllClasses(void);
 
 
 /*
- * End of "$Id: classes.h 6649 2007-07-11 21:46:42Z mike $".
+ * End of "$Id: classes.h 11173 2013-07-23 12:31:34Z msweet $".
  */
diff --git a/scheduler/client.c b/scheduler/client.c
index 6be75833..b341e9dd 100644
--- a/scheduler/client.c
+++ b/scheduler/client.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: client.c 7950 2008-09-17 00:21:59Z mike $"
+ * "$Id: client.c 11173 2013-07-23 12:31:34Z msweet $"
  *
  *   Client routines for the CUPS scheduler.
  *
@@ -4225,5 +4225,5 @@ write_pipe(cupsd_client_t *con)		/* I - Client connection */
 
 
 /*
- * End of "$Id: client.c 7950 2008-09-17 00:21:59Z mike $".
+ * End of "$Id: client.c 11173 2013-07-23 12:31:34Z msweet $".
  */
diff --git a/scheduler/client.h b/scheduler/client.h
index 3f5475f0..106e43e8 100644
--- a/scheduler/client.h
+++ b/scheduler/client.h
@@ -1,5 +1,5 @@
 /*
- * "$Id: client.h 7935 2008-09-11 01:54:11Z mike $"
+ * "$Id: client.h 11173 2013-07-23 12:31:34Z msweet $"
  *
  *   Client definitions for the CUPS scheduler.
  *
@@ -140,5 +140,5 @@ extern int	cupsdStartTLS(cupsd_client_t *con);
 
 
 /*
- * End of "$Id: client.h 7935 2008-09-11 01:54:11Z mike $".
+ * End of "$Id: client.h 11173 2013-07-23 12:31:34Z msweet $".
  */
diff --git a/scheduler/colorman.c b/scheduler/colorman.c
index ee3d5a3a..be064b64 100644
--- a/scheduler/colorman.c
+++ b/scheduler/colorman.c
@@ -1,9 +1,9 @@
 /*
- * "$Id: colorman.c 4298 2013-05-10 16:52:10Z msweet $"
+ * "$Id: colorman.c 11173 2013-07-23 12:31:34Z msweet $"
  *
  *   Color management routines for the CUPS scheduler.
  *
- *   Copyright 2007-2012 by Apple Inc.
+ *   Copyright 2007-2013 by Apple Inc.
  *   Copyright 1997-2007 by Easy Software Products, all rights reserved.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -103,11 +103,10 @@ extern CFUUIDRef ColorSyncCreateUUIDFromUInt32(unsigned id);
 #  define COLORD_KIND_PRINTER	"printer"
 					/* printing output device */
 
-#  define COLORD_DBUS_MSG(p,m)	dbus_message_new_method_call(\
-					"org.freedesktop.ColorManager", (p),\
-                                        "org.freedesktop.ColorManager", (m))
-                                        /* Macro to make new colord messages */
-#  define COLORD_DBUS_PATH	"/org/freedesktop/ColorManager"
+#  define COLORD_DBUS_SERVICE		"org.freedesktop.ColorManager"
+#  define COLORD_DBUS_INTERFACE 	"org.freedesktop.ColorManager"
+#  define COLORD_DBUS_INTERFACE_DEVICE	"org.freedesktop.ColorManager.Device"
+#  define COLORD_DBUS_PATH		"/org/freedesktop/ColorManager"
 					/* Path for color management system */
 #  define COLORD_DBUS_TIMEOUT	5000	/* Timeout for connecting to colord in ms */
 #endif /* __APPLE__ */
@@ -939,7 +938,10 @@ colord_create_device(
   snprintf(device_id, sizeof(device_id), "cups-%s", p->name);
   device_path = device_id;
 
-  message = COLORD_DBUS_MSG(COLORD_DBUS_PATH, "CreateDevice");
+  message = dbus_message_new_method_call(COLORD_DBUS_SERVICE,
+                                         COLORD_DBUS_PATH,
+                                         COLORD_DBUS_INTERFACE,
+                                         "CreateDevice");
 
   dbus_message_iter_init_append(message, &args);
   dbus_message_iter_append_basic(&args, DBUS_TYPE_STRING, &device_path);
@@ -1048,7 +1050,10 @@ colord_create_profile(
   * Create the profile...
   */
 
-  message = COLORD_DBUS_MSG(COLORD_DBUS_PATH, "CreateProfile");
+  message = dbus_message_new_method_call(COLORD_DBUS_SERVICE,
+                                         COLORD_DBUS_PATH,
+                                         COLORD_DBUS_INTERFACE,
+                                         "CreateProfile");
 
   idstrlen = strlen(printer_name) + 1 + strlen(qualifier) + 1;
   if ((idstr = malloc(idstrlen)) == NULL)
@@ -1144,7 +1149,10 @@ colord_delete_device(
   * Delete the device...
   */
 
-  message = COLORD_DBUS_MSG(COLORD_DBUS_PATH, "DeleteDevice");
+  message = dbus_message_new_method_call(COLORD_DBUS_SERVICE,
+                                         COLORD_DBUS_PATH,
+                                         COLORD_DBUS_INTERFACE,
+                                         "DeleteDevice");
 
   dbus_message_iter_init_append(message, &args);
   dbus_message_iter_append_basic(&args, DBUS_TYPE_OBJECT_PATH, &device_path);
@@ -1196,7 +1204,10 @@ colord_device_add_profile(
   DBusError	error;			/* D-Bus error */
 
 
-  message = COLORD_DBUS_MSG(device_path, "AddProfile");
+  message = dbus_message_new_method_call(COLORD_DBUS_SERVICE,
+                                         device_path,
+                                         COLORD_DBUS_INTERFACE_DEVICE,
+                                         "AddProfile");
 
   dbus_message_iter_init_append(message, &args);
   dbus_message_iter_append_basic(&args, DBUS_TYPE_STRING, &relation);
@@ -1266,7 +1277,10 @@ colord_find_device(
   char		*device_path = NULL;	/* Device object path */
 
 
-  message = COLORD_DBUS_MSG(COLORD_DBUS_PATH, "FindDeviceById");
+  message = dbus_message_new_method_call(COLORD_DBUS_SERVICE,
+                                         COLORD_DBUS_PATH,
+                                         COLORD_DBUS_INTERFACE,
+                                         "FindDeviceById");
 
   dbus_message_iter_init_append(message, &args);
   dbus_message_iter_append_basic(&args, DBUS_TYPE_STRING, &device_id);
@@ -1524,5 +1538,5 @@ colord_unregister_printer(
 
 
 /*
- * End of "$Id: colorman.c 4298 2013-05-10 16:52:10Z msweet $".
+ * End of "$Id: colorman.c 11173 2013-07-23 12:31:34Z msweet $".
  */
diff --git a/scheduler/colorman.h b/scheduler/colorman.h
index 3360fd4e..a95adcf1 100644
--- a/scheduler/colorman.h
+++ b/scheduler/colorman.h
@@ -1,5 +1,5 @@
 /*
- * "$Id: colorman.h 3833 2012-05-23 22:51:18Z msweet $"
+ * "$Id: colorman.h 11173 2013-07-23 12:31:34Z msweet $"
  *
  *   Color management definitions for the CUPS scheduler.
  *
@@ -24,5 +24,5 @@ extern void	cupsdUnregisterColor(cupsd_printer_t *p);
 
 
 /*
- * End of "$Id: colorman.h 3833 2012-05-23 22:51:18Z msweet $".
+ * End of "$Id: colorman.h 11173 2013-07-23 12:31:34Z msweet $".
  */
diff --git a/scheduler/conf.c b/scheduler/conf.c
index f04acf93..7ae8fed7 100644
--- a/scheduler/conf.c
+++ b/scheduler/conf.c
@@ -1,9 +1,9 @@
 /*
- * "$Id: conf.c 9352 2010-11-06 04:55:26Z mike $"
+ * "$Id: conf.c 11221 2013-08-06 16:16:01Z msweet $"
  *
  *   Configuration routines for the CUPS scheduler.
  *
- *   Copyright 2007-2012 by Apple Inc.
+ *   Copyright 2007-2013 by Apple Inc.
  *   Copyright 1997-2007 by Easy Software Products, all rights reserved.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -174,6 +174,7 @@ static const cupsd_var_t	cupsfiles_vars[] =
   { "ServerRoot",		&ServerRoot,		CUPSD_VARTYPE_PATHNAME },
   { "SMBConfigFile",		&SMBConfigFile,		CUPSD_VARTYPE_STRING },
   { "StateDir",			&StateDir,		CUPSD_VARTYPE_STRING },
+  { "SyncOnClose",		&SyncOnClose,		CUPSD_VARTYPE_BOOLEAN },
 #ifdef HAVE_AUTHORIZATION_H
   { "SystemGroupAuthKey",	&SystemGroupAuthKey,	CUPSD_VARTYPE_STRING },
 #endif /* HAVE_AUTHORIZATION_H */
@@ -735,6 +736,7 @@ cupsdReadConfiguration(void)
   ReloadTimeout	           = DEFAULT_KEEPALIVE;
   RootCertDuration         = 300;
   StrictConformance        = FALSE;
+  SyncOnClose              = FALSE;
   Timeout                  = DEFAULT_TIMEOUT;
   WebInterface             = CUPS_DEFAULT_WEBIF;
 
@@ -4080,5 +4082,5 @@ set_policy_defaults(cupsd_policy_t *pol)/* I - Policy */
 
 
 /*
- * End of "$Id: conf.c 9352 2010-11-06 04:55:26Z mike $".
+ * End of "$Id: conf.c 11221 2013-08-06 16:16:01Z msweet $".
  */
diff --git a/scheduler/conf.h b/scheduler/conf.h
index 88af4a23..8bf07490 100644
--- a/scheduler/conf.h
+++ b/scheduler/conf.h
@@ -1,9 +1,9 @@
 /*
- * "$Id: conf.h 7935 2008-09-11 01:54:11Z mike $"
+ * "$Id: conf.h 11221 2013-08-06 16:16:01Z msweet $"
  *
  *   Configuration file definitions for the CUPS scheduler.
  *
- *   Copyright 2007-2012 by Apple Inc.
+ *   Copyright 2007-2013 by Apple Inc.
  *   Copyright 1997-2007 by Easy Software Products, all rights reserved.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -173,6 +173,8 @@ VAR int			ClassifyOverride	VALUE(0),
 					/* Which errors are fatal? */
 			StrictConformance	VALUE(FALSE),
 					/* Require strict IPP conformance? */
+			SyncOnClose		VALUE(FALSE),
+					/* Call fsync() when closing files? */
 			LogFilePerm		VALUE(0644);
 					/* Permissions for log files */
 VAR cupsd_loglevel_t	LogLevel		VALUE(CUPSD_LOG_WARN);
@@ -296,5 +298,5 @@ extern int	cupsdWriteErrorLog(int level, const char *message);
 
 
 /*
- * End of "$Id: conf.h 7935 2008-09-11 01:54:11Z mike $".
+ * End of "$Id: conf.h 11221 2013-08-06 16:16:01Z msweet $".
  */
diff --git a/scheduler/cups-deviced.c b/scheduler/cups-deviced.c
index 1a1dbb26..7a5929f3 100644
--- a/scheduler/cups-deviced.c
+++ b/scheduler/cups-deviced.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: cups-deviced.c 7816 2008-07-30 20:53:31Z mike $"
+ * "$Id: cups-deviced.c 11173 2013-07-23 12:31:34Z msweet $"
  *
  *   Device scanning mini-daemon for CUPS.
  *
@@ -806,5 +806,5 @@ start_backend(const char *name,		/* I - Backend to run */
 
 
 /*
- * End of "$Id: cups-deviced.c 7816 2008-07-30 20:53:31Z mike $".
+ * End of "$Id: cups-deviced.c 11173 2013-07-23 12:31:34Z msweet $".
  */
diff --git a/scheduler/cups-driverd.cxx b/scheduler/cups-driverd.cxx
index cbd2f115..4a3d34f4 100644
--- a/scheduler/cups-driverd.cxx
+++ b/scheduler/cups-driverd.cxx
@@ -1,5 +1,5 @@
 /*
- * "$Id: cups-driverd.cxx 3833 2012-05-23 22:51:18Z msweet $"
+ * "$Id: cups-driverd.cxx 11173 2013-07-23 12:31:34Z msweet $"
  *
  *   PPD/driver support for CUPS.
  *
@@ -2947,5 +2947,5 @@ regex_string(const char *s)		/* I - String to compare */
 
 
 /*
- * End of "$Id: cups-driverd.cxx 3833 2012-05-23 22:51:18Z msweet $".
+ * End of "$Id: cups-driverd.cxx 11173 2013-07-23 12:31:34Z msweet $".
  */
diff --git a/scheduler/cups-exec.c b/scheduler/cups-exec.c
index beac46ea..6d0d3d8f 100644
--- a/scheduler/cups-exec.c
+++ b/scheduler/cups-exec.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: cups-exec.c 4298 2013-05-10 16:52:10Z msweet $"
+ * "$Id: cups-exec.c 11173 2013-07-23 12:31:34Z msweet $"
  *
  *   Sandbox helper for CUPS.
  *
@@ -105,5 +105,5 @@ main(int  argc,				/* I - Number of command-line args */
 
 
 /*
- * End of "$Id: cups-exec.c 4298 2013-05-10 16:52:10Z msweet $".
+ * End of "$Id: cups-exec.c 11173 2013-07-23 12:31:34Z msweet $".
  */
diff --git a/scheduler/cups-lpd.c b/scheduler/cups-lpd.c
index 11bcd4df..bd6757b3 100644
--- a/scheduler/cups-lpd.c
+++ b/scheduler/cups-lpd.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: cups-lpd.c 7899 2008-09-03 12:57:17Z mike $"
+ * "$Id: cups-lpd.c 11173 2013-07-23 12:31:34Z msweet $"
  *
  *   Line Printer Daemon interface for CUPS.
  *
@@ -1622,5 +1622,5 @@ smart_gets(char *s,			/* I - Pointer to line buffer */
 
 
 /*
- * End of "$Id: cups-lpd.c 7899 2008-09-03 12:57:17Z mike $".
+ * End of "$Id: cups-lpd.c 11173 2013-07-23 12:31:34Z msweet $".
  */
diff --git a/scheduler/cups.sh.in b/scheduler/cups.sh.in
index a1aaf8b9..ff72c1c2 100644
--- a/scheduler/cups.sh.in
+++ b/scheduler/cups.sh.in
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# "$Id: cups.sh.in 3411 2011-09-07 22:31:27Z msweet $"
+# "$Id: cups.sh.in 11173 2013-07-23 12:31:34Z msweet $"
 #
 #   Startup/shutdown script for CUPS.
 #
@@ -233,5 +233,5 @@ exit 0
 
 
 #
-# End of "$Id: cups.sh.in 3411 2011-09-07 22:31:27Z msweet $".
+# End of "$Id: cups.sh.in 11173 2013-07-23 12:31:34Z msweet $".
 #
diff --git a/scheduler/cups.xml.in b/scheduler/cups.xml.in
index ac635850..b76ad02b 100644
--- a/scheduler/cups.xml.in
+++ b/scheduler/cups.xml.in
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE service_bundle SYSTEM "/usr/share/lib/xml/dtd/service_bundle.dtd.1">
 <!--
-    $Id: cups.xml.in 2309 2010-07-08 20:45:48Z msweet $
+    $Id: cups.xml.in 11173 2013-07-23 12:31:34Z msweet $
 
     Service manifest for CUPS.
 
diff --git a/scheduler/cupsd.h b/scheduler/cupsd.h
index 8a6ffd97..48ea1d75 100644
--- a/scheduler/cupsd.h
+++ b/scheduler/cupsd.h
@@ -1,5 +1,5 @@
 /*
- * "$Id: cupsd.h 7928 2008-09-10 22:14:22Z mike $"
+ * "$Id: cupsd.h 11173 2013-07-23 12:31:34Z msweet $"
  *
  *   Main header file for the CUPS scheduler.
  *
@@ -230,5 +230,5 @@ extern void		cupsdStopServer(void);
 
 
 /*
- * End of "$Id: cupsd.h 7928 2008-09-10 22:14:22Z mike $".
+ * End of "$Id: cupsd.h 11173 2013-07-23 12:31:34Z msweet $".
  */
diff --git a/scheduler/cupsfilter.c b/scheduler/cupsfilter.c
index 531a483b..4b471d55 100644
--- a/scheduler/cupsfilter.c
+++ b/scheduler/cupsfilter.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: cupsfilter.c 7952 2008-09-17 00:56:20Z mike $"
+ * "$Id: cupsfilter.c 11173 2013-07-23 12:31:34Z msweet $"
  *
  *   Filtering program for CUPS.
  *
@@ -1459,5 +1459,5 @@ usage(const char *opt)			/* I - Incorrect option, if any */
 
 
 /*
- * End of "$Id: cupsfilter.c 7952 2008-09-17 00:56:20Z mike $".
+ * End of "$Id: cupsfilter.c 11173 2013-07-23 12:31:34Z msweet $".
  */
diff --git a/scheduler/dirsvc.c b/scheduler/dirsvc.c
index 6dfdb136..bce0d643 100644
--- a/scheduler/dirsvc.c
+++ b/scheduler/dirsvc.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: dirsvc.c 7933 2008-09-11 00:44:58Z mike $"
+ * "$Id: dirsvc.c 11173 2013-07-23 12:31:34Z msweet $"
  *
  *   Directory services routines for the CUPS scheduler.
  *
@@ -1666,5 +1666,5 @@ update_smb(int onoff)			/* I - 1 = turn on, 0 = turn off */
 
 
 /*
- * End of "$Id: dirsvc.c 7933 2008-09-11 00:44:58Z mike $".
+ * End of "$Id: dirsvc.c 11173 2013-07-23 12:31:34Z msweet $".
  */
diff --git a/scheduler/dirsvc.h b/scheduler/dirsvc.h
index 39b74ce9..edc5ad33 100644
--- a/scheduler/dirsvc.h
+++ b/scheduler/dirsvc.h
@@ -1,5 +1,5 @@
 /*
- * "$Id: dirsvc.h 7933 2008-09-11 00:44:58Z mike $"
+ * "$Id: dirsvc.h 11173 2013-07-23 12:31:34Z msweet $"
  *
  *   Directory services definitions for the CUPS scheduler.
  *
@@ -80,5 +80,5 @@ extern void	cupsdUpdateDNSSDName(void);
 
 
 /*
- * End of "$Id: dirsvc.h 7933 2008-09-11 00:44:58Z mike $".
+ * End of "$Id: dirsvc.h 11173 2013-07-23 12:31:34Z msweet $".
  */
diff --git a/scheduler/env.c b/scheduler/env.c
index 5fbe52c5..ba11aad7 100644
--- a/scheduler/env.c
+++ b/scheduler/env.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: env.c 9459 2011-01-11 03:48:42Z mike $"
+ * "$Id: env.c 11173 2013-07-23 12:31:34Z msweet $"
  *
  *   Environment management routines for the CUPS scheduler.
  *
@@ -269,5 +269,5 @@ find_env(const char *name)		/* I - Variable name */
 
 
 /*
- * End of "$Id: env.c 9459 2011-01-11 03:48:42Z mike $".
+ * End of "$Id: env.c 11173 2013-07-23 12:31:34Z msweet $".
  */
diff --git a/scheduler/file.c b/scheduler/file.c
index e703de4f..84ceef1c 100644
--- a/scheduler/file.c
+++ b/scheduler/file.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: file.c 3247 2011-05-12 06:22:31Z msweet $"
+ * "$Id: file.c 11221 2013-08-06 16:16:01Z msweet $"
  *
  *   File functions for the CUPS scheduler.
  *
@@ -109,6 +109,29 @@ cupsdCloseCreatedConfFile(
 
 
  /*
+  * Synchronize changes to disk if SyncOnClose is enabled.
+  */
+
+  if (SyncOnClose)
+  {
+    if (cupsFileFlush(fp))
+    {
+      cupsdLogMessage(CUPSD_LOG_ERROR, "Unable to write changes to \"%s\": %s",
+		      filename, strerror(errno));
+      cupsFileClose(fp);
+      return (-1);
+    }
+
+    if (fsync(cupsFileNumber(fp)))
+    {
+      cupsdLogMessage(CUPSD_LOG_ERROR, "Unable to sync changes to \"%s\": %s",
+		      filename, strerror(errno));
+      cupsFileClose(fp);
+      return (-1);
+    }
+  }
+
+ /*
   * First close the file...
   */
 
@@ -446,5 +469,5 @@ overwrite_data(int        fd,		/* I - File descriptor */
 
 
 /*
- * End of "$Id: file.c 3247 2011-05-12 06:22:31Z msweet $".
+ * End of "$Id: file.c 11221 2013-08-06 16:16:01Z msweet $".
  */
diff --git a/scheduler/filter.c b/scheduler/filter.c
index b708fa36..6979b5c7 100644
--- a/scheduler/filter.c
+++ b/scheduler/filter.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: filter.c 7694 2008-06-26 00:23:20Z mike $"
+ * "$Id: filter.c 11173 2013-07-23 12:31:34Z msweet $"
  *
  *   File type conversion routines for CUPS.
  *
@@ -500,5 +500,5 @@ mime_find_filters(
 
 
 /*
- * End of "$Id: filter.c 7694 2008-06-26 00:23:20Z mike $".
+ * End of "$Id: filter.c 11173 2013-07-23 12:31:34Z msweet $".
  */
diff --git a/scheduler/ipp.c b/scheduler/ipp.c
index 637c717b..6968cd5e 100644
--- a/scheduler/ipp.c
+++ b/scheduler/ipp.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: ipp.c 7944 2008-09-16 22:32:42Z mike $"
+ * "$Id: ipp.c 11173 2013-07-23 12:31:34Z msweet $"
  *
  *   IPP routines for the CUPS scheduler.
  *
@@ -11312,5 +11312,5 @@ validate_user(cupsd_job_t    *job,	/* I - Job */
 
 
 /*
- * End of "$Id: ipp.c 7944 2008-09-16 22:32:42Z mike $".
+ * End of "$Id: ipp.c 11173 2013-07-23 12:31:34Z msweet $".
  */
diff --git a/scheduler/job.c b/scheduler/job.c
index 3b662b95..d8f56b51 100644
--- a/scheduler/job.c
+++ b/scheduler/job.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: job.c 7902 2008-09-03 14:20:17Z mike $"
+ * "$Id: job.c 11173 2013-07-23 12:31:34Z msweet $"
  *
  *   Job management routines for the CUPS scheduler.
  *
@@ -5121,5 +5121,5 @@ update_job_attrs(cupsd_job_t *job,	/* I - Job to update */
 
 
 /*
- * End of "$Id: job.c 7902 2008-09-03 14:20:17Z mike $".
+ * End of "$Id: job.c 11173 2013-07-23 12:31:34Z msweet $".
  */
diff --git a/scheduler/job.h b/scheduler/job.h
index e0250afe..6fb5ab88 100644
--- a/scheduler/job.h
+++ b/scheduler/job.h
@@ -1,5 +1,5 @@
 /*
- * "$Id: job.h 7883 2008-08-28 20:38:13Z mike $"
+ * "$Id: job.h 11173 2013-07-23 12:31:34Z msweet $"
  *
  *   Print job definitions for the CUPS scheduler.
  *
@@ -171,5 +171,5 @@ extern void		cupsdUpdateJobs(void);
 
 
 /*
- * End of "$Id: job.h 7883 2008-08-28 20:38:13Z mike $".
+ * End of "$Id: job.h 11173 2013-07-23 12:31:34Z msweet $".
  */
diff --git a/scheduler/listen.c b/scheduler/listen.c
index 16528b9d..a4c19c0b 100644
--- a/scheduler/listen.c
+++ b/scheduler/listen.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: listen.c 7918 2008-09-08 22:03:01Z mike $"
+ * "$Id: listen.c 11173 2013-07-23 12:31:34Z msweet $"
  *
  *   Server listening routines for the CUPS scheduler.
  *
@@ -427,5 +427,5 @@ cupsdStopListening(void)
 
 
 /*
- * End of "$Id: listen.c 7918 2008-09-08 22:03:01Z mike $".
+ * End of "$Id: listen.c 11173 2013-07-23 12:31:34Z msweet $".
  */
diff --git a/scheduler/log.c b/scheduler/log.c
index 17e4c267..d739b58c 100644
--- a/scheduler/log.c
+++ b/scheduler/log.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: log.c 7918 2008-09-08 22:03:01Z mike $"
+ * "$Id: log.c 11173 2013-07-23 12:31:34Z msweet $"
  *
  *   Log file routines for the CUPS scheduler.
  *
@@ -1103,5 +1103,5 @@ format_log_line(const char *message,	/* I - Printf-style format string */
 
 
 /*
- * End of "$Id: log.c 7918 2008-09-08 22:03:01Z mike $".
+ * End of "$Id: log.c 11173 2013-07-23 12:31:34Z msweet $".
  */
diff --git a/scheduler/main.c b/scheduler/main.c
index fa9f8896..11eae528 100644
--- a/scheduler/main.c
+++ b/scheduler/main.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: main.c 7925 2008-09-10 17:47:26Z mike $"
+ * "$Id: main.c 11173 2013-07-23 12:31:34Z msweet $"
  *
  *   Main loop for the CUPS scheduler.
  *
@@ -2066,5 +2066,5 @@ usage(int status)			/* O - Exit status */
 
 
 /*
- * End of "$Id: main.c 7925 2008-09-10 17:47:26Z mike $".
+ * End of "$Id: main.c 11173 2013-07-23 12:31:34Z msweet $".
  */
diff --git a/scheduler/mime-private.h b/scheduler/mime-private.h
index 078953db..f984548c 100644
--- a/scheduler/mime-private.h
+++ b/scheduler/mime-private.h
@@ -1,5 +1,5 @@
 /*
- * "$Id: mime-private.h 3411 2011-09-07 22:31:27Z msweet $"
+ * "$Id: mime-private.h 11173 2013-07-23 12:31:34Z msweet $"
  *
  *   Private MIME type/conversion database definitions for CUPS.
  *
@@ -41,5 +41,5 @@ extern void	_mimeError(mime_t *mime, const char *format, ...)
 #endif /* !_CUPS_MIME_PRIVATE_H_ */
 
 /*
- * End of "$Id: mime-private.h 3411 2011-09-07 22:31:27Z msweet $".
+ * End of "$Id: mime-private.h 11173 2013-07-23 12:31:34Z msweet $".
  */
diff --git a/scheduler/mime.c b/scheduler/mime.c
index fd7c12a4..412c9e0d 100644
--- a/scheduler/mime.c
+++ b/scheduler/mime.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: mime.c 9750 2011-05-06 22:53:53Z mike $"
+ * "$Id: mime.c 11173 2013-07-23 12:31:34Z msweet $"
  *
  *   MIME database file routines for CUPS.
  *
@@ -956,5 +956,5 @@ mime_load_types(mime_t     *mime,	/* I - MIME database */
 
 
 /*
- * End of "$Id: mime.c 9750 2011-05-06 22:53:53Z mike $".
+ * End of "$Id: mime.c 11173 2013-07-23 12:31:34Z msweet $".
  */
diff --git a/scheduler/mime.h b/scheduler/mime.h
index 4842c837..51d7a29d 100644
--- a/scheduler/mime.h
+++ b/scheduler/mime.h
@@ -1,5 +1,5 @@
 /*
- * "$Id: mime.h 7694 2008-06-26 00:23:20Z mike $"
+ * "$Id: mime.h 11173 2013-07-23 12:31:34Z msweet $"
  *
  *   MIME type/conversion database definitions for CUPS.
  *
@@ -158,5 +158,5 @@ extern void		mimeSetErrorCallback(mime_t *mime, mime_error_cb_t cb,
 #endif /* !_CUPS_MIME_H_ */
 
 /*
- * End of "$Id: mime.h 7694 2008-06-26 00:23:20Z mike $".
+ * End of "$Id: mime.h 11173 2013-07-23 12:31:34Z msweet $".
  */
diff --git a/scheduler/network.c b/scheduler/network.c
index 87e660ce..07b52659 100644
--- a/scheduler/network.c
+++ b/scheduler/network.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: network.c 7861 2008-08-26 03:15:14Z mike $"
+ * "$Id: network.c 11173 2013-07-23 12:31:34Z msweet $"
  *
  *   Network interface functions for the CUPS scheduler.
  *
@@ -296,5 +296,5 @@ compare_netif(cupsd_netif_t *a,		/* I - First network interface */
 
 
 /*
- * End of "$Id: network.c 7861 2008-08-26 03:15:14Z mike $".
+ * End of "$Id: network.c 11173 2013-07-23 12:31:34Z msweet $".
  */
diff --git a/scheduler/network.h b/scheduler/network.h
index 95b6badc..05709757 100644
--- a/scheduler/network.h
+++ b/scheduler/network.h
@@ -1,5 +1,5 @@
 /*
- * "$Id: network.h 6649 2007-07-11 21:46:42Z mike $"
+ * "$Id: network.h 11173 2013-07-23 12:31:34Z msweet $"
  *
  *   Network interface definitions for the CUPS scheduler.
  *
@@ -48,5 +48,5 @@ extern void		cupsdNetIFUpdate(void);
 
 
 /*
- * End of "$Id: network.h 6649 2007-07-11 21:46:42Z mike $".
+ * End of "$Id: network.h 11173 2013-07-23 12:31:34Z msweet $".
  */
diff --git a/scheduler/policy.c b/scheduler/policy.c
index 1e6e45e2..75b59834 100644
--- a/scheduler/policy.c
+++ b/scheduler/policy.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: policy.c 7673 2008-06-18 22:31:26Z mike $"
+ * "$Id: policy.c 11173 2013-07-23 12:31:34Z msweet $"
  *
  *   Policy routines for the CUPS scheduler.
  *
@@ -513,5 +513,5 @@ hash_op(cupsd_location_t *op)		/* I - Operation */
 
 
 /*
- * End of "$Id: policy.c 7673 2008-06-18 22:31:26Z mike $".
+ * End of "$Id: policy.c 11173 2013-07-23 12:31:34Z msweet $".
  */
diff --git a/scheduler/policy.h b/scheduler/policy.h
index 897b011f..df17a11e 100644
--- a/scheduler/policy.h
+++ b/scheduler/policy.h
@@ -1,5 +1,5 @@
 /*
- * "$Id: policy.h 6895 2007-08-30 00:09:27Z mike $"
+ * "$Id: policy.h 11173 2013-07-23 12:31:34Z msweet $"
  *
  *   Policy definitions for the CUPS scheduler.
  *
@@ -59,5 +59,5 @@ extern cups_array_t	*cupsdGetPrivateAttrs(cupsd_policy_t *p,
 
 
 /*
- * End of "$Id: policy.h 6895 2007-08-30 00:09:27Z mike $".
+ * End of "$Id: policy.h 11173 2013-07-23 12:31:34Z msweet $".
  */
diff --git a/scheduler/printers.c b/scheduler/printers.c
index f581b32a..48c4a82d 100644
--- a/scheduler/printers.c
+++ b/scheduler/printers.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: printers.c 7968 2008-09-19 23:03:01Z mike $"
+ * "$Id: printers.c 11173 2013-07-23 12:31:34Z msweet $"
  *
  *   Printer routines for the CUPS scheduler.
  *
@@ -5317,5 +5317,5 @@ write_xml_string(cups_file_t *fp,	/* I - File to write to */
 
 
 /*
- * End of "$Id: printers.c 7968 2008-09-19 23:03:01Z mike $".
+ * End of "$Id: printers.c 11173 2013-07-23 12:31:34Z msweet $".
  */
diff --git a/scheduler/printers.h b/scheduler/printers.h
index 2242ddd1..ad89d706 100644
--- a/scheduler/printers.h
+++ b/scheduler/printers.h
@@ -1,5 +1,5 @@
 /*
- * "$Id: printers.h 7564 2008-05-15 00:57:43Z mike $"
+ * "$Id: printers.h 11173 2013-07-23 12:31:34Z msweet $"
  *
  *   Printer definitions for the CUPS scheduler.
  *
@@ -189,5 +189,5 @@ extern void		cupsdWritePrintcap(void);
 
 
 /*
- * End of "$Id: printers.h 7564 2008-05-15 00:57:43Z mike $".
+ * End of "$Id: printers.h 11173 2013-07-23 12:31:34Z msweet $".
  */
diff --git a/scheduler/process.c b/scheduler/process.c
index 17820641..a706ac22 100644
--- a/scheduler/process.c
+++ b/scheduler/process.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: process.c 7256 2008-01-25 00:48:54Z mike $"
+ * "$Id: process.c 11173 2013-07-23 12:31:34Z msweet $"
  *
  *   Process management routines for the CUPS scheduler.
  *
@@ -652,5 +652,5 @@ cupsd_requote(char       *dst,		/* I - Destination buffer */
 
 
 /*
- * End of "$Id: process.c 7256 2008-01-25 00:48:54Z mike $".
+ * End of "$Id: process.c 11173 2013-07-23 12:31:34Z msweet $".
  */
diff --git a/scheduler/quotas.c b/scheduler/quotas.c
index e41c1cc1..3ebfd8d4 100644
--- a/scheduler/quotas.c
+++ b/scheduler/quotas.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: quotas.c 6947 2007-09-12 21:09:49Z mike $"
+ * "$Id: quotas.c 11173 2013-07-23 12:31:34Z msweet $"
  *
  *   Quota routines for the CUPS scheduler.
  *
@@ -240,5 +240,5 @@ compare_quotas(const cupsd_quota_t *q1,	/* I - First quota record */
 
 
 /*
- * End of "$Id: quotas.c 6947 2007-09-12 21:09:49Z mike $".
+ * End of "$Id: quotas.c 11173 2013-07-23 12:31:34Z msweet $".
  */
diff --git a/scheduler/select.c b/scheduler/select.c
index 4510d7c2..e2f40d8d 100644
--- a/scheduler/select.c
+++ b/scheduler/select.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: select.c 7720 2008-07-11 22:46:21Z mike $"
+ * "$Id: select.c 11173 2013-07-23 12:31:34Z msweet $"
  *
  *   Select abstraction functions for the CUPS scheduler.
  *
@@ -947,5 +947,5 @@ find_fd(int fd)				/* I - File descriptor */
 
 
 /*
- * End of "$Id: select.c 7720 2008-07-11 22:46:21Z mike $".
+ * End of "$Id: select.c 11173 2013-07-23 12:31:34Z msweet $".
  */
diff --git a/scheduler/server.c b/scheduler/server.c
index a5a31c59..7e511c49 100644
--- a/scheduler/server.c
+++ b/scheduler/server.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: server.c 7927 2008-09-10 22:05:29Z mike $"
+ * "$Id: server.c 11173 2013-07-23 12:31:34Z msweet $"
  *
  *   Server start/stop routines for the CUPS scheduler.
  *
@@ -180,5 +180,5 @@ cupsdStopServer(void)
 
 
 /*
- * End of "$Id: server.c 7927 2008-09-10 22:05:29Z mike $".
+ * End of "$Id: server.c 11173 2013-07-23 12:31:34Z msweet $".
  */
diff --git a/scheduler/statbuf.c b/scheduler/statbuf.c
index e719aebd..7f991497 100644
--- a/scheduler/statbuf.c
+++ b/scheduler/statbuf.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: statbuf.c 7674 2008-06-18 23:18:32Z mike $"
+ * "$Id: statbuf.c 11173 2013-07-23 12:31:34Z msweet $"
  *
  *   Status buffer routines for the CUPS scheduler.
  *
@@ -326,5 +326,5 @@ cupsdStatBufUpdate(
 
 
 /*
- * End of "$Id: statbuf.c 7674 2008-06-18 23:18:32Z mike $".
+ * End of "$Id: statbuf.c 11173 2013-07-23 12:31:34Z msweet $".
  */
diff --git a/scheduler/statbuf.h b/scheduler/statbuf.h
index 1ca22721..91564d0e 100644
--- a/scheduler/statbuf.h
+++ b/scheduler/statbuf.h
@@ -1,5 +1,5 @@
 /*
- * "$Id: statbuf.h 7674 2008-06-18 23:18:32Z mike $"
+ * "$Id: statbuf.h 11173 2013-07-23 12:31:34Z msweet $"
  *
  *   Status buffer definitions for the CUPS scheduler.
  *
@@ -45,5 +45,5 @@ extern char		*cupsdStatBufUpdate(cupsd_statbuf_t *sb, int *loglevel,
 
 
 /*
- * End of "$Id: statbuf.h 7674 2008-06-18 23:18:32Z mike $".
+ * End of "$Id: statbuf.h 11173 2013-07-23 12:31:34Z msweet $".
  */
diff --git a/scheduler/subscriptions.c b/scheduler/subscriptions.c
index 15414fc1..0b9c4525 100644
--- a/scheduler/subscriptions.c
+++ b/scheduler/subscriptions.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: subscriptions.c 7824 2008-08-01 21:11:55Z mike $"
+ * "$Id: subscriptions.c 11173 2013-07-23 12:31:34Z msweet $"
  *
  *   Subscription routines for the CUPS scheduler.
  *
@@ -1638,5 +1638,5 @@ cupsd_update_notifier(void)
 
 
 /*
- * End of "$Id: subscriptions.c 7824 2008-08-01 21:11:55Z mike $".
+ * End of "$Id: subscriptions.c 11173 2013-07-23 12:31:34Z msweet $".
  */
diff --git a/scheduler/subscriptions.h b/scheduler/subscriptions.h
index 2a2714ec..1a786ae1 100644
--- a/scheduler/subscriptions.h
+++ b/scheduler/subscriptions.h
@@ -1,5 +1,5 @@
 /*
- * "$Id: subscriptions.h 7824 2008-08-01 21:11:55Z mike $"
+ * "$Id: subscriptions.h 11173 2013-07-23 12:31:34Z msweet $"
  *
  *   Subscription definitions for the CUPS scheduler.
  *
@@ -162,5 +162,5 @@ extern void	cupsdStopAllNotifiers(void);
 
 
 /*
- * End of "$Id: subscriptions.h 7824 2008-08-01 21:11:55Z mike $".
+ * End of "$Id: subscriptions.h 11173 2013-07-23 12:31:34Z msweet $".
  */
diff --git a/scheduler/sysman.c b/scheduler/sysman.c
index 945149f7..d5f82c15 100644
--- a/scheduler/sysman.c
+++ b/scheduler/sysman.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: sysman.c 7928 2008-09-10 22:14:22Z mike $"
+ * "$Id: sysman.c 11173 2013-07-23 12:31:34Z msweet $"
  *
  *   System management functions for the CUPS scheduler.
  *
@@ -1002,5 +1002,5 @@ sysUpdate(void)
 
 
 /*
- * End of "$Id: sysman.c 7928 2008-09-10 22:14:22Z mike $".
+ * End of "$Id: sysman.c 11173 2013-07-23 12:31:34Z msweet $".
  */
diff --git a/scheduler/sysman.h b/scheduler/sysman.h
index d1672bf3..d6031787 100644
--- a/scheduler/sysman.h
+++ b/scheduler/sysman.h
@@ -1,5 +1,5 @@
 /*
- * "$Id: sysman.h 7928 2008-09-10 22:14:22Z mike $"
+ * "$Id: sysman.h 11173 2013-07-23 12:31:34Z msweet $"
  *
  *   System management definitions for the CUPS scheduler.
  *
@@ -60,5 +60,5 @@ extern void	cupsdStopSystemMonitor(void);
 
 
 /*
- * End of "$Id: sysman.h 7928 2008-09-10 22:14:22Z mike $".
+ * End of "$Id: sysman.h 11173 2013-07-23 12:31:34Z msweet $".
  */
diff --git a/scheduler/testlpd.c b/scheduler/testlpd.c
index c534f593..3ff483e1 100644
--- a/scheduler/testlpd.c
+++ b/scheduler/testlpd.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: testlpd.c 6789 2007-08-13 19:52:43Z mike $"
+ * "$Id: testlpd.c 11173 2013-07-23 12:31:34Z msweet $"
  *
  *   cups-lpd test program for CUPS.
  *
@@ -546,5 +546,5 @@ usage(void)
 
 
 /*
- * End of "$Id: testlpd.c 6789 2007-08-13 19:52:43Z mike $".
+ * End of "$Id: testlpd.c 11173 2013-07-23 12:31:34Z msweet $".
  */
diff --git a/scheduler/testmime.c b/scheduler/testmime.c
index ad7914d2..5a71ea91 100644
--- a/scheduler/testmime.c
+++ b/scheduler/testmime.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: testmime.c 7670 2008-06-17 22:42:08Z mike $"
+ * "$Id: testmime.c 11173 2013-07-23 12:31:34Z msweet $"
  *
  *   MIME test program for CUPS.
  *
@@ -527,5 +527,5 @@ type_dir(mime_t     *mime,		/* I - MIME database */
 
 
 /*
- * End of "$Id: testmime.c 7670 2008-06-17 22:42:08Z mike $".
+ * End of "$Id: testmime.c 11173 2013-07-23 12:31:34Z msweet $".
  */
diff --git a/scheduler/testspeed.c b/scheduler/testspeed.c
index 4aeaf267..425f4712 100644
--- a/scheduler/testspeed.c
+++ b/scheduler/testspeed.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: testspeed.c 7727 2008-07-14 18:02:21Z mike $"
+ * "$Id: testspeed.c 11173 2013-07-23 12:31:34Z msweet $"
  *
  *   Scheduler speed test for CUPS.
  *
@@ -361,5 +361,5 @@ usage(void)
 
 
 /*
- * End of "$Id: testspeed.c 7727 2008-07-14 18:02:21Z mike $".
+ * End of "$Id: testspeed.c 11173 2013-07-23 12:31:34Z msweet $".
  */
diff --git a/scheduler/testsub.c b/scheduler/testsub.c
index 88294a35..66801af1 100644
--- a/scheduler/testsub.c
+++ b/scheduler/testsub.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: testsub.c 6649 2007-07-11 21:46:42Z mike $"
+ * "$Id: testsub.c 11173 2013-07-23 12:31:34Z msweet $"
  *
  *   Scheduler notification tester for CUPS.
  *
@@ -519,5 +519,5 @@ usage(void)
 
 
 /*
- * End of "$Id: testsub.c 6649 2007-07-11 21:46:42Z mike $".
+ * End of "$Id: testsub.c 11173 2013-07-23 12:31:34Z msweet $".
  */
diff --git a/scheduler/tls-darwin.c b/scheduler/tls-darwin.c
index 682362cf..bb6998bc 100644
--- a/scheduler/tls-darwin.c
+++ b/scheduler/tls-darwin.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: tls-darwin.c 3833 2012-05-23 22:51:18Z msweet $"
+ * "$Id: tls-darwin.c 11173 2013-07-23 12:31:34Z msweet $"
  *
  *   TLS support code for the CUPS scheduler on OS X.
  *
@@ -566,5 +566,5 @@ make_certificate(cupsd_client_t *con)	/* I - Client connection */
 
 
 /*
- * End of "$Id: tls-darwin.c 3833 2012-05-23 22:51:18Z msweet $".
+ * End of "$Id: tls-darwin.c 11173 2013-07-23 12:31:34Z msweet $".
  */
diff --git a/scheduler/tls-gnutls.c b/scheduler/tls-gnutls.c
index 5d129c88..c2d70329 100644
--- a/scheduler/tls-gnutls.c
+++ b/scheduler/tls-gnutls.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: tls-gnutls.c 3755 2012-03-30 05:59:14Z msweet $"
+ * "$Id: tls-gnutls.c 11173 2013-07-23 12:31:34Z msweet $"
  *
  *   TLS support code for the CUPS scheduler using GNU TLS.
  *
@@ -288,5 +288,5 @@ make_certificate(cupsd_client_t *con)	/* I - Client connection */
 
 
 /*
- * End of "$Id: tls-gnutls.c 3755 2012-03-30 05:59:14Z msweet $".
+ * End of "$Id: tls-gnutls.c 11173 2013-07-23 12:31:34Z msweet $".
  */
diff --git a/scheduler/tls-openssl.c b/scheduler/tls-openssl.c
index 19d3eefb..f123d284 100644
--- a/scheduler/tls-openssl.c
+++ b/scheduler/tls-openssl.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: tls-openssl.c 3755 2012-03-30 05:59:14Z msweet $"
+ * "$Id: tls-openssl.c 11173 2013-07-23 12:31:34Z msweet $"
  *
  *   TLS support code for the CUPS scheduler using OpenSSL.
  *
@@ -349,5 +349,5 @@ make_certificate(cupsd_client_t *con)	/* I - Client connection */
 
 
 /*
- * End of "$Id: tls-openssl.c 3755 2012-03-30 05:59:14Z msweet $".
+ * End of "$Id: tls-openssl.c 11173 2013-07-23 12:31:34Z msweet $".
  */
diff --git a/scheduler/tls.c b/scheduler/tls.c
index 41a107ab..bd18263d 100644
--- a/scheduler/tls.c
+++ b/scheduler/tls.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: tls.c 3755 2012-03-30 05:59:14Z msweet $"
+ * "$Id: tls.c 11173 2013-07-23 12:31:34Z msweet $"
  *
  *   TLS support code for the CUPS scheduler.
  *
@@ -26,5 +26,5 @@
 
 
 /*
- * End of "$Id: tls.c 3755 2012-03-30 05:59:14Z msweet $".
+ * End of "$Id: tls.c 11173 2013-07-23 12:31:34Z msweet $".
  */
diff --git a/scheduler/type.c b/scheduler/type.c
index 60c858a9..bf014be3 100644
--- a/scheduler/type.c
+++ b/scheduler/type.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: type.c 7720 2008-07-11 22:46:21Z mike $"
+ * "$Id: type.c 11173 2013-07-23 12:31:34Z msweet $"
  *
  *   MIME typing routines for CUPS.
  *
@@ -1212,5 +1212,5 @@ mime_patmatch(const char *s,		/* I - String to match against */
 
 
 /*
- * End of "$Id: type.c 7720 2008-07-11 22:46:21Z mike $".
+ * End of "$Id: type.c 11173 2013-07-23 12:31:34Z msweet $".
  */
diff --git a/scheduler/util.c b/scheduler/util.c
index fc55d579..74dd9ff1 100644
--- a/scheduler/util.c
+++ b/scheduler/util.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: util.c 7621 2008-06-06 18:55:35Z mike $"
+ * "$Id: util.c 11173 2013-07-23 12:31:34Z msweet $"
  *
  *   Mini-daemon utility functions for CUPS.
  *
@@ -467,5 +467,5 @@ cupsdSendIPPTrailer(void)
 
 
 /*
- * End of "$Id: util.c 7621 2008-06-06 18:55:35Z mike $".
+ * End of "$Id: util.c 11173 2013-07-23 12:31:34Z msweet $".
  */
diff --git a/scheduler/util.h b/scheduler/util.h
index c31c045d..cf5ae0de 100644
--- a/scheduler/util.h
+++ b/scheduler/util.h
@@ -1,5 +1,5 @@
 /*
- * "$Id: util.h 7711 2008-07-02 04:39:27Z mike $"
+ * "$Id: util.h 11173 2013-07-23 12:31:34Z msweet $"
  *
  *   Mini-daemon utility definitions for CUPS.
  *
@@ -67,5 +67,5 @@ extern void		cupsdSendIPPTrailer(void);
 #endif /* !_CUPSD_UTIL_H_ */
 
 /*
- * End of "$Id: util.h 7711 2008-07-02 04:39:27Z mike $".
+ * End of "$Id: util.h 11173 2013-07-23 12:31:34Z msweet $".
  */
diff --git a/systemv/Makefile b/systemv/Makefile
index 5fb794a9..c0342551 100644
--- a/systemv/Makefile
+++ b/systemv/Makefile
@@ -1,5 +1,5 @@
 #
-# "$Id: Makefile 7929 2008-09-10 22:23:59Z mike $"
+# "$Id: Makefile 11173 2013-07-23 12:31:34Z msweet $"
 #
 #   System V commands makefile for CUPS.
 #
@@ -289,5 +289,5 @@ include Dependencies
 
 
 #
-# End of "$Id: Makefile 7929 2008-09-10 22:23:59Z mike $".
+# End of "$Id: Makefile 11173 2013-07-23 12:31:34Z msweet $".
 #
diff --git a/systemv/cancel.c b/systemv/cancel.c
index b2881ca1..678903f0 100644
--- a/systemv/cancel.c
+++ b/systemv/cancel.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: cancel.c 7720 2008-07-11 22:46:21Z mike $"
+ * "$Id: cancel.c 11173 2013-07-23 12:31:34Z msweet $"
  *
  *   "cancel" command for CUPS.
  *
@@ -372,5 +372,5 @@ main(int  argc,				/* I - Number of command-line arguments */
 
 
 /*
- * End of "$Id: cancel.c 7720 2008-07-11 22:46:21Z mike $".
+ * End of "$Id: cancel.c 11173 2013-07-23 12:31:34Z msweet $".
  */
diff --git a/systemv/cupsaccept.c b/systemv/cupsaccept.c
index 67a682cc..0ba756c0 100644
--- a/systemv/cupsaccept.c
+++ b/systemv/cupsaccept.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: cupsaccept.c 2873 2010-11-30 03:16:24Z msweet $"
+ * "$Id: cupsaccept.c 11173 2013-07-23 12:31:34Z msweet $"
  *
  *   "cupsaccept", "cupsdisable", "cupsenable", and "cupsreject" commands for
  *   CUPS.
@@ -235,5 +235,5 @@ main(int  argc,				/* I - Number of command-line arguments */
 
 
 /*
- * End of "$Id: cupsaccept.c 2873 2010-11-30 03:16:24Z msweet $".
+ * End of "$Id: cupsaccept.c 11173 2013-07-23 12:31:34Z msweet $".
  */
diff --git a/systemv/cupsaddsmb.c b/systemv/cupsaddsmb.c
index 2ce91ccc..e1a82f7f 100644
--- a/systemv/cupsaddsmb.c
+++ b/systemv/cupsaddsmb.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: cupsaddsmb.c 7033 2007-10-19 02:11:28Z mike $"
+ * "$Id: cupsaddsmb.c 11173 2013-07-23 12:31:34Z msweet $"
  *
  *   "cupsaddsmb" command for CUPS.
  *
@@ -295,5 +295,5 @@ usage(void)
 
 
 /*
- * End of "$Id: cupsaddsmb.c 7033 2007-10-19 02:11:28Z mike $".
+ * End of "$Id: cupsaddsmb.c 11173 2013-07-23 12:31:34Z msweet $".
  */
diff --git a/systemv/cupsctl.c b/systemv/cupsctl.c
index 0cd2a59d..4c5a9f17 100644
--- a/systemv/cupsctl.c
+++ b/systemv/cupsctl.c
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: cupsctl.c 11173 2013-07-23 12:31:34Z msweet $"
  *
  *   Scheduler control program for CUPS.
  *
@@ -223,5 +223,5 @@ usage(const char *opt)			/* I - Option character/string */
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: cupsctl.c 11173 2013-07-23 12:31:34Z msweet $".
  */
diff --git a/systemv/cupstestdsc.c b/systemv/cupstestdsc.c
index 5ec01aee..96ff9a39 100644
--- a/systemv/cupstestdsc.c
+++ b/systemv/cupstestdsc.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: cupstestdsc.c 7720 2008-07-11 22:46:21Z mike $"
+ * "$Id: cupstestdsc.c 11173 2013-07-23 12:31:34Z msweet $"
  *
  *   DSC test program for CUPS.
  *
@@ -438,5 +438,5 @@ usage(void)
 
 
 /*
- * End of "$Id: cupstestdsc.c 7720 2008-07-11 22:46:21Z mike $".
+ * End of "$Id: cupstestdsc.c 11173 2013-07-23 12:31:34Z msweet $".
  */
diff --git a/systemv/cupstestppd.c b/systemv/cupstestppd.c
index a5c8622c..dfa53005 100644
--- a/systemv/cupstestppd.c
+++ b/systemv/cupstestppd.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: cupstestppd.c 7807 2008-07-28 21:54:24Z mike $"
+ * "$Id: cupstestppd.c 11173 2013-07-23 12:31:34Z msweet $"
  *
  *   PPD test program for CUPS.
  *
@@ -3972,5 +3972,5 @@ valid_utf8(const char *s)		/* I - String to check */
 
 
 /*
- * End of "$Id: cupstestppd.c 7807 2008-07-28 21:54:24Z mike $".
+ * End of "$Id: cupstestppd.c 11173 2013-07-23 12:31:34Z msweet $".
  */
diff --git a/systemv/lp.c b/systemv/lp.c
index 1f3b1ccc..830ff043 100644
--- a/systemv/lp.c
+++ b/systemv/lp.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: lp.c 7170 2008-01-04 02:21:30Z mike $"
+ * "$Id: lp.c 11173 2013-07-23 12:31:34Z msweet $"
  *
  *   "lp" command for CUPS.
  *
@@ -764,5 +764,5 @@ set_job_attrs(const char    *command,	/* I - Command name */
 
 
 /*
- * End of "$Id: lp.c 7170 2008-01-04 02:21:30Z mike $".
+ * End of "$Id: lp.c 11173 2013-07-23 12:31:34Z msweet $".
  */
diff --git a/systemv/lpadmin.c b/systemv/lpadmin.c
index 5fe0b9bb..25ec6426 100644
--- a/systemv/lpadmin.c
+++ b/systemv/lpadmin.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: lpadmin.c 7720 2008-07-11 22:46:21Z mike $"
+ * "$Id: lpadmin.c 11173 2013-07-23 12:31:34Z msweet $"
  *
  *   "lpadmin" command for CUPS.
  *
@@ -1514,5 +1514,5 @@ validate_name(const char *name)		/* I - Name to check */
 
 
 /*
- * End of "$Id: lpadmin.c 7720 2008-07-11 22:46:21Z mike $".
+ * End of "$Id: lpadmin.c 11173 2013-07-23 12:31:34Z msweet $".
  */
diff --git a/systemv/lpinfo.c b/systemv/lpinfo.c
index f51019b7..1043548a 100644
--- a/systemv/lpinfo.c
+++ b/systemv/lpinfo.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: lpinfo.c 7810 2008-07-29 01:11:15Z mike $"
+ * "$Id: lpinfo.c 11173 2013-07-23 12:31:34Z msweet $"
  *
  *   "lpinfo" command for CUPS.
  *
@@ -494,5 +494,5 @@ show_models(
 
 
 /*
- * End of "$Id: lpinfo.c 7810 2008-07-29 01:11:15Z mike $".
+ * End of "$Id: lpinfo.c 11173 2013-07-23 12:31:34Z msweet $".
  */
diff --git a/systemv/lpmove.c b/systemv/lpmove.c
index d7c2dfb6..d9adfd8f 100644
--- a/systemv/lpmove.c
+++ b/systemv/lpmove.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: lpmove.c 7219 2008-01-14 22:00:02Z mike $"
+ * "$Id: lpmove.c 11173 2013-07-23 12:31:34Z msweet $"
  *
  *   "lpmove" command for CUPS.
  *
@@ -209,5 +209,5 @@ move_job(http_t     *http,		/* I - HTTP connection to server */
 
 
 /*
- * End of "$Id: lpmove.c 7219 2008-01-14 22:00:02Z mike $".
+ * End of "$Id: lpmove.c 11173 2013-07-23 12:31:34Z msweet $".
  */
diff --git a/systemv/lpoptions.c b/systemv/lpoptions.c
index 06a1762c..31a367c0 100644
--- a/systemv/lpoptions.c
+++ b/systemv/lpoptions.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: lpoptions.c 7720 2008-07-11 22:46:21Z mike $"
+ * "$Id: lpoptions.c 11173 2013-07-23 12:31:34Z msweet $"
  *
  *   Printer option program for CUPS.
  *
@@ -561,5 +561,5 @@ usage(void)
 
 
 /*
- * End of "$Id: lpoptions.c 7720 2008-07-11 22:46:21Z mike $".
+ * End of "$Id: lpoptions.c 11173 2013-07-23 12:31:34Z msweet $".
  */
diff --git a/systemv/lppasswd.c b/systemv/lppasswd.c
index b9962ecf..9e559b44 100644
--- a/systemv/lppasswd.c
+++ b/systemv/lppasswd.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: lppasswd.c 6649 2007-07-11 21:46:42Z mike $"
+ * "$Id: lppasswd.c 11173 2013-07-23 12:31:34Z msweet $"
  *
  *   MD5 password program for CUPS.
  *
@@ -485,5 +485,5 @@ usage(FILE *fp)		/* I - File to send usage to */
 
 
 /*
- * End of "$Id: lppasswd.c 6649 2007-07-11 21:46:42Z mike $".
+ * End of "$Id: lppasswd.c 11173 2013-07-23 12:31:34Z msweet $".
  */
diff --git a/systemv/lpstat.c b/systemv/lpstat.c
index 7edc778d..acb88b6e 100644
--- a/systemv/lpstat.c
+++ b/systemv/lpstat.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: lpstat.c 7921 2008-09-10 15:42:24Z mike $"
+ * "$Id: lpstat.c 11173 2013-07-23 12:31:34Z msweet $"
  *
  *   "lpstat" command for CUPS.
  *
@@ -2161,5 +2161,5 @@ show_scheduler(void)
 
 
 /*
- * End of "$Id: lpstat.c 7921 2008-09-10 15:42:24Z mike $".
+ * End of "$Id: lpstat.c 11173 2013-07-23 12:31:34Z msweet $".
  */
diff --git a/templates/Makefile b/templates/Makefile
index 9f32260a..678bdddd 100644
--- a/templates/Makefile
+++ b/templates/Makefile
@@ -1,5 +1,5 @@
 #
-# "$Id: Makefile 7940 2008-09-16 00:45:16Z mike $"
+# "$Id: Makefile 11173 2013-07-23 12:31:34Z msweet $"
 #
 #   Template makefile for CUPS.
 #
@@ -200,5 +200,5 @@ uninstall-langbundle:
 
 
 #
-# End of "$Id: Makefile 7940 2008-09-16 00:45:16Z mike $".
+# End of "$Id: Makefile 11173 2013-07-23 12:31:34Z msweet $".
 #
diff --git a/test/Makefile b/test/Makefile
index ad85720c..4974b7ce 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -1,5 +1,5 @@
 #
-# "$Id: Makefile 7871 2008-08-27 21:12:43Z mike $"
+# "$Id: Makefile 11173 2013-07-23 12:31:34Z msweet $"
 #
 #   IPP test makefile for CUPS.
 #
@@ -214,5 +214,5 @@ include Dependencies
 
 
 #
-# End of "$Id: Makefile 7871 2008-08-27 21:12:43Z mike $".
+# End of "$Id: Makefile 11173 2013-07-23 12:31:34Z msweet $".
 #
diff --git a/test/ippserver.c b/test/ippserver.c
index 3f471b0c..32bcf447 100644
--- a/test/ippserver.c
+++ b/test/ippserver.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: ippserver.c 4185 2013-02-20 02:19:13Z msweet $"
+ * "$Id: ippserver.c 11173 2013-07-23 12:31:34Z msweet $"
  *
  *   Sample IPP/2.0 server for CUPS.
  *
@@ -5252,5 +5252,5 @@ valid_job_attributes(
 
 
 /*
- * End of "$Id: ippserver.c 4185 2013-02-20 02:19:13Z msweet $".
+ * End of "$Id: ippserver.c 11173 2013-07-23 12:31:34Z msweet $".
  */
diff --git a/test/ipptool.c b/test/ipptool.c
index 509b8282..afa60ef3 100644
--- a/test/ipptool.c
+++ b/test/ipptool.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: ipptool.c 4185 2013-02-20 02:19:13Z msweet $"
+ * "$Id: ipptool.c 11173 2013-07-23 12:31:34Z msweet $"
  *
  *   ipptool command for CUPS.
  *
@@ -5477,5 +5477,5 @@ with_value(cups_array_t    *errors,	/* I - Errors array */
 
 
 /*
- * End of "$Id: ipptool.c 4185 2013-02-20 02:19:13Z msweet $".
+ * End of "$Id: ipptool.c 11173 2013-07-23 12:31:34Z msweet $".
  */
diff --git a/test/xmltotest.c b/test/xmltotest.c
index 143f2416..fdb9f933 100644
--- a/test/xmltotest.c
+++ b/test/xmltotest.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: xmltotest.c 3643 2012-02-13 16:35:48Z msweet $"
+ * "$Id: xmltotest.c 11173 2013-07-23 12:31:34Z msweet $"
  *
  *   IANA XML registration to test file generator for CUPS.
  *
@@ -525,5 +525,5 @@ main(void)
 
 
 /*
- * End of "$Id: xmltotest.c 3643 2012-02-13 16:35:48Z msweet $".
+ * End of "$Id: xmltotest.c 11173 2013-07-23 12:31:34Z msweet $".
  */
diff --git a/vcnet/config.h b/vcnet/config.h
index 6120140a..82c039ff 100644
--- a/vcnet/config.h
+++ b/vcnet/config.h
@@ -1,5 +1,5 @@
 /*
- * "$Id: config.h 6649 2007-07-11 21:46:42Z mike $"
+ * "$Id: config.h 11173 2013-07-23 12:31:34Z msweet $"
  *
  *   Configuration file for CUPS on Windows.
  *
@@ -784,5 +784,5 @@
 #endif /* !_CUPS_CONFIG_H_ */
 
 /*
- * End of "$Id: config.h 6649 2007-07-11 21:46:42Z mike $".
+ * End of "$Id: config.h 11173 2013-07-23 12:31:34Z msweet $".
  */
diff --git a/xcode/config.h b/xcode/config.h
index a6b30522..6b010a95 100644
--- a/xcode/config.h
+++ b/xcode/config.h
@@ -1,6 +1,6 @@
 /* config.h.  Generated from config.h.in by configure.  */
 /*
- * "$Id: config.h 4298 2013-05-10 16:52:10Z msweet $"
+ * "$Id: config.h 11173 2013-07-23 12:31:34Z msweet $"
  *
  *   Configuration file for CUPS.
  *
@@ -739,5 +739,5 @@ static __inline int _cups_abs(int i) { return (i < 0 ? -i : i); }
 #endif /* !_CUPS_CONFIG_H_ */
 
 /*
- * End of "$Id: config.h 4298 2013-05-10 16:52:10Z msweet $".
+ * End of "$Id: config.h 11173 2013-07-23 12:31:34Z msweet $".
  */
author	Didier Raboud <odyx@debian.org>	2013-09-27 11:05:02 +0200
committer	Didier Raboud <odyx@debian.org>	2013-09-27 11:05:02 +0200
commit	e89cd45b5c13f176689eb571884719236b4baa89 (patch)
tree	895f25ab9018c6f343a261f0c1e5e3ae0bdd9362
parent	3bbeb8a0d4f608995924ae6360556d4b589bdf4c (diff)
download	cups-upstream/1.6.4.tar.gz