From 299b2a180b777a5879419e3f6352796f66cd4267 Mon Sep 17 00:00:00 2001 From: Max Khon Date: Mon, 5 Apr 2004 16:26:22 +0000 Subject: [PATCH] Allow this script to be used for Postfix: - Use sendmail_foo variables after load_rc_config so that they actually work. - Utilize sendmail_procname. - Check sendmail_submit_enable instead of sendmail_enable when dealing with mail submission MTA. --- etc/rc.d/sendmail | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/etc/rc.d/sendmail b/etc/rc.d/sendmail index a921267f7efd..05dbd3f9809c 100755 --- a/etc/rc.d/sendmail +++ b/etc/rc.d/sendmail @@ -18,10 +18,11 @@ name="sendmail" rcvar=`set_rcvar` required_files="/etc/mail/${name}.cf" -command=${sendmail_program:-/usr/sbin/sendmail} -pidfile=${sendmail_pidfile:-/var/run/sendmail.pid} load_rc_config $name +command=${sendmail_program:-/usr/sbin/sendmail} +pidfile=${sendmail_pidfile:-/var/run/sendmail.pid} +procname=${sendmail_procname:-/usr/sbin/sendmail} case ${sendmail_enable} in [Nn][Oo][Nn][Ee]) @@ -73,7 +74,7 @@ run_rc_command "$1" required_files= -if ! checkyesno sendmail_enable; then +if ! checkyesno sendmail_submit_enable; then name="sendmail_submit" rcvar=`set_rcvar` start_cmd="${command} ${sendmail_submit_flags}"