Browse Source

If /etc/mailer.conf specifies a mailer other than sendmail, there

may be no /etc/mail/sendmail.cf so don't include that in the check
for whether or not to run /usr/sbin/sendmail.  Instead, check for
the existence of /etc/mailer.conf.  Pointed out by Theo.
OPENBSD_2_8
millert 24 years ago
parent
commit
856e772218
1 changed files with 5 additions and 4 deletions
  1. +5
    -4
      src/etc/rc

+ 5
- 4
src/etc/rc View File

@ -1,4 +1,4 @@
# $OpenBSD: rc,v 1.153 2000/09/06 17:19:27 millert Exp $
# $OpenBSD: rc,v 1.154 2000/10/07 00:03:52 millert Exp $
# System startup script run by init on autoboot # System startup script run by init on autoboot
# or after single-user. # or after single-user.
@ -430,10 +430,11 @@ if [ X${lpd} = X"YES" ]; then
fi fi
# $sendmail_flags is imported from /etc/rc.conf; # $sendmail_flags is imported from /etc/rc.conf;
# If $sendmail_flags == NO or /etc/mail/sendmail.cf doesn't exist, then
# If $sendmail_flags == NO or /etc/mailer.conf doesn't exist, then
# sendmail isn't run. We call sendmail with a full path so that # sendmail isn't run. We call sendmail with a full path so that
# SIGHUP works.
if [ "X${sendmail_flags}" != X"NO" -a -s /etc/mail/sendmail.cf ]; then
# SIGHUP works. Note that /usr/sbin/sendmail may actually call a
# mailer other than sendmail, depending on /etc/mailer.conf.
if [ "X${sendmail_flags}" != X"NO" -a -s /etc/mailer.conf ]; then
echo -n ' sendmail'; ( /usr/sbin/sendmail ${sendmail_flags} >/dev/null 2>&1 & ) echo -n ' sendmail'; ( /usr/sbin/sendmail ${sendmail_flags} >/dev/null 2>&1 & )
fi fi


Loading…
Cancel
Save