Merge sendmail 8.14.9 to HEAD

MFC after:	3 days

61 files changed, 74 insertions, 74 deletions

diff --git a/contrib/sendmail/src/Makefile b/contrib/sendmail/src/Makefile
index a5633c7..2326faf1 100644
--- a/contrib/sendmail/src/Makefile
+++ b/contrib/sendmail/src/Makefile
@@ -1,4 +1,4 @@
-#       $Id: Makefile,v 8.12 2006/08/29 22:00:11 ca Exp $
+#       $Id: Makefile,v 8.12 2006-08-29 22:00:11 ca Exp $
 
 SHELL= /bin/sh
 BUILD=   ./Build
diff --git a/contrib/sendmail/src/Makefile.m4 b/contrib/sendmail/src/Makefile.m4
index dd04b2b..a666aa2 100644
--- a/contrib/sendmail/src/Makefile.m4
+++ b/contrib/sendmail/src/Makefile.m4
@@ -1,4 +1,4 @@
-dnl $Id: Makefile.m4,v 8.143 2013/09/04 19:49:04 ca Exp $
+dnl $Id: Makefile.m4,v 8.143 2013-09-04 19:49:04 ca Exp $
 include(confBUILDTOOLSDIR`/M4/switch.m4')
 
 define(`confREQUIRE_LIBSM', `true')
diff --git a/contrib/sendmail/src/README b/contrib/sendmail/src/README
index 18bffcb..c437b1e 100644
--- a/contrib/sendmail/src/README
+++ b/contrib/sendmail/src/README
@@ -9,7 +9,7 @@
 # the sendmail distribution.
 #
 #
-#	$Id: README,v 8.393 2013/11/22 20:51:54 ca Exp $
+#	$Id: README,v 8.393 2013-11-22 20:51:54 ca Exp $
 #
 
 This directory contains the source files for sendmail(TM).
@@ -1848,4 +1848,4 @@ util.c		Some general purpose routines used by sendmail.
 version.c	The version number and information about this
 		version of sendmail.
 
-(Version $Revision: 8.393 $, last update $Date: 2013/11/22 20:51:54 $ )
+(Version $Revision: 8.393 $, last update $Date: 2013-11-22 20:51:54 $ )
diff --git a/contrib/sendmail/src/SECURITY b/contrib/sendmail/src/SECURITY
index 9f3cf58..0e38835 100644
--- a/contrib/sendmail/src/SECURITY
+++ b/contrib/sendmail/src/SECURITY
@@ -5,7 +5,7 @@
 # forth in the LICENSE file which can be found at the top level of
 # the sendmail distribution.
 #
-#	$Id: SECURITY,v 1.52 2013/11/22 20:51:54 ca Exp $
+#	$Id: SECURITY,v 1.52 2013-11-22 20:51:54 ca Exp $
 #
 
 This file gives some hints how to configure and run sendmail for
diff --git a/contrib/sendmail/src/TRACEFLAGS b/contrib/sendmail/src/TRACEFLAGS
index 0ebe8b2..e73ed10 100644
--- a/contrib/sendmail/src/TRACEFLAGS
+++ b/contrib/sendmail/src/TRACEFLAGS
@@ -1,4 +1,4 @@
-#	$Id: TRACEFLAGS,v 8.53 2013/11/27 01:27:03 gshapiro Exp $
+#	$Id: TRACEFLAGS,v 8.53 2013-11-27 01:27:03 gshapiro Exp $
 0, 4	main.c		main	canonical name, UUCP node name, a.k.a.s
 0, 15	main.c		main	print configuration
 0, 44	util.c		printav	print address of each string
diff --git a/contrib/sendmail/src/TUNING b/contrib/sendmail/src/TUNING
index c42f321..77c3f64 100644
--- a/contrib/sendmail/src/TUNING
+++ b/contrib/sendmail/src/TUNING
@@ -5,7 +5,7 @@
 # forth in the LICENSE file which can be found at the top level of
 # the sendmail distribution.
 #
-#	$Id: TUNING,v 1.22 2013/11/22 20:51:54 ca Exp $
+#	$Id: TUNING,v 1.22 2013-11-22 20:51:54 ca Exp $
 #
 
 ********************************************
diff --git a/contrib/sendmail/src/alias.c b/contrib/sendmail/src/alias.c
index c1b85cf..c31d8d0 100644
--- a/contrib/sendmail/src/alias.c
+++ b/contrib/sendmail/src/alias.c
@@ -13,7 +13,7 @@
 
 #include <sendmail.h>
 
-SM_RCSID("@(#)$Id: alias.c,v 8.221 2013/11/22 20:51:54 ca Exp $")
+SM_RCSID("@(#)$Id: alias.c,v 8.221 2013-11-22 20:51:54 ca Exp $")
 
 #define SEPARATOR ':'
 # define ALIAS_SPEC_SEPARATORS	" ,/:"
diff --git a/contrib/sendmail/src/aliases b/contrib/sendmail/src/aliases
index 2d06ae3..38540d5 100644
--- a/contrib/sendmail/src/aliases
+++ b/contrib/sendmail/src/aliases
@@ -1,5 +1,5 @@
 #
-#	$Id: aliases,v 8.5 2002/06/05 22:54:26 gshapiro Exp $
+#	$Id: aliases,v 8.5 2002-06-05 22:54:26 gshapiro Exp $
 #	@(#)aliases	8.2 (Berkeley) 3/5/94
 #
 #  Aliases in this file will NOT be expanded in the header from
diff --git a/contrib/sendmail/src/aliases.5 b/contrib/sendmail/src/aliases.5
index 6715b51..f09b49c 100644
--- a/contrib/sendmail/src/aliases.5
+++ b/contrib/sendmail/src/aliases.5
@@ -9,9 +9,9 @@
 .\" the sendmail distribution.
 .\"
 .\"
-.\"     $Id: aliases.5,v 8.20 2013/11/22 20:51:55 ca Exp $
+.\"     $Id: aliases.5,v 8.20 2013-11-22 20:51:55 ca Exp $
 .\"
-.TH ALIASES 5 "$Date: 2013/11/22 20:51:55 $"
+.TH ALIASES 5 "$Date: 2013-11-22 20:51:55 $"
 .SH NAME
 aliases
 \- aliases file for sendmail
diff --git a/contrib/sendmail/src/arpadate.c b/contrib/sendmail/src/arpadate.c
index e3e771a..57d5a06 100644
--- a/contrib/sendmail/src/arpadate.c
+++ b/contrib/sendmail/src/arpadate.c
@@ -13,7 +13,7 @@
 
 #include <sendmail.h>
 
-SM_RCSID("@(#)$Id: arpadate.c,v 8.32 2013/11/22 20:51:55 ca Exp $")
+SM_RCSID("@(#)$Id: arpadate.c,v 8.32 2013-11-22 20:51:55 ca Exp $")
 
 /*
 **  ARPADATE -- Create date in ARPANET format
diff --git a/contrib/sendmail/src/bf.c b/contrib/sendmail/src/bf.c
index e4725b7..7d90856 100644
--- a/contrib/sendmail/src/bf.c
+++ b/contrib/sendmail/src/bf.c
@@ -18,7 +18,7 @@
 */
 
 #include <sm/gen.h>
-SM_RCSID("@(#)$Id: bf.c,v 8.63 2013/11/22 20:51:55 ca Exp $")
+SM_RCSID("@(#)$Id: bf.c,v 8.63 2013-11-22 20:51:55 ca Exp $")
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/contrib/sendmail/src/bf.h b/contrib/sendmail/src/bf.h
index eb0101f..c49736d 100644
--- a/contrib/sendmail/src/bf.h
+++ b/contrib/sendmail/src/bf.h
@@ -6,7 +6,7 @@
  * forth in the LICENSE file which can be found at the top level of
  * the sendmail distribution.
  *
- *	$Id: bf.h,v 8.17 2013/11/22 20:51:55 ca Exp $
+ *	$Id: bf.h,v 8.17 2013-11-22 20:51:55 ca Exp $
  *
  * Contributed by Exactis.com, Inc.
  *
diff --git a/contrib/sendmail/src/collect.c b/contrib/sendmail/src/collect.c
index 8af4d4e..8d90acb 100644
--- a/contrib/sendmail/src/collect.c
+++ b/contrib/sendmail/src/collect.c
@@ -13,7 +13,7 @@
 
 #include <sendmail.h>
 
-SM_RCSID("@(#)$Id: collect.c,v 8.287 2013/11/22 20:51:55 ca Exp $")
+SM_RCSID("@(#)$Id: collect.c,v 8.287 2013-11-22 20:51:55 ca Exp $")
 
 static void	eatfrom __P((char *volatile, ENVELOPE *));
 static void	collect_doheader __P((ENVELOPE *));
diff --git a/contrib/sendmail/src/conf.c b/contrib/sendmail/src/conf.c
index 7c0ea39..b64f3c7 100644
--- a/contrib/sendmail/src/conf.c
+++ b/contrib/sendmail/src/conf.c
@@ -13,7 +13,7 @@
 
 #include <sendmail.h>
 
-SM_RCSID("@(#)$Id: conf.c,v 8.1191 2014/01/08 17:03:14 ca Exp $")
+SM_RCSID("@(#)$Id: conf.c,v 8.1191 2014-01-08 17:03:14 ca Exp $")
 
 #include <sm/sendmail.h>
 #include <sendmail/pathnames.h>
@@ -5309,8 +5309,8 @@ closefd_walk(lowest, fd)
 */
 
 void
-sm_close_on_exec(highest, lowest)
-	int highest, lowest;
+sm_close_on_exec(lowest, highest)
+	int lowest, highest;
 {
 #if HASFDWALK
 	(void) fdwalk(closefd_walk, &lowest);
@@ -6540,8 +6540,8 @@ char	*FFRCompileOptions[] =
 	/*
 	**  See libsm/mbdb.c: only enable this on OSs
 	**  that implement the correct (POSIX) semantics.
-	**  This will need to become an OS-specific #if
-	**  enabled in include/sm/os/*.h.
+	**  This will need to become an OS-specific #if enabled
+	**  in one of the headers files under include/sm/os/ .
 	*/
 
 	"_FFR_USE_GETPWNAM_ERRNO",
diff --git a/contrib/sendmail/src/conf.h b/contrib/sendmail/src/conf.h
index d9162de..54b1d09 100644
--- a/contrib/sendmail/src/conf.h
+++ b/contrib/sendmail/src/conf.h
@@ -10,7 +10,7 @@
  * the sendmail distribution.
  *
  *
- *	$Id: conf.h,v 8.577 2013/11/22 20:51:55 ca Exp $
+ *	$Id: conf.h,v 8.577 2013-11-22 20:51:55 ca Exp $
  */
 
 /*
diff --git a/contrib/sendmail/src/control.c b/contrib/sendmail/src/control.c
index 25ad91c..2541973 100644
--- a/contrib/sendmail/src/control.c
+++ b/contrib/sendmail/src/control.c
@@ -10,7 +10,7 @@
 
 #include <sendmail.h>
 
-SM_RCSID("@(#)$Id: control.c,v 8.130 2013/11/22 20:51:55 ca Exp $")
+SM_RCSID("@(#)$Id: control.c,v 8.130 2013-11-22 20:51:55 ca Exp $")
 
 #include <sm/fdset.h>
 
diff --git a/contrib/sendmail/src/convtime.c b/contrib/sendmail/src/convtime.c
index e1b9535..4d51d97 100644
--- a/contrib/sendmail/src/convtime.c
+++ b/contrib/sendmail/src/convtime.c
@@ -13,7 +13,7 @@
 
 #include <sendmail.h>
 
-SM_RCSID("@(#)$Id: convtime.c,v 8.40 2013/11/22 20:51:55 ca Exp $")
+SM_RCSID("@(#)$Id: convtime.c,v 8.40 2013-11-22 20:51:55 ca Exp $")
 
 /*
 **  CONVTIME -- convert time
diff --git a/contrib/sendmail/src/daemon.c b/contrib/sendmail/src/daemon.c
index e052101..d6b3f49 100644
--- a/contrib/sendmail/src/daemon.c
+++ b/contrib/sendmail/src/daemon.c
@@ -14,7 +14,7 @@
 #include <sendmail.h>
 #include "map.h"
 
-SM_RCSID("@(#)$Id: daemon.c,v 8.698 2013/11/22 20:51:55 ca Exp $")
+SM_RCSID("@(#)$Id: daemon.c,v 8.698 2013-11-22 20:51:55 ca Exp $")
 
 #if defined(SOCK_STREAM) || defined(__GNU_LIBRARY__)
 # define USE_SOCK_STREAM	1
diff --git a/contrib/sendmail/src/daemon.h b/contrib/sendmail/src/daemon.h
index d786580..649b4d5 100644
--- a/contrib/sendmail/src/daemon.h
+++ b/contrib/sendmail/src/daemon.h
@@ -6,7 +6,7 @@
  * forth in the LICENSE file which can be found at the top level of
  * the sendmail distribution.
  *
- *	$Id: daemon.h,v 8.4 2013/11/22 20:51:55 ca Exp $
+ *	$Id: daemon.h,v 8.4 2013-11-22 20:51:55 ca Exp $
  */
 
 #ifndef DAEMON_H
diff --git a/contrib/sendmail/src/deliver.c b/contrib/sendmail/src/deliver.c
index 987781c..39c484c 100644
--- a/contrib/sendmail/src/deliver.c
+++ b/contrib/sendmail/src/deliver.c
@@ -14,7 +14,7 @@
 #include <sendmail.h>
 #include <sm/time.h>
 
-SM_RCSID("@(#)$Id: deliver.c,v 8.1030 2013/11/22 20:51:55 ca Exp $")
+SM_RCSID("@(#)$Id: deliver.c,v 8.1030 2013-11-22 20:51:55 ca Exp $")
 
 #if HASSETUSERCONTEXT
 # include <login_cap.h>
diff --git a/contrib/sendmail/src/domain.c b/contrib/sendmail/src/domain.c
index fbd5c44..4d1b92d 100644
--- a/contrib/sendmail/src/domain.c
+++ b/contrib/sendmail/src/domain.c
@@ -15,9 +15,9 @@
 #include "map.h"
 
 #if NAMED_BIND
-SM_RCSID("@(#)$Id: domain.c,v 8.205 2013/11/22 20:51:55 ca Exp $ (with name server)")
+SM_RCSID("@(#)$Id: domain.c,v 8.205 2013-11-22 20:51:55 ca Exp $ (with name server)")
 #else /* NAMED_BIND */
-SM_RCSID("@(#)$Id: domain.c,v 8.205 2013/11/22 20:51:55 ca Exp $ (without name server)")
+SM_RCSID("@(#)$Id: domain.c,v 8.205 2013-11-22 20:51:55 ca Exp $ (without name server)")
 #endif /* NAMED_BIND */
 
 #if NAMED_BIND
diff --git a/contrib/sendmail/src/envelope.c b/contrib/sendmail/src/envelope.c
index 2497289..df6c5c7 100644
--- a/contrib/sendmail/src/envelope.c
+++ b/contrib/sendmail/src/envelope.c
@@ -13,7 +13,7 @@
 
 #include <sendmail.h>
 
-SM_RCSID("@(#)$Id: envelope.c,v 8.313 2013/11/22 20:51:55 ca Exp $")
+SM_RCSID("@(#)$Id: envelope.c,v 8.313 2013-11-22 20:51:55 ca Exp $")
 
 /*
 **  CLRSESSENVELOPE -- clear session oriented data in an envelope
diff --git a/contrib/sendmail/src/err.c b/contrib/sendmail/src/err.c
index 357222d..835fa4b 100644
--- a/contrib/sendmail/src/err.c
+++ b/contrib/sendmail/src/err.c
@@ -13,7 +13,7 @@
 
 #include <sendmail.h>
 
-SM_RCSID("@(#)$Id: err.c,v 8.206 2013/11/22 20:51:55 ca Exp $")
+SM_RCSID("@(#)$Id: err.c,v 8.206 2013-11-22 20:51:55 ca Exp $")
 
 #if LDAPMAP
 # include <lber.h>
diff --git a/contrib/sendmail/src/headers.c b/contrib/sendmail/src/headers.c
index 7b390a8..3c59a40 100644
--- a/contrib/sendmail/src/headers.c
+++ b/contrib/sendmail/src/headers.c
@@ -14,7 +14,7 @@
 #include <sendmail.h>
 #include <sm/sendmail.h>
 
-SM_RCSID("@(#)$Id: headers.c,v 8.320 2013/11/22 20:51:55 ca Exp $")
+SM_RCSID("@(#)$Id: headers.c,v 8.320 2013-11-22 20:51:55 ca Exp $")
 
 static HDR	*allocheader __P((char *, char *, int, SM_RPOOL_T *, bool));
 static size_t	fix_mime_header __P((HDR *, ENVELOPE *));
diff --git a/contrib/sendmail/src/helpfile b/contrib/sendmail/src/helpfile
index 0ce4c87..9529b28 100644
--- a/contrib/sendmail/src/helpfile
+++ b/contrib/sendmail/src/helpfile
@@ -11,7 +11,7 @@ cpyr	By using this file, you agree to the terms and conditions set
 cpyr	forth in the LICENSE file which can be found at the top level of
 cpyr	the sendmail distribution.
 cpyr
-cpyr	$$Id: helpfile,v 8.49 2013/11/22 20:51:55 ca Exp $$
+cpyr	$$Id: helpfile,v 8.49 2013-11-22 20:51:55 ca Exp $$
 cpyr
 smtp	This is sendmail version $v
 smtp	Topics:
diff --git a/contrib/sendmail/src/macro.c b/contrib/sendmail/src/macro.c
index d18d5c7..cb7daf8 100644
--- a/contrib/sendmail/src/macro.c
+++ b/contrib/sendmail/src/macro.c
@@ -13,7 +13,7 @@
 
 #include <sendmail.h>
 
-SM_RCSID("@(#)$Id: macro.c,v 8.108 2013/11/22 20:51:55 ca Exp $")
+SM_RCSID("@(#)$Id: macro.c,v 8.108 2013-11-22 20:51:55 ca Exp $")
 
 #include <sm/sendmail.h>
 #if MAXMACROID != (BITMAPBITS - 1)
diff --git a/contrib/sendmail/src/mailq.1 b/contrib/sendmail/src/mailq.1
index ec0cb21..0a12d37 100644
--- a/contrib/sendmail/src/mailq.1
+++ b/contrib/sendmail/src/mailq.1
@@ -9,9 +9,9 @@
 .\" the sendmail distribution.
 .\"
 .\"
-.\"     $Id: mailq.1,v 8.22 2013/11/22 20:51:55 ca Exp $
+.\"     $Id: mailq.1,v 8.22 2013-11-22 20:51:55 ca Exp $
 .\"
-.TH MAILQ 1 "$Date: 2013/11/22 20:51:55 $"
+.TH MAILQ 1 "$Date: 2013-11-22 20:51:55 $"
 .SH NAME
 mailq
 \- print the mail queue
diff --git a/contrib/sendmail/src/main.c b/contrib/sendmail/src/main.c
index a5eb50b..511eb02 100644
--- a/contrib/sendmail/src/main.c
+++ b/contrib/sendmail/src/main.c
@@ -26,7 +26,7 @@ SM_UNUSED(static char copyright[]) =
 	The Regents of the University of California.  All rights reserved.\n";
 #endif /* ! lint */
 
-SM_RCSID("@(#)$Id: main.c,v 8.988 2013/11/23 02:52:37 gshapiro Exp $")
+SM_RCSID("@(#)$Id: main.c,v 8.988 2013-11-23 02:52:37 gshapiro Exp $")
 
 
 #if NETINET || NETINET6
diff --git a/contrib/sendmail/src/map.c b/contrib/sendmail/src/map.c
index 24ed1f1..b79f591 100644
--- a/contrib/sendmail/src/map.c
+++ b/contrib/sendmail/src/map.c
@@ -13,7 +13,7 @@
 
 #include <sendmail.h>
 
-SM_RCSID("@(#)$Id: map.c,v 8.713 2013/11/22 20:51:55 ca Exp $")
+SM_RCSID("@(#)$Id: map.c,v 8.713 2013-11-22 20:51:55 ca Exp $")
 
 #if LDAPMAP
 # include <sm/ldap.h>
diff --git a/contrib/sendmail/src/map.h b/contrib/sendmail/src/map.h
index f4198c0..f20cf64 100644
--- a/contrib/sendmail/src/map.h
+++ b/contrib/sendmail/src/map.h
@@ -6,7 +6,7 @@
  * forth in the LICENSE file which can be found at the top level of
  * the sendmail distribution.
  *
- *	$Id: map.h,v 8.4 2013/11/22 20:51:56 ca Exp $
+ *	$Id: map.h,v 8.4 2013-11-22 20:51:56 ca Exp $
  */
 
 #ifndef _MAP_H
diff --git a/contrib/sendmail/src/mci.c b/contrib/sendmail/src/mci.c
index 860dce8..773eb16 100644
--- a/contrib/sendmail/src/mci.c
+++ b/contrib/sendmail/src/mci.c
@@ -13,7 +13,7 @@
 
 #include <sendmail.h>
 
-SM_RCSID("@(#)$Id: mci.c,v 8.225 2013/11/22 20:51:56 ca Exp $")
+SM_RCSID("@(#)$Id: mci.c,v 8.225 2013-11-22 20:51:56 ca Exp $")
 
 #if NETINET || NETINET6
 # include <arpa/inet.h>
diff --git a/contrib/sendmail/src/milter.c b/contrib/sendmail/src/milter.c
index 88f8b60..cbc4d35 100644
--- a/contrib/sendmail/src/milter.c
+++ b/contrib/sendmail/src/milter.c
@@ -10,7 +10,7 @@
 
 #include <sendmail.h>
 
-SM_RCSID("@(#)$Id: milter.c,v 8.281 2013/11/22 20:51:56 ca Exp $")
+SM_RCSID("@(#)$Id: milter.c,v 8.281 2013-11-22 20:51:56 ca Exp $")
 
 #if MILTER
 # include <sm/sendmail.h>
diff --git a/contrib/sendmail/src/mime.c b/contrib/sendmail/src/mime.c
index 2022bb7..ecfc761 100644
--- a/contrib/sendmail/src/mime.c
+++ b/contrib/sendmail/src/mime.c
@@ -14,7 +14,7 @@
 #include <sendmail.h>
 #include <string.h>
 
-SM_RCSID("@(#)$Id: mime.c,v 8.149 2013/11/22 20:51:56 ca Exp $")
+SM_RCSID("@(#)$Id: mime.c,v 8.149 2013-11-22 20:51:56 ca Exp $")
 
 /*
 **  MIME support.
diff --git a/contrib/sendmail/src/newaliases.1 b/contrib/sendmail/src/newaliases.1
index cae0041..59dc0de 100644
--- a/contrib/sendmail/src/newaliases.1
+++ b/contrib/sendmail/src/newaliases.1
@@ -9,9 +9,9 @@
 .\" the sendmail distribution.
 .\"
 .\"
-.\"     $Id: newaliases.1,v 8.20 2013/11/22 20:51:56 ca Exp $
+.\"     $Id: newaliases.1,v 8.20 2013-11-22 20:51:56 ca Exp $
 .\"
-.TH NEWALIASES 1 "$Date: 2013/11/22 20:51:56 $"
+.TH NEWALIASES 1 "$Date: 2013-11-22 20:51:56 $"
 .SH NAME
 newaliases
 \- rebuild the data base for the mail aliases file
diff --git a/contrib/sendmail/src/parseaddr.c b/contrib/sendmail/src/parseaddr.c
index d40f69b..4c78720 100644
--- a/contrib/sendmail/src/parseaddr.c
+++ b/contrib/sendmail/src/parseaddr.c
@@ -13,7 +13,7 @@
 
 #include <sendmail.h>
 
-SM_RCSID("@(#)$Id: parseaddr.c,v 8.407 2013/11/22 20:51:56 ca Exp $")
+SM_RCSID("@(#)$Id: parseaddr.c,v 8.407 2013-11-22 20:51:56 ca Exp $")
 
 #include <sm/sendmail.h>
 #include "map.h"
diff --git a/contrib/sendmail/src/queue.c b/contrib/sendmail/src/queue.c
index 54cc408..db339f2 100644
--- a/contrib/sendmail/src/queue.c
+++ b/contrib/sendmail/src/queue.c
@@ -14,7 +14,7 @@
 #include <sendmail.h>
 #include <sm/sem.h>
 
-SM_RCSID("@(#)$Id: queue.c,v 8.1000 2013/11/22 20:51:56 ca Exp $")
+SM_RCSID("@(#)$Id: queue.c,v 8.1000 2013-11-22 20:51:56 ca Exp $")
 
 #include <dirent.h>
 
diff --git a/contrib/sendmail/src/ratectrl.c b/contrib/sendmail/src/ratectrl.c
index 50c7769..cb7dca5 100644
--- a/contrib/sendmail/src/ratectrl.c
+++ b/contrib/sendmail/src/ratectrl.c
@@ -45,7 +45,7 @@
  */
 
 #include <sendmail.h>
-SM_RCSID("@(#)$Id: ratectrl.c,v 8.14 2013/11/22 20:51:56 ca Exp $")
+SM_RCSID("@(#)$Id: ratectrl.c,v 8.14 2013-11-22 20:51:56 ca Exp $")
 
 /*
 **  stuff included - given some warnings (inet_ntoa)
diff --git a/contrib/sendmail/src/readcf.c b/contrib/sendmail/src/readcf.c
index cdc172c..9189a95 100644
--- a/contrib/sendmail/src/readcf.c
+++ b/contrib/sendmail/src/readcf.c
@@ -14,7 +14,7 @@
 #include <sendmail.h>
 #include <sm/sendmail.h>
 
-SM_RCSID("@(#)$Id: readcf.c,v 8.692 2013/11/22 20:51:56 ca Exp $")
+SM_RCSID("@(#)$Id: readcf.c,v 8.692 2013-11-22 20:51:56 ca Exp $")
 
 #if NETINET || NETINET6
 # include <arpa/inet.h>
diff --git a/contrib/sendmail/src/recipient.c b/contrib/sendmail/src/recipient.c
index 84d2f87..ff3a3b9 100644
--- a/contrib/sendmail/src/recipient.c
+++ b/contrib/sendmail/src/recipient.c
@@ -13,7 +13,7 @@
 
 #include <sendmail.h>
 
-SM_RCSID("@(#)$Id: recipient.c,v 8.351 2013/11/22 20:51:56 ca Exp $")
+SM_RCSID("@(#)$Id: recipient.c,v 8.351 2013-11-22 20:51:56 ca Exp $")
 
 static void	includetimeout __P((int));
 static ADDRESS	*self_reference __P((ADDRESS *));
diff --git a/contrib/sendmail/src/sasl.c b/contrib/sendmail/src/sasl.c
index 666616a..bd2d908 100644
--- a/contrib/sendmail/src/sasl.c
+++ b/contrib/sendmail/src/sasl.c
@@ -9,7 +9,7 @@
  */
 
 #include <sm/gen.h>
-SM_RCSID("@(#)$Id: sasl.c,v 8.24 2013/11/22 20:51:56 ca Exp $")
+SM_RCSID("@(#)$Id: sasl.c,v 8.24 2013-11-22 20:51:56 ca Exp $")
 
 #if SASL
 # include <stdlib.h>
diff --git a/contrib/sendmail/src/savemail.c b/contrib/sendmail/src/savemail.c
index 2ea7d2f..07c3c90 100644
--- a/contrib/sendmail/src/savemail.c
+++ b/contrib/sendmail/src/savemail.c
@@ -13,7 +13,7 @@
 
 #include <sendmail.h>
 
-SM_RCSID("@(#)$Id: savemail.c,v 8.319 2013/11/22 20:51:56 ca Exp $")
+SM_RCSID("@(#)$Id: savemail.c,v 8.319 2013-11-22 20:51:56 ca Exp $")
 
 static bool	errbody __P((MCI *, ENVELOPE *, char *));
 static bool	pruneroute __P((char *));
diff --git a/contrib/sendmail/src/sendmail.8 b/contrib/sendmail/src/sendmail.8
index f225ff4..a6c47fe 100644
--- a/contrib/sendmail/src/sendmail.8
+++ b/contrib/sendmail/src/sendmail.8
@@ -9,9 +9,9 @@
 .\" the sendmail distribution.
 .\"
 .\"
-.\"     $Id: sendmail.8,v 8.61 2013/11/22 20:51:56 ca Exp $
+.\"     $Id: sendmail.8,v 8.61 2013-11-22 20:51:56 ca Exp $
 .\"
-.TH SENDMAIL 8 "$Date: 2013/11/22 20:51:56 $"
+.TH SENDMAIL 8 "$Date: 2013-11-22 20:51:56 $"
 .SH NAME
 sendmail
 \- an electronic mail transport agent
diff --git a/contrib/sendmail/src/sendmail.h b/contrib/sendmail/src/sendmail.h
index 613d01e..1a079c0 100644
--- a/contrib/sendmail/src/sendmail.h
+++ b/contrib/sendmail/src/sendmail.h
@@ -52,7 +52,7 @@
 
 #ifdef _DEFINE
 # ifndef lint
-SM_UNUSED(static char SmailId[]) = "@(#)$Id: sendmail.h,v 8.1104 2013/11/22 20:51:56 ca Exp $";
+SM_UNUSED(static char SmailId[]) = "@(#)$Id: sendmail.h,v 8.1104 2013-11-22 20:51:56 ca Exp $";
 # endif /* ! lint */
 #endif /* _DEFINE */
 
diff --git a/contrib/sendmail/src/sfsasl.c b/contrib/sendmail/src/sfsasl.c
index 1186b18..0593a25 100644
--- a/contrib/sendmail/src/sfsasl.c
+++ b/contrib/sendmail/src/sfsasl.c
@@ -9,7 +9,7 @@
  */
 
 #include <sm/gen.h>
-SM_RCSID("@(#)$Id: sfsasl.c,v 8.121 2013/11/22 20:51:56 ca Exp $")
+SM_RCSID("@(#)$Id: sfsasl.c,v 8.121 2013-11-22 20:51:56 ca Exp $")
 #include <stdlib.h>
 #include <sendmail.h>
 #include <sm/time.h>
diff --git a/contrib/sendmail/src/sfsasl.h b/contrib/sendmail/src/sfsasl.h
index 88f45c0..a53ed9d 100644
--- a/contrib/sendmail/src/sfsasl.h
+++ b/contrib/sendmail/src/sfsasl.h
@@ -6,7 +6,7 @@
  * forth in the LICENSE file which can be found at the top level of
  * the sendmail distribution.
  *
- *	$Id: sfsasl.h,v 8.21 2013/11/22 20:51:56 ca Exp $"
+ *	$Id: sfsasl.h,v 8.21 2013-11-22 20:51:56 ca Exp $"
  */
 
 #ifndef SFSASL_H
diff --git a/contrib/sendmail/src/shmticklib.c b/contrib/sendmail/src/shmticklib.c
index df620b7..78af915 100644
--- a/contrib/sendmail/src/shmticklib.c
+++ b/contrib/sendmail/src/shmticklib.c
@@ -11,7 +11,7 @@
  */
 
 #include <sm/gen.h>
-SM_RCSID("@(#)$Id: shmticklib.c,v 8.15 2013/11/22 20:51:56 ca Exp $")
+SM_RCSID("@(#)$Id: shmticklib.c,v 8.15 2013-11-22 20:51:56 ca Exp $")
 
 #if _FFR_SHM_STATUS
 # include <sys/types.h>
diff --git a/contrib/sendmail/src/sm_resolve.c b/contrib/sendmail/src/sm_resolve.c
index d8fb6b7..662eaa5 100644
--- a/contrib/sendmail/src/sm_resolve.c
+++ b/contrib/sendmail/src/sm_resolve.c
@@ -50,7 +50,7 @@
 #  endif /* NETINET */
 #  include "sm_resolve.h"
 
-SM_RCSID("$Id: sm_resolve.c,v 8.40 2013/11/22 20:51:56 ca Exp $")
+SM_RCSID("$Id: sm_resolve.c,v 8.40 2013-11-22 20:51:56 ca Exp $")
 
 static struct stot
 {
diff --git a/contrib/sendmail/src/sm_resolve.h b/contrib/sendmail/src/sm_resolve.h
index 239fe74..5f3fe21 100644
--- a/contrib/sendmail/src/sm_resolve.h
+++ b/contrib/sendmail/src/sm_resolve.h
@@ -41,7 +41,7 @@
  * SUCH DAMAGE.
  */
 
-/* $Id: sm_resolve.h,v 8.9 2013/11/22 20:51:56 ca Exp $ */
+/* $Id: sm_resolve.h,v 8.9 2013-11-22 20:51:56 ca Exp $ */
 
 #if DNSMAP
 # ifndef __ROKEN_RESOLVE_H__
diff --git a/contrib/sendmail/src/srvrsmtp.c b/contrib/sendmail/src/srvrsmtp.c
index 98998b4..1a53567 100644
--- a/contrib/sendmail/src/srvrsmtp.c
+++ b/contrib/sendmail/src/srvrsmtp.c
@@ -17,7 +17,7 @@
 # include <libmilter/mfdef.h>
 #endif /* MILTER */
 
-SM_RCSID("@(#)$Id: srvrsmtp.c,v 8.1016 2013/11/22 20:51:56 ca Exp $")
+SM_RCSID("@(#)$Id: srvrsmtp.c,v 8.1016 2013-11-22 20:51:56 ca Exp $")
 
 #include <sm/time.h>
 #include <sm/fdset.h>
diff --git a/contrib/sendmail/src/stab.c b/contrib/sendmail/src/stab.c
index a04a3e5..bf86511 100644
--- a/contrib/sendmail/src/stab.c
+++ b/contrib/sendmail/src/stab.c
@@ -13,7 +13,7 @@
 
 #include <sendmail.h>
 
-SM_RCSID("@(#)$Id: stab.c,v 8.92 2013/11/22 20:51:56 ca Exp $")
+SM_RCSID("@(#)$Id: stab.c,v 8.92 2013-11-22 20:51:56 ca Exp $")
 
 /*
 **  STAB -- manage the symbol table
diff --git a/contrib/sendmail/src/stats.c b/contrib/sendmail/src/stats.c
index 8a3b2db..382382d 100644
--- a/contrib/sendmail/src/stats.c
+++ b/contrib/sendmail/src/stats.c
@@ -13,7 +13,7 @@
 
 #include <sendmail.h>
 
-SM_RCSID("@(#)$Id: stats.c,v 8.58 2013/11/22 20:51:56 ca Exp $")
+SM_RCSID("@(#)$Id: stats.c,v 8.58 2013-11-22 20:51:56 ca Exp $")
 
 #include <sendmail/mailstats.h>
 
diff --git a/contrib/sendmail/src/statusd_shm.h b/contrib/sendmail/src/statusd_shm.h
index 980cf0f..779f638 100644
--- a/contrib/sendmail/src/statusd_shm.h
+++ b/contrib/sendmail/src/statusd_shm.h
@@ -6,7 +6,7 @@
  * forth in the LICENSE file which can be found at the top level of
  * the sendmail distribution.
  *
- *	$Id: statusd_shm.h,v 8.8 2013/11/22 20:51:57 ca Exp $
+ *	$Id: statusd_shm.h,v 8.8 2013-11-22 20:51:57 ca Exp $
  *
  * Contributed by Exactis.com, Inc.
  *
diff --git a/contrib/sendmail/src/sysexits.c b/contrib/sendmail/src/sysexits.c
index dde5a4b..7d95882 100644
--- a/contrib/sendmail/src/sysexits.c
+++ b/contrib/sendmail/src/sysexits.c
@@ -13,7 +13,7 @@
 
 #include <sendmail.h>
 
-SM_RCSID("@(#)$Id: sysexits.c,v 8.35 2013/11/22 20:51:57 ca Exp $")
+SM_RCSID("@(#)$Id: sysexits.c,v 8.35 2013-11-22 20:51:57 ca Exp $")
 
 /*
 **  DSNTOEXITSTAT -- convert DSN-style error code to EX_ style.
diff --git a/contrib/sendmail/src/timers.c b/contrib/sendmail/src/timers.c
index 735c93b..9ceb3a7 100644
--- a/contrib/sendmail/src/timers.c
+++ b/contrib/sendmail/src/timers.c
@@ -11,7 +11,7 @@
  */
 
 #include <sm/gen.h>
-SM_RCSID("@(#)$Id: timers.c,v 8.27 2013/11/22 20:51:57 ca Exp $")
+SM_RCSID("@(#)$Id: timers.c,v 8.27 2013-11-22 20:51:57 ca Exp $")
 
 #if _FFR_TIMERS
 # include <sys/types.h>
diff --git a/contrib/sendmail/src/timers.h b/contrib/sendmail/src/timers.h
index 6b7c648..6f5c1eb 100644
--- a/contrib/sendmail/src/timers.h
+++ b/contrib/sendmail/src/timers.h
@@ -6,7 +6,7 @@
  * forth in the LICENSE file which can be found at the top level of
  * the sendmail distribution.
  *
- *	$Id: timers.h,v 8.7 2013/11/22 20:51:57 ca Exp $
+ *	$Id: timers.h,v 8.7 2013-11-22 20:51:57 ca Exp $
  *
  * Contributed by Exactis.com, Inc.
  *
diff --git a/contrib/sendmail/src/tls.c b/contrib/sendmail/src/tls.c
index a9c963c..75207ee 100644
--- a/contrib/sendmail/src/tls.c
+++ b/contrib/sendmail/src/tls.c
@@ -10,7 +10,7 @@
 
 #include <sendmail.h>
 
-SM_RCSID("@(#)$Id: tls.c,v 8.127 2013/11/27 02:51:11 gshapiro Exp $")
+SM_RCSID("@(#)$Id: tls.c,v 8.127 2013-11-27 02:51:11 gshapiro Exp $")
 
 #if STARTTLS
 #  include <openssl/err.h>
diff --git a/contrib/sendmail/src/trace.c b/contrib/sendmail/src/trace.c
index 6efd09e..afc43a5 100644
--- a/contrib/sendmail/src/trace.c
+++ b/contrib/sendmail/src/trace.c
@@ -15,7 +15,7 @@
 #include <sm/debug.h>
 #include <sm/string.h>
 
-SM_RCSID("@(#)$Id: trace.c,v 8.39 2013/11/22 20:51:57 ca Exp $")
+SM_RCSID("@(#)$Id: trace.c,v 8.39 2013-11-22 20:51:57 ca Exp $")
 
 static char	*tTnewflag __P((char *));
 static char	*tToldflag __P((char *));
diff --git a/contrib/sendmail/src/udb.c b/contrib/sendmail/src/udb.c
index 6ee88ce..b2372b7 100644
--- a/contrib/sendmail/src/udb.c
+++ b/contrib/sendmail/src/udb.c
@@ -15,9 +15,9 @@
 #include "map.h"
 
 #if USERDB
-SM_RCSID("@(#)$Id: udb.c,v 8.166 2013/11/22 20:51:57 ca Exp $ (with USERDB)")
+SM_RCSID("@(#)$Id: udb.c,v 8.166 2013-11-22 20:51:57 ca Exp $ (with USERDB)")
 #else /* USERDB */
-SM_RCSID("@(#)$Id: udb.c,v 8.166 2013/11/22 20:51:57 ca Exp $ (without USERDB)")
+SM_RCSID("@(#)$Id: udb.c,v 8.166 2013-11-22 20:51:57 ca Exp $ (without USERDB)")
 #endif /* USERDB */
 
 #if USERDB
diff --git a/contrib/sendmail/src/usersmtp.c b/contrib/sendmail/src/usersmtp.c
index c217ffa..f3ddcf2 100644
--- a/contrib/sendmail/src/usersmtp.c
+++ b/contrib/sendmail/src/usersmtp.c
@@ -13,7 +13,7 @@
 
 #include <sendmail.h>
 
-SM_RCSID("@(#)$Id: usersmtp.c,v 8.488 2013/11/22 20:51:57 ca Exp $")
+SM_RCSID("@(#)$Id: usersmtp.c,v 8.488 2013-11-22 20:51:57 ca Exp $")
 
 #include <sysexits.h>
 
diff --git a/contrib/sendmail/src/util.c b/contrib/sendmail/src/util.c
index b03fa66..02e8ec2 100644
--- a/contrib/sendmail/src/util.c
+++ b/contrib/sendmail/src/util.c
@@ -13,7 +13,7 @@
 
 #include <sendmail.h>
 
-SM_RCSID("@(#)$Id: util.c,v 8.427 2013/11/22 20:51:57 ca Exp $")
+SM_RCSID("@(#)$Id: util.c,v 8.427 2013-11-22 20:51:57 ca Exp $")
 
 #include <sm/sendmail.h>
 #include <sysexits.h>
diff --git a/contrib/sendmail/src/version.c b/contrib/sendmail/src/version.c
index 3f85c06..1476778 100644
--- a/contrib/sendmail/src/version.c
+++ b/contrib/sendmail/src/version.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998-2013 Proofpoint, Inc. and its suppliers.
+ * Copyright (c) 1998-2014 Proofpoint, Inc. and its suppliers.
  *	All rights reserved.
  * Copyright (c) 1983 Eric P. Allman.  All rights reserved.
  * Copyright (c) 1988, 1993
@@ -13,6 +13,6 @@
 
 #include <sm/gen.h>
 
-SM_RCSID("@(#)$Id: version.c,v 8.249 2013/11/27 00:38:50 ca Exp $")
+SM_RCSID("@(#)$Id: version.c,v 8.249 2013-11-27 00:38:50 ca Exp $")
 
-char	Version[] = "8.14.8";
+char	Version[] = "8.14.9";