summaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authorpeter <peter@FreeBSD.org>2001-03-13 05:53:16 +0000
committerpeter <peter@FreeBSD.org>2001-03-13 05:53:16 +0000
commit3973aeb5ebaa6d704ef80ff1f91e85eb9d36b6c5 (patch)
tree9e79b41aa8c739617d49708d1422ceaa392faec9 /etc
parent95047bd0c5543dcbd3f9b9d3834ac449043c8e82 (diff)
downloadFreeBSD-src-3973aeb5ebaa6d704ef80ff1f91e85eb9d36b6c5.zip
FreeBSD-src-3973aeb5ebaa6d704ef80ff1f91e85eb9d36b6c5.tar.gz
At great personal risk, touch the sendmail startup again. This adds easy
seperate knobs for inbound (accepting SMTP connections) and outbound (just occasionally dequeueing) sendmail daemon startup.
Diffstat (limited to 'etc')
-rw-r--r--etc/defaults/rc.conf6
-rw-r--r--etc/rc25
2 files changed, 21 insertions, 10 deletions
diff --git a/etc/defaults/rc.conf b/etc/defaults/rc.conf
index 564c664..cb4b2d4 100644
--- a/etc/defaults/rc.conf
+++ b/etc/defaults/rc.conf
@@ -304,8 +304,10 @@ lpd_program="/usr/sbin/lpd" # path to lpd, if you want a different one.
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).
diff --git a/etc/rc b/etc/rc
index 843e1ae..3b8440f 100644
--- a/etc/rc
+++ b/etc/rc
@@ -591,14 +591,6 @@ case ${lpd_enable} in
;;
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
@@ -614,6 +606,23 @@ case ${usbd_enable} in
;;
esac
+if [ -r /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 '.'
# Recover vi editor files.
OpenPOWER on IntegriCloud