BSD 4_2 release

[unix-history] / usr / src / usr.lib / sendmail / cf / tcpm.m4

diff --git a/usr/src/usr.lib/sendmail/cf/tcpm.m4 b/usr/src/usr.lib/sendmail/cf/tcpm.m4
index 822e24d..f47e23f 100644 (file)
--- a/usr/src/usr.lib/sendmail/cf/tcpm.m4
+++ b/usr/src/usr.lib/sendmail/cf/tcpm.m4
@@ -3,7 +3,7 @@
 #####
 #####          Arpanet TCP Mailer specification
 #####
 #####
 #####          Arpanet TCP Mailer specification
 #####

-#####          @(#)tcpm.m4     3.11            2/24/83
+#####          @(#)tcpm.m4     4.1             7/25/83

 #####
 ############################################################
 ############################################################
 #####
 ############################################################
 ############################################################


@@ -12,24 +12,32 @@ Mtcp,       P=[IPC], F=msDFMueXL, S=14, R=14, A=IPC $h, E=\r\n
 
 S14
 
 
 S14
 

-# pass <route-addr>'s through unchanged
-R<@$+>$*               $@<@$1>$2                       <route-addr> syntax
+# pass <route-addr>'s through
+R<@$+>$*               $@<@$1>$2                       resolve <route-addr>

 
 

-# convert the address to old format
-R$+                    $:$>5$1                         => old format
+# map colons to dots everywhere.....
+R$*:$*                 $1.$2                           map colons to dots

 
 # handle the simple case....
 R$+<@$-.ARPA>          $@$1<@$2.ARPA>                  user@host.ARPA
 
 
 # handle the simple case....
 R$+<@$-.ARPA>          $@$1<@$2.ARPA>                  user@host.ARPA
 

-# output local hosts in host.user@Berkeley syntax (ugh!)
-R$+<@$*LOCAL>          $@$2$1<@$A>                     local names
-R$+<@$*$=S>            $@$2$3.$1<@$A>                  local names
-R$+<@$*$=Z>            $@$2$3.$1<@$A>                  local names
+# fully qualify computer center names so the rest works nicely
+R$+<@$+.CC>            $1<@$2.CC.LOCAL>                user@host.CC
+
+# output local hosts in user%host@Berkeley syntax
+R$+<@LOCAL>            $@$1<@$A>                       local names
+R$+<@$+.LOCAL>         $@$1%$2<@$A>                    local hosts
+R$+<@$*$=S>            $@$1%$2$3<@$A>
+R$+<@$*$=Z>            $@$1%$2$3<@$A>

 
 

+# handle other external cases

 R$+<@$->               $@$1<@$2>                       no .ARPA on simple names
 R$+<@$+.$-.ARPA>       $@$1%$2<@$3.ARPA>               approximate something
 R$+<@[$+]>             $@$1<@[$2]>                     already ok
 R$+<@$->               $@$1<@$2>                       no .ARPA on simple names
 R$+<@$+.$-.ARPA>       $@$1%$2<@$3.ARPA>               approximate something
 R$+<@[$+]>             $@$1<@[$2]>                     already ok

-R$+<@$+>               $@$1<@$2>                       hmmmmmmmmm......
+
+# convert remaining addresses to old format and externalize appropriately
+R$+                    $:$>5$1                         => old format

 R$-:$+                 $@$1.$2<@$A>                    convert berk hosts
 R$-:$+                 $@$1.$2<@$A>                    convert berk hosts

-R$+                    $:$w.$1<@$A>                    tack on our hostname
-R$=R.$+<@$=A>          $2<@$3>                         strip unneeded relay
+R$+<@$+>               $@$1%$2<@$A>                    pessmize
+R$+                    $:$1%$w<@$A>                    tack on our hostname
+R$+%$=R<@$=A>          $1<@$3>                         strip unneeded relay