Merge sendmail 8.14.8 to HEAD

MFC after:	5 days

4 files changed, 9 insertions, 9 deletions

diff --git a/contrib/sendmail/contrib/dnsblaccess.m4 b/contrib/sendmail/contrib/dnsblaccess.m4
index e527e28..c90fc3b 100644
--- a/contrib/sendmail/contrib/dnsblaccess.m4
+++ b/contrib/sendmail/contrib/dnsblaccess.m4
@@ -1,6 +1,6 @@
 divert(-1)
 #
-# Copyright (c) 2001-2002, 2005 Sendmail, Inc. and its suppliers.
+# Copyright (c) 2001-2002, 2005 Proofpoint, Inc. and its suppliers.
 #	All rights reserved.
 #
 # By using this file, you agree to the terms and conditions set
@@ -59,7 +59,7 @@ dnl ##	address returned does not begin 127, then the mail is
 dnl ##	processed as if the HACK line were not present.
 
 divert(0)
-VERSIONID(`$Id: dnsblaccess.m4,v 1.6 2005/07/25 23:32:05 ca Exp $')
+VERSIONID(`$Id: dnsblaccess.m4,v 1.7 2013/11/22 20:51:18 ca Exp $')
 ifdef(`_ACCESS_TABLE_', `dnl',
 	`errprint(`*** ERROR: dnsblaccess requires FEATURE(`access_db')
 ')')
diff --git a/contrib/sendmail/contrib/link_hash.sh b/contrib/sendmail/contrib/link_hash.sh
index 843c920..a89350c 100644
--- a/contrib/sendmail/contrib/link_hash.sh
+++ b/contrib/sendmail/contrib/link_hash.sh
@@ -1,9 +1,9 @@
 #!/bin/sh
 ##
-## Copyright (c) 2000 Sendmail, Inc. and its suppliers.
+## Copyright (c) 2000 Proofpoint, Inc. and its suppliers.
 ##       All rights reserved.
 ##
-## $Id: link_hash.sh,v 1.2 2000/04/25 00:12:28 ca Exp $
+## $Id: link_hash.sh,v 1.3 2013/11/22 20:51:18 ca Exp $
 ##
 #
 # ln a certificate to its hash
diff --git a/contrib/sendmail/contrib/qtool.8 b/contrib/sendmail/contrib/qtool.8
index 0a4cbff..6676569 100644
--- a/contrib/sendmail/contrib/qtool.8
+++ b/contrib/sendmail/contrib/qtool.8
@@ -1,4 +1,4 @@
-.\" Copyright (c) 1999, 2001-2002 Sendmail, Inc. and its suppliers.
+.\" Copyright (c) 1999, 2001-2002 Proofpoint, Inc. and its suppliers.
 .\"	 All rights reserved.
 .\"
 .\" By using this file, you agree to the terms and conditions set
@@ -6,9 +6,9 @@
 .\" the sendmail distribution.
 .\"
 .\"
-.\"     $Id: qtool.8,v 8.20 2004/06/28 17:49:41 ca Exp $
+.\"     $Id: qtool.8,v 8.21 2013/11/22 20:51:18 ca Exp $
 .\"
-.TH QTOOL 8 "$Date: 2004/06/28 17:49:41 $"
+.TH QTOOL 8 "$Date: 2013/11/22 20:51:18 $"
 .SH NAME
 qtool
 \- manipulate sendmail queues
diff --git a/contrib/sendmail/contrib/qtool.pl b/contrib/sendmail/contrib/qtool.pl
index c2a67f8..647da1a 100755
--- a/contrib/sendmail/contrib/qtool.pl
+++ b/contrib/sendmail/contrib/qtool.pl
@@ -1,9 +1,9 @@
 #!/usr/bin/env perl
 ##
-## Copyright (c) 1998-2002 Sendmail, Inc. and its suppliers.
+## Copyright (c) 1998-2002 Proofpoint, Inc. and its suppliers.
 ##	All rights reserved.
 ##
-## $Id: qtool.pl,v 8.31 2010/11/10 19:11:54 ca Exp $
+## $Id: qtool.pl,v 8.32 2013/11/22 20:51:18 ca Exp $
 ##
 use strict;
 use File::Basename;