add MAILER(pop)

SCCS-vsn: usr.sbin/sendmail/cf/README 8.17
SCCS-vsn: usr.sbin/sendmail/cf/m4/proto.m4 8.26

diff --git a/usr/src/usr.sbin/sendmail/cf/README b/usr/src/usr.sbin/sendmail/cf/README
index 8ce029c..5e0d912 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.16 (Berkeley) %G%
+               @(#)README      8.17 (Berkeley) %G%

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


@@ -257,6 +257,8 @@ fax         Facsimile transmission.  This is experimental and based
                on Sam Leffler's FlexFAX software.  For more information,
                see below.
 
                on Sam Leffler's FlexFAX software.  For more information,
                see below.
 

+pop            Post Office Protocol.
+

 
 +----------+
 | FEATURES |
 
 +----------+
 | FEATURES |

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

 
 MAILER(local)dnl
 
 
 MAILER(local)dnl
 


@@ -569,6 +569,9 @@ ifdef(`BITNET_RELAY',
 ifdef(`CSNET_RELAY',
 `R$*<@$+.CSNET>$*      $#smtp $@ $C $: $1 @ $2 . CSNET $3      user@host.CSNET',
        `dnl')
 ifdef(`CSNET_RELAY',
 `R$*<@$+.CSNET>$*      $#smtp $@ $C $: $1 @ $2 . CSNET $3      user@host.CSNET',
        `dnl')

+ifdef(`_MAILER_pop_',
+`R$+ < @ POP. >                $#pop $: $1                     user@POP',
+       `dnl')

 ifdef(`_MAILER_fax_',
 `R$+ < @ $+ .FAX. >    $#fax $@ $2 $: $1               user@host.FAX',
 `ifdef(`FAX_RELAY',
 ifdef(`_MAILER_fax_',
 `R$+ < @ $+ .FAX. >    $#fax $@ $2 $: $1               user@host.FAX',
 `ifdef(`FAX_RELAY',