avoid extra qualification of top level pseudo-domains and gateways

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

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

 
 MAILER(local)dnl
 
 
 MAILER(local)dnl
 


@@ -20,6 +20,8 @@ V4')
 #   local info   #
 ##################
 
 #   local info   #
 ##################
 

+CP.
+

 Cwlocalhost
 ifdef(`USE_CW_FILE',
 `# file containing names of hosts for which we receive email
 Cwlocalhost
 ifdef(`USE_CW_FILE',
 `# file containing names of hosts for which we receive email


@@ -28,21 +30,25 @@ CONCAT(`Fw', confCW_FILE)', `dnl')
 ifdef(`UUCP_RELAY',
 `# UUCP relay host
 CONCAT(DY, UUCP_RELAY)
 ifdef(`UUCP_RELAY',
 `# UUCP relay host
 CONCAT(DY, UUCP_RELAY)

+CPUUCP

 
 ')dnl
 ifdef(`BITNET_RELAY',
 `#  BITNET relay host
 CONCAT(DB, BITNET_RELAY)
 
 ')dnl
 ifdef(`BITNET_RELAY',
 `#  BITNET relay host
 CONCAT(DB, BITNET_RELAY)

+CPBITNET

 
 ')dnl
 ifdef(`CSNET_RELAY',
 `# CSNET relay host
 CONCAT(DC, CSNET_RELAY)
 
 ')dnl
 ifdef(`CSNET_RELAY',
 `# CSNET relay host
 CONCAT(DC, CSNET_RELAY)

+CPCSNET

 
 ')dnl
 ifdef(`FAX_RELAY',
 `# FAX relay host
 CONCAT(DF, FAX_RELAY)
 
 ')dnl
 ifdef(`FAX_RELAY',
 `# FAX relay host
 CONCAT(DF, FAX_RELAY)

+CPFAX

 
 ')dnl
 ifdef(`SMART_HOST',
 
 ')dnl
 ifdef(`SMART_HOST',


@@ -402,7 +408,7 @@ ifdef(`_OLD_SENDMAIL_',
 ')
 ifdef(`_NO_CANONIFY_', `dnl',
 `# pass to name server to make hostname canonical
 ')
 ifdef(`_NO_CANONIFY_', `dnl',
 `# pass to name server to make hostname canonical

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

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