integrate mail11 support from Barb Dijker

SCCS-vsn: usr.sbin/sendmail/cf/m4/proto.m4 8.74
SCCS-vsn: usr.sbin/sendmail/Files.cf 8.13

diff --git a/usr/src/usr.sbin/sendmail/Files.cf b/usr/src/usr.sbin/sendmail/Files.cf
index 369cf52..63f0f01 100644 (file)
--- a/usr/src/usr.sbin/sendmail/Files.cf
+++ b/usr/src/usr.sbin/sendmail/Files.cf
@@ -1,4 +1,4 @@
-#      @(#)Files.cf    8.12 (Berkeley) %G%
+#      @(#)Files.cf    8.13 (Berkeley) %G%

 cf/README
 cf/cf/Makefile
 cf/cf/Makefile.dist
 cf/README
 cf/cf/Makefile
 cf/cf/Makefile.dist


@@ -58,6 +58,7 @@ cf/m4/proto.m4
 cf/m4/version.m4
 cf/mailer/fax.m4
 cf/mailer/local.m4
 cf/m4/version.m4
 cf/mailer/fax.m4
 cf/mailer/local.m4

+cf/mailer/mail11.m4

 cf/mailer/pop.m4
 cf/mailer/procmail.m4
 cf/mailer/smtp.m4
 cf/mailer/pop.m4
 cf/mailer/procmail.m4
 cf/mailer/smtp.m4

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

 
 MAILER(local)dnl
 
 
 MAILER(local)dnl
 


@@ -86,6 +86,7 @@ CPBITNET
 
 ')dnl
 ifdef(`DECNET_RELAY',
 
 ')dnl
 ifdef(`DECNET_RELAY',

+`define(`_USE_DECNET_SYNTAX_')dnl

 # DECnet relay host
 DC`'DECNET_RELAY
 CPDECNET
 # DECnet relay host
 DC`'DECNET_RELAY
 CPDECNET


@@ -463,9 +464,10 @@ R$- ! $+           $@ $>96 $2 < @ $1 .UUCP >       resolve uucp names
 R$+ . $- ! $+          $@ $>96 $3 < @ $1 . $2 >                domain uucps
 R$+ ! $+               $@ $>96 $2 < @ $1 .UUCP >       uucp subdomains
 ')
 R$+ . $- ! $+          $@ $>96 $3 < @ $1 . $2 >                domain uucps
 R$+ ! $+               $@ $>96 $2 < @ $1 .UUCP >       uucp subdomains
 ')

-ifdef(`DECNET_RELAY',
+ifdef(`_USE_DECNET_SYNTAX_',

 `# convert node::user addresses into a domain-based address
 R$- :: $+              $@ $>96 $2 < @ $1 .DECNET >     resolve DECnet names
 `# convert node::user addresses into a domain-based address
 R$- :: $+              $@ $>96 $2 < @ $1 .DECNET >     resolve DECnet names

+R$- . $- :: $+         $@ $>96 $3 < @ $1.$2 .DECNET >  numeric DECnet addr

 ',
        `dnl')
 # if we have % signs, take the rightmost one
 ',
        `dnl')
 # if we have % signs, take the rightmost one


@@ -549,6 +551,10 @@ ifdef(`_NO_UUCP_', `dnl',
 `# UUCP must always be presented in old form
 R$+ @ $- . UUCP                $2!$1                           u@h.UUCP => h!u')
 
 `# UUCP must always be presented in old form
 R$+ @ $- . UUCP                $2!$1                           u@h.UUCP => h!u')
 

+ifdef(`_USE_DECNET_SYNTAX_',
+`# put DECnet back in :: form
+R$+ @ $+ . DECNET      $2 :: $1                        u@h.DECNET => h::u',
+       `dnl')

 # delete duplicate local names
 R$+ % $=w @ $=w                $1 @ $j                         u%host@host => u@host
 
 # delete duplicate local names
 R$+ % $=w @ $=w                $1 @ $j                         u%host@host => u@host