1 files changed, 8 insertions, 10 deletions

diff --git a/etc/mail/sendmail.cf.additions b/etc/mail/sendmail.cf.additions
index f4e1f789e221..6adedac8c06e 100644
--- a/etc/mail/sendmail.cf.additions
+++ b/etc/mail/sendmail.cf.additions
@@ -44,11 +44,6 @@ R<$*> $*		$: $1
 R$* $| $*		$: $1 $| $(denyip $2 $)
 R$* $| $*.REJECT	$#error $: "521 blocked. contact postmaster@FreeBSD.ORG"
 # ip address must NOT be in the "denyip" database--END
-# Host must resolve--BEGIN
-R$* $| $*		$: <$1 $| $2> $>3 foo@$1
-R<$*> $*<@$*.>		$: $1
-R<$*> $*<@$*>		$#error $: "451 Domain does not resolve"
-# Host must resolve--END
 R$*			$@ OK
 
 Scheck_mail
@@ -57,8 +52,7 @@ Scheck_mail
 #	may or may not have "<" ">"
 # the groups of rules in this ruleset ARE NOT independent.
 # "remove all RFC-822 comments" must come first
-# "Paul Vixie's RBL" must be last
-# you may rearrange the other rules.
+# "Connecting Host" and "Paul Vixie's RBL" must be last
 #
 # use the ones that you want comment out the rest
 # each group is preceded and followed by a comment
@@ -72,13 +66,17 @@ R$* < @ $+ . >		$: $1 @ $2
 R$* < @ $+ >		$#error $: "451 Domain does not resolve"
 # mail must come from a DNS resolvable host--END
 # mail must NOT come from a known source of spam--BEGIN
-# resolved.  second check:  one of the know spam sources?
-R$+ @$+			$: <$1@$2> $1 @$2
-R<$*> $+ @$+.$+.$+	<$1> $4.$5  
+R$+ @$+			$: <$1@$2> $2
+R<$*> $+.$+.$+		<$1> $3.$4
 R<$*> $*		$: $(spamsites $2 $: OK $)
 R$+.REJECT		$#error $: 521 $1 
 R<$*> $*		$: $1
 # mail must NOT come from a known source of spam--END
+# Connecting Host must resolve--BEGIN
+R$*			$: $1 $: $(dequote "" $&{client_name} $)
+R$*			$: $>3 foo@$1
+R<$*> $*<@$*>		$#error $: "451 Domain does not resolve"
+# Connecting Host must resolve--END
 # ip address must NOT be in Paul Vixie's RBL--BEGIN
 R$*			$: $1 $: $(dequote "" $&{client_addr} $)
 R$*			$: $>check_rbl $1