Deprecate the use of sendmail_enable="NONE" as it adversely affects the

new rcNG effort.

Submitted by:	Mike Makonnen <makonnen@pacbell.net>

2 files changed, 21 insertions, 5 deletions

diff --git a/etc/defaults/rc.conf b/etc/defaults/rc.conf
index 4188b0a44acf..aa8febc33be4 100644
--- a/etc/defaults/rc.conf
+++ b/etc/defaults/rc.conf
@@ -361,8 +361,7 @@ pcvt_monohigh="NO"	# set intensity to high on monochrome monitors (or NO).
 mta_start_script="/etc/rc.sendmail"
 			# Script to start your chosen MTA, called by /etc/rc.
 # Settings for /etc/rc.sendmail:
-sendmail_enable="NO"	# Run the sendmail inbound daemon (YES/NO/NONE).
-			# If NONE, don't start any sendmail processes.
+sendmail_enable="NO"	# Run the sendmail inbound daemon (YES/NO).
 sendmail_flags="-L sm-mta -bd -q30m" # Flags to sendmail (as a server)
 sendmail_submit_enable="YES"	# Start a localhost-only MTA for mail submission
 sendmail_submit_flags="-L sm-mta -bd -q30m -ODaemonPortOptions=Addr=localhost"
diff --git a/share/man/man8/rc.sendmail.8 b/share/man/man8/rc.sendmail.8
index 50e6749e9da4..83102c580d5d 100644
--- a/share/man/man8/rc.sendmail.8
+++ b/share/man/man8/rc.sendmail.8
@@ -108,10 +108,17 @@ run the
 .Xr sendmail 8
 daemon at system boot time.
 If set to
-.Dq Li NONE ,
-do not run any
+.Dq Li NO ,
+do not run a
+.Xr sendmail 8
+daemon to listen for incoming network mail.
+This does not preclude a
 .Xr sendmail 8
-daemons at system boot time.
+daemon listening on the SMTP port of the loopback interface.
+The
+.Dq Li NONE
+option is deprecated and should not be used.
+It will be removed in a future release.
 .It Va sendmail_flags
 .Pq Vt str
 If
@@ -233,6 +240,16 @@ if (${sendmail_enable} != NONE &&
         start sendmail with ${sendmail_msp_queue_flags}
 endif
 .Ed
+.Pp
+To completely prevent any sendmail daemons from starting you must
+set the following variables in
+/etc/rc.conf:
+.Bd -literal -offset indent
+sendmail_enable="NO"
+sendmail_submit_enable="NO"
+sendmail_outbound_enable="NO"
+sendmail_msp_queue_enable="NO"
+.El
 .Sh SEE ALSO
 .Xr rc.conf 5 ,
 .Xr rc 8 ,