add FEATURE(always_add_domain); avoid rewriting $=w into $j

(some hosts have multiple "canonical" names)

SCCS-vsn: usr.sbin/sendmail/cf/m4/proto.m4 6.40
SCCS-vsn: usr.sbin/sendmail/cf/m4/version.m4 6.30

diff --git a/usr/src/usr.sbin/sendmail/cf/m4/proto.m4 b/usr/src/usr.sbin/sendmail/cf/m4/proto.m4
index 7c180a6..3885de3 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.39 (Berkeley) %G%')
+VERSIONID(`@(#)proto.m4        6.40 (Berkeley) %G%')

 
 MAILER(local)dnl
 
 
 MAILER(local)dnl
 


@@ -380,8 +380,10 @@ R$* @ $*           $@ $>6 $1 < @ $2 >              Insert < > and finish
 S6
 
 # handle special cases for local names
 S6
 
 # handle special cases for local names

-R$* < @ $=w > $*               $: $1 < @ $j . > $3             no domain at all
-R$* < @ $=w . UUCP > $*                $: $1 < @ $j . > $3             .UUCP domain
+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')

 undivert(2)dnl
 
 ifdef(`_NO_UUCP_', `dnl',
 undivert(2)dnl
 
 ifdef(`_NO_UUCP_', `dnl',


@@ -410,9 +412,6 @@ ifdef(`_NO_CANONIFY_', `dnl',
 `# pass to name server to make hostname canonical
 R$* < @ $* $~P > $*            $: $1 < @ $[ $2 $3 $] > $4
 ')
 `# pass to name server to make hostname canonical
 R$* < @ $* $~P > $*            $: $1 < @ $[ $2 $3 $] > $4
 ')

-# handle possible alternate names
-R$* < @ $=w . $m . > $*                $: $1 < @ $j . > $3
-R$* < @ $=w . $m > $*          $: $1 < @ $j . > $3

 undivert(8)dnl
 
 # if this is the local hostname, make sure we treat is as canonical
 undivert(8)dnl
 
 # if this is the local hostname, make sure we treat is as canonical

diff --git a/usr/src/usr.sbin/sendmail/cf/m4/version.m4 b/usr/src/usr.sbin/sendmail/cf/m4/version.m4
index 47879d7..e5c42ed 100644 (file)
--- a/usr/src/usr.sbin/sendmail/cf/m4/version.m4
+++ b/usr/src/usr.sbin/sendmail/cf/m4/version.m4
@@ -6,8 +6,8 @@ divert(-1)
 #
 # %sccs.include.redist.sh%
 #
 #
 # %sccs.include.redist.sh%
 #

-VERSIONID(`@(#)version.m4      6.29 (Berkeley) %G%')
+VERSIONID(`@(#)version.m4      6.30 (Berkeley) %G%')

 #
 divert(0)
 # Configuration version number
 #
 divert(0)
 # Configuration version number

-DZ6.29
+DZ6.30