From owner-cvs-all Thu Apr 4 17:58:39 2002 Delivered-To: cvs-all@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id A957237B41D; Thu, 4 Apr 2002 17:58:31 -0800 (PST) Received: (from gshapiro@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g351wUK17088; Thu, 4 Apr 2002 17:58:30 -0800 (PST) (envelope-from gshapiro) Message-Id: <200204050158.g351wUK17088@freefall.freebsd.org> From: Gregory Neil Shapiro Date: Thu, 4 Apr 2002 17:58:30 -0800 (PST) To: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org Subject: cvs commit: src/etc rc src/etc/defaults rc.conf src/share/man/man5 rc.conf.5 X-FreeBSD-CVS-Branch: RELENG_4 Sender: owner-cvs-all@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG gshapiro 2002/04/04 17:58:30 PST Modified files: (Branch: RELENG_4) etc rc etc/defaults rc.conf share/man/man5 rc.conf.5 Log: MFC: Provide a way for users to completely prevent sendmail from trying to start at boot time. Instead of rc.conf's sendmail_enable only accepting YES or NO, it can now also accept NONE. If set to NONE, none of the other sendmail related startup items will be done. Remove an extra queue running daemon might be started that wasn't necessary (it didn't hurt anything but it wasn't needed). The new logic is: # MTA if ${sendmail_enable} == NONE # Do nothing else if ${sendmail_enable} == YES start sendmail with ${sendmail_flags} else if ${sendmail_submit_enable} == YES start sendmail with ${sendmail_submit_flags} else if ${sendmail_outbound_enable} == YES start sendmail with ${sendmail_outbound_flags} endif # MSP Queue Runner if ${sendmail_enable} != NONE && [ -r /etc/mail/submit.cf] && ${sendmail_msp_queue_enable} == YES start sendmail with ${sendmail_msp_queue_flags} endif Revision Changes Path 1.141 +7 -6 src/etc/defaults/rc.conf 1.307 +27 -15 src/etc/rc 1.158 +14 -5 src/share/man/man5/rc.conf.5 Revision Changes Path 1.53.2.51 +7 -6 src/etc/defaults/rc.conf 1.212.2.46 +27 -15 src/etc/rc 1.64.2.47 +14 -5 src/share/man/man5/rc.conf.5 To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe cvs-all" in the body of the message