pass host!user through the name server to see if it might be local

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

diff --git a/usr/src/usr.sbin/sendmail/cf/m4/proto.m4 b/usr/src/usr.sbin/sendmail/cf/m4/proto.m4
index 21b9226..bef3d78 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 2.5 (Berkeley) %G%)
+VERSIONID(@(#)proto.m4 2.6 (Berkeley) %G%)

 
 
 ##################
 
 
 ##################


@@ -129,11 +129,22 @@ S6
 undivert(2)dnl
 
 # handle special cases for local names
 undivert(2)dnl
 
 # handle special cases for local names

-R$*<@$=w>$*            $:$1<@$w>$3                     no domain at all
-R$*<@$=w.UUCP>$*       $:$1<@$w>$3                     .UUCP domain
+R$* < @ $=w > $*               $: $1 < @ $w > $3               no domain at all
+R$* < @ $=w .UUCP> $*          $: $1 < @ $w > $3               .UUCP domain
+
+# if it's really UUCP, don't bother
+R$* < @ $=U . UUCP > $*                $@ $1 < @ $2 .UUCP > $3
+R$* < @ $=V . UUCP > $*                $@ $1 < @ $2 .UUCP > $3
+R$* < @ $=W . UUCP > $*                $@ $1 < @ $2 .UUCP > $3
+R$* < @ $=X . UUCP > $*                $@ $1 < @ $2 .UUCP > $3
+R$* < @ $=Y . UUCP > $*                $@ $1 < @ $2 .UUCP > $3
+
+# try UUCP traffic as a local address
+R$* < @ $- .UUCP > $*          $: $1 < @ $[ $2 $] .UUCP > $3
+R$* < @ $+ . $+ .UUCP > $*     $@ $1 < @ $2 . $3 > $4

 
 # pass to name server to make hostname canonical
 
 # pass to name server to make hostname canonical

-R$* < @ $+ > $*                $: $1 < @ $[ $2 $] > $3         then do anything
+R$* < @ $+ > $*                        $: $1 < @ $[ $2 $] > $3         then do anything

 
 
 ##################################################
 
 
 ##################################################