*** smtpcheck-	Mon Oct  5 06:51:59 1998
--- smtpcheck	Mon Oct  5 06:52:48 1998
***************
*** 2,8 ****
  # smtpcheck: smtp processing restrictions
  #
  
! REVISION_ID='@(#)smtpcheck	3.89 (motonori/WIDE) 25 Sep 1998'
  
  #|#MAIL_RELAY_RESTRICTION=yes
  #|#WITH_OLD_CF=no	# (just for smtpcheck.def)
--- 2,8 ----
  # smtpcheck: smtp processing restrictions
  #
  
! REVISION_ID='@(#)smtpcheck	3.91 (motonori/WIDE) 03 Oct 1998'
  
  #|#MAIL_RELAY_RESTRICTION=yes
  #|#WITH_OLD_CF=no	# (just for smtpcheck.def)
***************
*** 735,745 ****
  CHECK_MAIL="$CHECK_MAIL"'\
  # deny with MAPS (Mail Abuse Protection System) RBL (Realtime Blackhole List)\
  R$* $| $-.$-.$-.$-	$: $1 $| $2.$3.$4.$5 $| $(host $5.$4.$3.$2.'"$RBL"'. $: $)\
! R$* $| $* $| $+		$#error $@ 5.7.1 $: "550 Mail from " $2 " refused, see http://maps.vix.com/rbl/"'
  
  		;;
  	esac
  
  	case "$USE_ORBS" in
  	log)
  
--- 735,749 ----
  CHECK_MAIL="$CHECK_MAIL"'\
  # deny with MAPS (Mail Abuse Protection System) RBL (Realtime Blackhole List)\
  R$* $| $-.$-.$-.$-	$: $1 $| $2.$3.$4.$5 $| $(host $5.$4.$3.$2.'"$RBL"'. $: $)\
! R$* $| $* $| $+		$#error $@ 5.7.1 $: "550 Mail from " $2 " refused, see http://maps.vix.com/rbl/"\
! R$* $| $* $| $*		$: $1 $| $2'
  
  		;;
  	esac
  
+ #CHECK_MAIL="$CHECK_MAIL"'\
+ #R$*			$: $1 $| '"$CLIENT_ADDR"
+ 
  	case "$USE_ORBS" in
  	log)
  
***************
*** 770,784 ****
  CHECK_MAIL="$CHECK_MAIL"'\
  # deny with ORBS (Open Relay Blocking System) by dorkslayers.com\
  R$* $| $-.$-.$-.$-	$: $1 $| $2.$3.$4.$5 $| $(host $5.$4.$3.$2.'"$ORBS"'. $: $)\
! R$* $| $* $| $+		$#error $@ 5.7.1 $: "550 Mail from " $2 " refused, see http://dorkslayers.com/orbs/"'
  
  		;;
  	esac
  
- HDRCHECK="$HDRCHECK\\
- $SYSLOG_MAP\\
- $DEFINE_MAP"
- 
  CHECK_MAIL="$CHECK_MAIL"'\
  R$* $| $*		$: $1\
  '
--- 774,785 ----
  CHECK_MAIL="$CHECK_MAIL"'\
  # deny with ORBS (Open Relay Blocking System) by dorkslayers.com\
  R$* $| $-.$-.$-.$-	$: $1 $| $2.$3.$4.$5 $| $(host $5.$4.$3.$2.'"$ORBS"'. $: $)\
! R$* $| $* $| $+		$#error $@ 5.7.1 $: "550 Mail from " $2 " refused, see http://dorkslayers.com/orbs/"\
! R$* $| $* $| $*		$: $1 $| $2'
  
  		;;
  	esac
  
  CHECK_MAIL="$CHECK_MAIL"'\
  R$* $| $*		$: $1\
  '
***************
*** 1270,1278 ****
  \
  # reject source routing'
  
! : ${REJECT_EXTERN_SRR=yes}
! if [ "$REJECT_EXTERN_SRR" = "yes" ]
! then
  
  CHECK_RCPT="$CHECK_RCPT"'\
  R$* $| $*@$*<@$*>$*	$#error $@ 5.7.1 $: 553 Source routing rejected\
--- 1271,1279 ----
  \
  # reject source routing'
  
! 	: ${REJECT_EXTERN_SRR=yes}
! 	if [ "$REJECT_EXTERN_SRR" = "yes" ]
! 	then
  
  CHECK_RCPT="$CHECK_RCPT"'\
  R$* $| $*@$*<@$*>$*	$#error $@ 5.7.1 $: 553 Source routing rejected\
***************
*** 1280,1286 ****
  R$* $| <@$*>:$*@$*	$#error $@ 5.7.1 $: 553 Source routing rejected\
  '
  
! else
  
  CHECK_RCPT="$CHECK_RCPT"'\
  #R$* $| $*@$*<@$*>$*	$#error $@ 5.7.1 $: 553 Source routing rejected\
--- 1281,1287 ----
  R$* $| <@$*>:$*@$*	$#error $@ 5.7.1 $: 553 Source routing rejected\
  '
  
! 	else
  
  CHECK_RCPT="$CHECK_RCPT"'\
  #R$* $| $*@$*<@$*>$*	$#error $@ 5.7.1 $: 553 Source routing rejected\
***************
*** 1288,1294 ****
  #R$* $| <@$*>:$*@$*	$#error $@ 5.7.1 $: 553 Source routing rejected\
  '
  
! fi
  
  	if [ "$WITH_OLD_CF" != no ]
  	then
--- 1289,1295 ----
  #R$* $| <@$*>:$*@$*	$#error $@ 5.7.1 $: 553 Source routing rejected\
  '
  
! 	fi
  
  	if [ "$WITH_OLD_CF" != no ]
  	then
***************
*** 1432,1437 ****
--- 1433,1442 ----
  R $* $| $* $| $-.$+	$@ $> Relay_map_o_r_sub $1 $| $2 $| $3.$4\
  R $* $| $* $| $*	$@ $2 $| $1			not found\
  R $* $| $*		$@ $2				found'
+ 
+ HDRCHECK="$HDRCHECK\\
+ $SYSLOG_MAP\\
+ $DEFINE_MAP"
  
  fi