delete CSNET domain support

SCCS-vsn: usr.sbin/sendmail/cf/m4/proto.m4 8.27
SCCS-vsn: usr.sbin/sendmail/cf/README 8.18

diff --git a/usr/src/usr.sbin/sendmail/cf/README b/usr/src/usr.sbin/sendmail/cf/README
index 5e0d912..e2b8979 100644 (file)
--- a/usr/src/usr.sbin/sendmail/cf/README
+++ b/usr/src/usr.sbin/sendmail/cf/README
@@ -4,7 +4,7 @@
 
                Eric Allman <eric@CS.Berkeley.EDU>
 
 
                Eric Allman <eric@CS.Berkeley.EDU>
 

-               @(#)README      8.17 (Berkeley) %G%
+               @(#)README      8.18 (Berkeley) %G%

 
 
 This document describes the sendmail configuration files being used
 
 
 This document describes the sendmail configuration files being used


@@ -185,8 +185,6 @@ UUCP_RELAY  The host that will forward UUCP-addressed email.
                connected.
 BITNET_RELAY   The host that will forward BITNET-addressed email.
                If not defined, the .BITNET pseudo-domain won't work.
                connected.
 BITNET_RELAY   The host that will forward BITNET-addressed email.
                If not defined, the .BITNET pseudo-domain won't work.

-CSNET_RELAY    The host that will forward CSNET-addressed email.
-               If not defined, the .CSNET pseudo-domain won't work.

 LOCAL_RELAY    The site that will handle unqualified names -- that
                is, names with out an @domain extension.  If not set,
                they are assumed to belong on this machine.  This
 LOCAL_RELAY    The site that will handle unqualified names -- that
                is, names with out an @domain extension.  If not set,
                they are assumed to belong on this machine.  This


@@ -1037,7 +1035,7 @@ MACROS
 
    A
    B   Bitnet Relay
 
    A
    B   Bitnet Relay

-   C   CSNET Relay
+   C

    D   The local domain -- usually not needed
    E
    F   FAX Relay
    D   The local domain -- usually not needed
    E
    F   FAX Relay

diff --git a/usr/src/usr.sbin/sendmail/cf/m4/proto.m4 b/usr/src/usr.sbin/sendmail/cf/m4/proto.m4
index 87073c5..878ff87 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.26 (Berkeley) %G%')
+VERSIONID(`@(#)proto.m4        8.27 (Berkeley) %G%')

 
 MAILER(local)dnl
 
 
 MAILER(local)dnl
 


@@ -66,12 +66,6 @@ ifdef(`BITNET_RELAY',
 DB`'BITNET_RELAY
 CPBITNET
 
 DB`'BITNET_RELAY
 CPBITNET
 

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

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


@@ -565,8 +559,6 @@ ifdef(`_CLASS_X_',
 # resolve fake top level domains by forwarding to other hosts
 ifdef(`BITNET_RELAY',
 `R$*<@$+.BITNET>$*     $#smtp $@ $B $: $1 @ $2 . BITNET $3     user@host.BITNET',
 # resolve fake top level domains by forwarding to other hosts
 ifdef(`BITNET_RELAY',
 `R$*<@$+.BITNET>$*     $#smtp $@ $B $: $1 @ $2 . BITNET $3     user@host.BITNET',

-       `dnl')
-ifdef(`CSNET_RELAY',

 `R$*<@$+.CSNET>$*      $#smtp $@ $C $: $1 @ $2 . CSNET $3      user@host.CSNET',
        `dnl')
 ifdef(`_MAILER_pop_',
 `R$*<@$+.CSNET>$*      $#smtp $@ $C $: $1 @ $2 . CSNET $3      user@host.CSNET',
        `dnl')
 ifdef(`_MAILER_pop_',