Index: rc
===================================================================
RCS file: /home/ncvs/src/etc/rc,v
retrieving revision 1.256
diff -u -r1.256 rc
--- rc	2001/03/12 05:18:00	1.256
+++ rc	2001/03/13 05:37:53
@@ -591,14 +591,6 @@
 	;;
 esac
 
-case ${sendmail_enable} in
-[Yy][Ee][Ss])
-	if [ -r /etc/mail/sendmail.cf ]; then
-		echo -n ' sendmail';	/usr/sbin/sendmail ${sendmail_flags}
-	fi
-	;;
-esac
-
 case ${sshd_enable} in
 [Yy][Ee][Ss])
 	if [ -x ${sshd_program:-/usr/sbin/sshd} ]; then
@@ -613,6 +605,23 @@
 	echo -n ' usbd';	/usr/sbin/usbd ${usbd_flags}
 	;;
 esac
+
+if [ -f /etc/mail/sendmail.cf ]; then
+	case ${sendmail_enable} in
+	[Yy][Ee][Ss])
+		echo -n ' sendmail'
+		/usr/sbin/sendmail ${sendmail_flags}
+		;;
+	*)
+		case ${sendmail_outbound_enable} in
+		[Yy][Ee][Ss])
+			echo -n ' sendmail'
+			/usr/sbin/sendmail ${sendmail_outbound_flags}
+			;;
+		esac
+		;;
+	esac
+fi
 
 echo '.'
 
Index: defaults/rc.conf
===================================================================
RCS file: /home/ncvs/src/etc/defaults/rc.conf,v
retrieving revision 1.93
diff -u -r1.93 rc.conf
--- defaults/rc.conf	2001/03/12 05:18:03	1.93
+++ defaults/rc.conf	2001/03/13 05:37:53
@@ -304,8 +304,10 @@
 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 daemon (YES/NO).
-sendmail_flags="-bd -q30m" # Flags to sendmail (if enabled)
+sendmail_enable="NO"	# Run the sendmail inbound daemon (YES/NO).
+sendmail_flags="-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)
 dumpdev="NO"		# Device name to crashdump to (or NO).
 savecore_flags="" 	# Used if dumpdev is enabled above, and present.
 enable_quotas="NO"      # turn on quotas on startup (or NO).