From 98a0fcc6e3ed68f6d3b0903073cb993161bcb0d6 Mon Sep 17 00:00:00 2001
From: "Jonathan M. Bresler" <jmb@FreeBSD.org>
Date: Tue, 14 Apr 1998 02:09:23 +0000
Subject: [PATCH] 	use extended error codes as noted in rfc1893.

	retain additional message in check_relay ruleset,
	the message is written into the maillog.
	this is useful to a site's postmaster.
Reviewed by:	jmb
Submitted by:	Ruslan Ermilov ru@ucb.crimea.ua
---
 etc/mail/sendmail.cf.additions | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/etc/mail/sendmail.cf.additions b/etc/mail/sendmail.cf.additions
index 7094540bd25..0921b96cc21 100644
--- a/etc/mail/sendmail.cf.additions
+++ b/etc/mail/sendmail.cf.additions
@@ -63,24 +63,24 @@ R$*			$: $>3 $1
 # remove all RFC-822 comments--END
 # mail must come from a DNS resolvable host--BEGIN
 R$* < @ $+ . >		$: $1 @ $2
-R$* < @ $+ >		$#error $: "451 Domain does not resolve"
+R$* < @ $+ >		$#error $@ 4.1.8 $: "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
 R$+ @$+			$: <$1@$2> $2
 R<$*> $+.$+.$+		<$1> $3.$4
 R<$*> $*		$: $(spamsites $2 $: OK $)
-R$+.REJECT		$#error $: 521 $1 
+R$+.REJECT		$#error $@ 5.7.1 $: 550 $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"
+R<$*> $*<@$*>		$#error $@ 4.1.8 $: "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
-R$*.com.		$#error $: "550 Mail refused, see http://maps.vix.com/rbl"
+R$*.com.		$#error $@ 5.7.1 $: "550 Mail refused, see http://maps.vix.com/rbl"
 # ip address must NOT be in Paul Vixie's RBL--END
 R$*			$@ OK
 
@@ -96,7 +96,7 @@ Scheck_rcpt
 # mail must NOT be addressed "fakenames"--BEGIN
 R$*			$: <$1> $>3 $1
 R<$*> $+ < @ $+ >	$: <$1> $(fakenames $2 $: OK $)
-R$+.REJECT		$#error $: 521 $1
+R$+.REJECT		$#error $@ 5.2.1 $: 550 $1
 R<$*> $*		$: $1
 # mail must NOT be addressed "fakenames"--END
 # mail must come from or go to this machine or machines we allow to relay--BEGIN
@@ -108,7 +108,7 @@ R<$*> $*		$: $1
 # R$=w			$@ OK
 # R$* $=R			$@ OK
 # R$@			$@ OK
-# R$*			$#error $: "550 Relaying Denied"
+# R$*			$#error $@ 5.7.1 $: "550 Relaying Denied"
 # mail must come from or go to this machine or machines we allow to relay--END
 R$*			$@ OK