catch self-literal (e.g., [1.2.3.4]) even if reverse mapping is broken

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

diff --git a/usr/src/usr.sbin/sendmail/cf/m4/proto.m4 b/usr/src/usr.sbin/sendmail/cf/m4/proto.m4
index fb4e903..d2f5f37 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        8.17 (Berkeley) %G%')
+VERSIONID(`@(#)proto.m4        8.18 (Berkeley) %G%')

 
 MAILER(local)dnl
 
 
 MAILER(local)dnl
 


@@ -418,6 +418,9 @@ R$* < @ localhost > $*              $: $1 < @ $j . > $2             no domain at all
 R$* < @ localhost . $m > $*    $: $1 < @ $j . > $2             local domain
 ifdef(`_NO_UUCP_', `dnl',
 `R$* < @ localhost . UUCP > $* $: $1 < @ $j . > $2             .UUCP domain')
 R$* < @ localhost . $m > $*    $: $1 < @ $j . > $2             local domain
 ifdef(`_NO_UUCP_', `dnl',
 `R$* < @ localhost . UUCP > $* $: $1 < @ $j . > $2             .UUCP domain')

+R$* < @ [ $+ ] > $*            $: $1 < @ [[ $2 ]] > $3         catch [a.b.c.d]
+R$* < @ [ $=w ] > $*           $: $1 < @ $j . > $3             self-literal
+R$* < @ [[ $+ ]] > $*          $: $1 < @ [ $2 ] > $3           strip dbl [[]]

 ifdef(`DOMAIN_TABLE', `
 # look up unqualified domains in the domain table
 R$* < @ $- > $*                        $: $1 < @ $(domaintable $2 $) > $3',
 ifdef(`DOMAIN_TABLE', `
 # look up unqualified domains in the domain table
 R$* < @ $- > $*                        $: $1 < @ $(domaintable $2 $) > $3',