--- xmission.cf.orig	Sat Jun  3 19:42:22 2000
+++ xmission.cf	Sat Jun  3 19:43:15 2000
@@ -266,7 +266,7 @@
 #O DaemonPortOptions=Port=esmtp
 
 # privacy flags
-O PrivacyOptions=authwarnings
+O PrivacyOptions=authwarnings,needmailhelo
 
 # who (if anyone) should get extra copies of error messages
 #O PostMasterCopy=Postmaster
@@ -1078,13 +1078,13 @@
 
 #####  @(#)procmail.m4	8.11 (Berkeley) 5/19/1998  #####
 
-Mprocmail,	P=/usr/bin/procmail, F=DFMSPhnu9, S=11/31, R=21/31, T=DNS/RFC822/X-Unix,
+Mprocmail,	P=/usr/bin/procmail, F=DFMSPhnu9, S=12/32, R=21/31, T=DNS/RFC822/X-Unix,
 		A=procmail -Y -m $h $f $u
 
 #####################################
 ###   SMTP Mailer specification   ###
 #####################################
-
+S11
 #####  @(#)smtp.m4	8.38 (Berkeley) 5/19/1998  #####
 
 Msmtp,		P=[IPC], F=mDFMuX, S=11/31, R=21, E=\r\n, L=990,
@@ -1108,6 +1108,12 @@
 R$* :; <@>		$@				list:; special case
 R$*			$: $>61 $1			qualify unqual'ed names
 R$+			$: $>94 $1			do masquerading
+#
+S12
+R$+			$: $>51 $1			sender/recipient common
+R$* :; <@>		$@				list:; special case
+R$*			$: $>61 $1			qualify unqual'ed names
+#R$+			$: $>94 $1			do masquerading
 
 
 #
@@ -1132,6 +1138,17 @@
 R$*			$: $>61 $1			qualify unqual'ed names
 R$+			$: $>93 $1			do masquerading
 
+#
+S32
+R$+			$: $>51 $1			sender/recipient common
+R:; <@>			$@				list:; special case
+
+# do special header rewriting
+R$* <@> $*		$@ $1 <@> $2			pass null host through
+R< @ $* > $*		$@ < @ $1 > $2			pass route-addr through
+R$*			$: $>61 $1			qualify unqual'ed names
+#R$+			$: $>93 $1			do masquerading
+
 
 #
 #  convert pseudo-domain addresses to real domain addresses
@@ -1180,10 +1197,10 @@
 
 #####  @(#)local.m4	8.30 (Berkeley) 6/30/1998  #####
 
-Mlocal,		P=/usr/bin/procmail, F=lsDFMAw5:/|@qSPfhn9, S=10/30, R=20/40,
+Mlocal,		P=/usr/bin/procmail, F=lsDFMAw5:/|@qSPfhn9, S=13/33, R=20/40,
 		T=DNS/RFC822/X-Unix,
 		A=procmail -Y -a $h -d $u
-Mprog,		P=/usr/sbin/smrsh, F=lsDFMoqeu9, S=10/30, R=20/40, D=$z:/,
+Mprog,		P=/usr/sbin/smrsh, F=lsDFMoqeu9, S=13/33, R=20/40, D=$z:/,
 		T=X-Unix,
 		A=sh -c $u
 
@@ -1195,6 +1212,12 @@
 R@ <@ $*>		$n			temporarily bypass Sun bogosity
 R$+			$: $>50 $1		add local domain if needed
 R$*			$: $>94 $1		do masquerading
+#
+S13
+R<@>			$n			errors to mailer-daemon
+R@ <@ $*>		$n			temporarily bypass Sun bogosity
+R$+			$: $>50 $1		add local domain if needed
+#R$*			$: $>94 $1		do masquerading
 
 #
 #  Envelope recipient rewriting
@@ -1210,6 +1233,12 @@
 R@ <@ $*>		$n			temporarily bypass Sun bogosity
 R$+			$: $>50 $1		add local domain if needed
 R$*			$: $>93 $1		do masquerading
+#
+S33
+R<@>			$n			errors to mailer-daemon
+R@ <@ $*>		$n			temporarily bypass Sun bogosity
+R$+			$: $>50 $1		add local domain if needed
+#R$*			$: $>93 $1		do masquerading
 
 #
 #  Header recipient rewriting