diff options
| author | gshapiro <gshapiro@FreeBSD.org> | 2014-01-26 23:39:11 +0000 |
|---|---|---|
| committer | gshapiro <gshapiro@FreeBSD.org> | 2014-01-26 23:39:11 +0000 |
| commit | 932f20d9d25e87afa88ae9b1d943d25d8083aae5 (patch) | |
| tree | dca7113a5d1aa5eece8c4ac216e345862af0c5f2 /contrib/sendmail/cf/m4/proto.m4 | |
| parent | 631dcff5854868ecf95268f05bcd279ddaa4a5fb (diff) | |
| parent | b649239dd2089ab83c5d6ed19420ee7c788f8647 (diff) | |
| download | FreeBSD-src-932f20d9d25e87afa88ae9b1d943d25d8083aae5.zip FreeBSD-src-932f20d9d25e87afa88ae9b1d943d25d8083aae5.tar.gz | |
Merge sendmail 8.14.8 to HEAD
MFC after: 5 days
Diffstat (limited to 'contrib/sendmail/cf/m4/proto.m4')
| -rw-r--r-- | contrib/sendmail/cf/m4/proto.m4 | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/contrib/sendmail/cf/m4/proto.m4 b/contrib/sendmail/cf/m4/proto.m4 index 9eae488..79667c1 100644 --- a/contrib/sendmail/cf/m4/proto.m4 +++ b/contrib/sendmail/cf/m4/proto.m4 @@ -1,6 +1,6 @@ divert(-1) # -# Copyright (c) 1998-2010 Sendmail, Inc. and its suppliers. +# Copyright (c) 1998-2010 Proofpoint, Inc. and its suppliers. # All rights reserved. # Copyright (c) 1983, 1995 Eric P. Allman. All rights reserved. # Copyright (c) 1988, 1993 @@ -13,7 +13,7 @@ divert(-1) # divert(0) -VERSIONID(`$Id: proto.m4,v 8.760 2012/09/07 16:30:15 ca Exp $') +VERSIONID(`$Id: proto.m4,v 8.762 2013/11/22 20:51:13 ca Exp $') # level CF_LEVEL config file format V`'CF_LEVEL`'ifdef(`NO_VENDOR',`', `/ifdef(`VENDOR_NAME', `VENDOR_NAME', `Berkeley')') @@ -2395,6 +2395,8 @@ dnl Reject our hostname R$* $| <$*> [$=w] $#error $@ 5.7.1 $:"550 bogus HELO name used: " $&s dnl Pass anything else with a "." in the domain parameter R$* $| <$*> [$+.$+] $: $1 qualified domain ok +dnl Pass IPv6: address literals +R$* $| <$*> [IPv6:$+] $: $1 qualified domain ok dnl Reject if there was no "." or only an initial or final "." R$* $| <$*> [$*] $#error $@ 5.7.1 $:"550 bogus HELO name used: " $&s dnl Clean up the workspace |
