use full domain name in UUCP mailer for consistency with mailertable

SCCS-vsn: usr.sbin/sendmail/cf/mailer/uucp.m4 8.12
SCCS-vsn: usr.sbin/sendmail/cf/m4/proto.m4 8.29

diff --git a/usr/src/usr.sbin/sendmail/cf/m4/proto.m4 b/usr/src/usr.sbin/sendmail/cf/m4/proto.m4
index c62b72f..8586b39 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.28 (Berkeley) %G%')
+VERSIONID(`@(#)proto.m4        8.29 (Berkeley) %G%')

 
 MAILER(local)dnl
 
 
 MAILER(local)dnl
 


@@ -575,8 +575,7 @@ ifdef(`UUCP_RELAY',
 R$*<@$*.UUCP>$*                $#smtp $@ $Y $: @ $Y : $1 @ $2.UUCP $3  uucp mail',
 `ifdef(`_MAILER_uucp_',
 `# forward other UUCP traffic straight to UUCP
 R$*<@$*.UUCP>$*                $#smtp $@ $Y $: @ $Y : $1 @ $2.UUCP $3  uucp mail',
 `ifdef(`_MAILER_uucp_',
 `# forward other UUCP traffic straight to UUCP

-R< @ $+ .UUCP. > : $+  $#uucp $@ $1 $: $2              @host.UUCP:...
-R$+ < @ $+ .UUCP. >    $#uucp $@ $2 $: $1              user@host.UUCP',
+R$* < @ $+ .UUCP. > $*         $#uucp $@ $2 $: $1 < @ $2 .UUCP. > $3   user@host.UUCP',

        `dnl')')
 ifdef(`_MAILER_usenet_', `
 # addresses sent to net.group.USENET will get forwarded to a newsgroup
        `dnl')')
 ifdef(`_MAILER_usenet_', `
 # addresses sent to net.group.USENET will get forwarded to a newsgroup

diff --git a/usr/src/usr.sbin/sendmail/cf/mailer/uucp.m4 b/usr/src/usr.sbin/sendmail/cf/mailer/uucp.m4
index 3e2956c..a6e2e3a 100644 (file)
--- a/usr/src/usr.sbin/sendmail/cf/mailer/uucp.m4
+++ b/usr/src/usr.sbin/sendmail/cf/mailer/uucp.m4
@@ -16,7 +16,7 @@ POPDIVERT
 ###   UUCP Mailer specification   ###
 #####################################
 
 ###   UUCP Mailer specification   ###
 #####################################
 

-VERSIONID(`@(#)uucp.m4 8.11 (Berkeley) %G%')
+VERSIONID(`@(#)uucp.m4 8.12 (Berkeley) %G%')

 
 #
 #  There are innumerable variations on the UUCP mailer.  It really
 
 #
 #  There are innumerable variations on the UUCP mailer.  It really


@@ -58,7 +58,9 @@ R$* :; <@>                    $@ $1 :;
 
 R$* < @ $* . >                 $1 < @ $2 >             strip trailing dots
 R$* < @ $=w >                  $1                      strip local name
 
 R$* < @ $* . >                 $1 < @ $2 >             strip trailing dots
 R$* < @ $=w >                  $1                      strip local name

-R$* < @ $- . UUCP >            $2 ! $1                 convert to UUCP format
+R<@ $- . UUCP. > : $+          $1 ! $2                 convert to UUCP format
+R<@ $+ > : $+                  $1 ! $2                 convert to UUCP format
+R$* < @ $- . UUCP. >           $2 ! $1                 convert to UUCP format

 R$* < @ $+ >                   $2 ! $1                 convert to UUCP format
 R$&h ! $+ ! $+                 $@ $1 ! $2              $h!...!user => ...!user
 R$&h ! $+                      $@ $&h ! $1             $h!user => $h!user
 R$* < @ $+ >                   $2 ! $1                 convert to UUCP format
 R$&h ! $+ ! $+                 $@ $1 ! $2              $h!...!user => ...!user
 R$&h ! $+                      $@ $&h ! $1             $h!user => $h!user


@@ -75,7 +77,9 @@ R$* :; <@>                    $@ $1 :;
 
 R$* < @ $* . >                 $1 < @ $2 >             strip trailing dots
 R$* < @ $j >                   $1                      strip local name
 
 R$* < @ $* . >                 $1 < @ $2 >             strip trailing dots
 R$* < @ $j >                   $1                      strip local name

-R$* < @ $- . UUCP >            $2 ! $1                 convert to UUCP format
+R<@ $- . UUCP. > : $+          $1 ! $2                 convert to UUCP format
+R<@ $+ > : $+                  $1 ! $2                 convert to UUCP format
+R$* < @ $- . UUCP. >           $2 ! $1                 convert to UUCP format

 R$* < @ $+ >                   $2 ! $1                 convert to UUCP format
 R$&h ! $+ ! $+                 $@ $1 ! $2              $h!...!user => ...!user
 R$&h ! $+                      $@ $&h ! $1             $h!user => $h!user
 R$* < @ $+ >                   $2 ! $1                 convert to UUCP format
 R$&h ! $+ ! $+                 $@ $1 ! $2              $h!...!user => ...!user
 R$&h ! $+                      $@ $&h ! $1             $h!user => $h!user


@@ -108,7 +112,9 @@ R$* :; <@>                  $@ $1 :;
 
 R$* < @ $* . >                 $1 < @ $2 >             strip trailing dots
 R$* < @ $=w >                  $1                      strip local name
 
 R$* < @ $* . >                 $1 < @ $2 >             strip trailing dots
 R$* < @ $=w >                  $1                      strip local name

-R$* < @ $- . UUCP >            $2 ! $1                 convert to UUCP format
+R<@ $- . UUCP. > : $+          $1 ! $2                 convert to UUCP format
+R<@ $+ > : $+                  $1 ! $2                 convert to UUCP format
+R$* < @ $- . UUCP. >           $2 ! $1                 convert to UUCP format

 R$* < @ $+ >                   $@ $2 ! $1              convert to UUCP format
 
 R$&h ! $+ ! $+                 $@ $1 ! $2              $h!...!user => ...!user
 R$* < @ $+ >                   $@ $2 ! $1              convert to UUCP format
 
 R$&h ! $+ ! $+                 $@ $1 ! $2              $h!...!user => ...!user


@@ -120,8 +126,6 @@ R! $+                               $: $j ! $1              in case $M undefined')
 PUSHDIVERT(4)
 # resolve locally connected UUCP links
 R$* < @ $=Z . UUCP. > $*       $#uucp-uudom $@ $1 $: $1 < @ $2 .UUCP. > $3     @host.UUCP: ...
 PUSHDIVERT(4)
 # resolve locally connected UUCP links
 R$* < @ $=Z . UUCP. > $*       $#uucp-uudom $@ $1 $: $1 < @ $2 .UUCP. > $3     @host.UUCP: ...

-R< @ $=Y . UUCP. > : $+                $#uucp-new $@ $1 $: $2  @host.UUCP: ...
-R$+ < @ $=Y . UUCP. >          $#uucp-new $@ $2 $: $1  user@host.UUCP
-R< @ $=U . UUCP. > : $+                $#uucp-old $@ $1 $: $2  @host.UUCP: ...
-R$+ < @ $=U . UUCP. >          $#uucp-old $@ $2 $: $1  user@host.UUCP
+R$* < @ $=Y . UUCP. > $*       $#uucp-new $@ $2 $: $1 < @ $2 .UUCP. > $3
+R$* < @ $=U . UUCP. > $*       $#uucp-old $@ $2 $: $1 < @ $2 .UUCP. > $3

 POPDIVERT
 POPDIVERT