From 3985693d095687c838e01df0861a4081f487ee0e Mon Sep 17 00:00:00 2001 From: cjc Date: Sun, 17 Feb 2002 02:01:15 +0000 Subject: Remove check for sendmail.conf before even trying to start sendmail. Checking for the existence of sendmail.cf is rather silly when someone is using the mailwrapper(8) to run a mail daemon that is not actually sendmail(8). It is also probably better to let sendmail(8) actually try to start and error out if the administrator has 'sendmail_enable="YES"' but no sendmail.conf. At present, it would fail silently. Reviewed by: gshapiro MFC after: 2 days --- etc/rc | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) (limited to 'etc/rc') diff --git a/etc/rc b/etc/rc index 7ed6443..e2fa9960 100644 --- a/etc/rc +++ b/etc/rc @@ -687,22 +687,20 @@ case ${usbd_enable} in ;; esac -if [ -r /etc/mail/sendmail.cf ]; then - case ${sendmail_enable} in +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_flags} - ;; - *) - case ${sendmail_outbound_enable} in - [Yy][Ee][Ss]) - echo -n ' sendmail' - /usr/sbin/sendmail ${sendmail_outbound_flags} - ;; - esac + /usr/sbin/sendmail ${sendmail_outbound_flags} ;; esac -fi + ;; +esac echo '.' -- cgit v1.1