Add infrastructure for sendmail 8.12. If users are not starting a daemon

at boot (sendmail_enable=NO), a localhost-only daemon may started
(sendmail_submit_enable) as it is needed to accept mail from command line
submissions.  If this isn't desired, see etc/mail/README for more hints.

Optionally (sendmail_msp_queue_enable) start a queue runner for the
submission queue in case a daemon isn't available to accept command line
submitted mail at submission time.

Note that the syslog labels for all of these sendmail processes have been
uniquified for easier log parsing.

etc/defaults/rc.conf

@@ -336,9 +336,15 @@ lpd_flags=""		# Flags to lpd (if enabled).
 usbd_enable="NO"	# Run the usbd daemon.
 usbd_flags=""		# Flags to usbd (if enabled).
 sendmail_enable="NO"	# Run the sendmail inbound daemon (YES/NO).
-sendmail_flags="-bd -q30m" # Flags to sendmail (as a server)
+sendmail_flags="-L sm-mta -bd -q30m" # Flags to sendmail (as a server)
 sendmail_outbound_enable="YES"	# Dequeue stuck mail (YES/NO).
-sendmail_outbound_flags="-q30m" # Flags to sendmail (outbound only)
+sendmail_outbound_flags="-L sm-queue -q30m" # Flags to sendmail (outbound only)
+sendmail_msp_queue_enable="YES"	# Dequeue stuck clientmqueue mail (YES/NO).
+sendmail_msp_queue_flags="-L sm-msp-queue -Ac -q30m"
+				# Dequeue stuck clientmqueue mail (YES/NO).
+sendmail_submit_enable="YES"	# Start a localhost-only MTA for mail submission
+sendmail_submit_flags="-L sm-mta-submit -bd -q30m -ODaemonPortOptions=Addr=localhost"
+				# Flags for localhost-only MTA
 dumpdev="NO"		# Device name to crashdump to (or NO).
 dumpdir="/var/crash"	# Directory where crash dumps are to be stored
 savecore_flags=""	# Used if dumpdev is enabled above, and present.

etc/rc

@@ -695,13 +695,28 @@ case ${sendmail_enable} in
 *)
 	case ${sendmail_outbound_enable} in
 	[Yy][Ee][Ss])
-		echo -n ' sendmail'
+		echo -n ' sendmail-outbound'
 		/usr/sbin/sendmail ${sendmail_outbound_flags}
 		;;
 	esac
+	case ${sendmail_submit_enable} in
+	[Yy][Ee][Ss])
+		echo -n ' sendmail-submit'
+		/usr/sbin/sendmail ${sendmail_submit_flags}
+		;;
+	esac
 	;;
 esac
 
+if [ -r /etc/mail/submit.cf ]; then
+	case ${sendmail_msp_queue_enable} in
+	[Yy][Ee][Ss])
+		echo -n ' sendmail-clientmqueue'
+		/usr/sbin/sendmail ${sendmail_msp_queue_flags}
+		;;
+	esac
+fi
+
 echo '.'
 
 # Recover vi editor files.

share/man/man5/rc.conf.5

@@ -1630,6 +1630,23 @@ is set to
 these are the flags to pass to the
 .Xr sendmail 8
 daemon.
+.It Va sendmail_submit_enable
+.Pq Vt bool
+If set to
+.Dq YES
+and
+.Va sendmail_enable
+is set to
+.Dq NO
+then run
+.Xr sendmail 8
+using
+.Va sendmail_submit_flags
+instead of
+.Va sendmail_flags .
+This is intended to allow local mail submission via
+a localhost-only listening SMTP service required for running
+.Xr sendmail 8 as a non-set-user-ID binary.
 .It Va sendmail_outbound_enable
 .Pq Vt bool
 If set to
@@ -1659,6 +1676,25 @@ is set to
 then these are the flags to pass to the
 .Xr sendmail 8
 daemon.
+.It Va sendmail_msp_queue_enable
+.Pq Vt bool
+If set to
+.Dq YES ,
+start a client (MSP) queue runner
+.Xr sendmail 8
+daemon at system boot time.
+As of sendmail 8.12, a separate queue is used for command line
+submissions.  The client queue runner assures that nothing is
+left behind in the submission queue.
+.It Va sendmail_msp_queue_flags
+.Pq Vt str
+If
+.Va sendmail_msp_queue_enable
+is set to
+.Dq YES ,
+these are the flags to pass to the
+.Xr sendmail 8
+daemon.
 .It Va dumpdev
 .Pq Vt str
 Indicates the device (usually a swap partition) to which a crash dump