if FEATURE(no_canonify), make certain $=w names appear canonica

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

diff --git a/usr/src/usr.sbin/sendmail/cf/m4/proto.m4 b/usr/src/usr.sbin/sendmail/cf/m4/proto.m4
index a65f959..0cec042 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.44 (Berkeley) %G%')
+VERSIONID(`@(#)proto.m4        6.45 (Berkeley) %G%')

 
 MAILER(local)dnl
 
 
 MAILER(local)dnl
 


@@ -415,10 +415,12 @@ ifdef(`_OLD_SENDMAIL_',
 `R$* < @ $+ . $+ . UUCP > $*           $@ $1 < @ $2 . $3 . > $4',
 `R$* < @ $+ . . UUCP > $*              $@ $1 < @ $2 . > $3')')
 ')
 `R$* < @ $+ . $+ . UUCP > $*           $@ $1 < @ $2 . $3 . > $4',
 `R$* < @ $+ . . UUCP > $*              $@ $1 < @ $2 . > $3')')
 ')

-ifdef(`_NO_CANONIFY_', `dnl',
+ifdef(`_NO_CANONIFY_',
+`# make sure local host names appear canonical
+R$* < @ $=w > $*               $: $1 < @ $2 . > $3',

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

-R$* < @ $* $~P > $*            $: $1 < @ $[ $2 $3 $] > $4
-')
+R$* < @ $* $~P > $*            $: $1 < @ $[ $2 $3 $] > $4')
+

 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