add option 'l'; fix mailertable lookup

SCCS-vsn: usr.sbin/sendmail/cf/m4/proto.m4 6.43

diff --git a/usr/src/usr.sbin/sendmail/cf/m4/proto.m4 b/usr/src/usr.sbin/sendmail/cf/m4/proto.m4
index 0881955..275c957 100644 (file)
--- a/usr/src/usr.sbin/sendmail/cf/m4/proto.m4
+++ b/usr/src/usr.sbin/sendmail/cf/m4/proto.m4
@@ -8,7 +8,7 @@ divert(-1)
 #
 divert(0)
 
 #
 divert(0)
 

-VERSIONID(`@(#)proto.m4        6.42 (Berkeley) %G%')
+VERSIONID(`@(#)proto.m4        6.43 (Berkeley) %G%')

 
 MAILER(local)dnl
 
 
 MAILER(local)dnl
 


@@ -197,6 +197,9 @@ CONCAT(Ok, confMCI_CACHE_SIZE)
 # open connection cache timeout
 CONCAT(OK, confMCI_CACHE_TIMEOUT)
 
 # open connection cache timeout
 CONCAT(OK, confMCI_CACHE_TIMEOUT)
 

+# use Errors-To: header?
+CONCAT(Ol, confUSE_ERRORS_TO)
+

 # log level
 CONCAT(OL, confLOG_LEVEL)
 
 # log level
 CONCAT(OL, confLOG_LEVEL)
 


@@ -592,7 +595,7 @@ ifdef(`MAILER_TABLE',
 ###########################################################################
 
 S90
 ###########################################################################
 
 S90

-R<$- . $+ > $*         $: < $(mailertable .$2 $: $) > $3       lookup
+R<$- . $+ > $*         $: < $(mailertable .$2 $) > $3  lookup

 R<$- : $+ > $*         $# $1 $@ $2 $: $3               check -- resolved?
 R<$- . $+ > $*         $@ $>90 <$2> $3                 no -- strip & try again
 R<$*> $*               $@ $2                           no match',
 R<$- : $+ > $*         $# $1 $@ $2 $: $3               check -- resolved?
 R<$- . $+ > $*         $@ $>90 <$2> $3                 no -- strip & try again
 R<$*> $*               $@ $2                           no match',