From nobody Tue Dec 03 10:49:01 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y2cpQ1hwXz5fnY1; Tue, 03 Dec 2024 10:49:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y2cpQ19PYz4lPr; Tue, 3 Dec 2024 10:49:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733222942; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UHZN4LBWz627YHzbXVxnGHJAgxkoUdjA2UMPwUKhmH4=; b=Lj4Ym0QD8yrKKnspkWUzUBrUOzPAMT1q3PRZ4K63jfYhGWSZSsmrurLfUCfGOgRbWlLGbV m8iN2maJ/BBEd5gNYPiF3ViHO2vt6Ggk3g2KoOi7Q3QRWS8xcLb20NoiRBT79kcQtXLpyo 8XD5unPy00hyJ1OKjRskBKQlpUCyvvKzjAAQzRifWB1MFGKwwf37jvJc9hhOYR8wljXS0k AtOQ4ASn4o9CkWcbC1flquvAv25L/vfDXIIOQjL1JwpwBcmff+utI2XhNMHptHXPC7WVGf +l/IzhryA+PZ9F82y6ij6S/9cy44PnvUlWO9yG14y8CPfzRwpBhY2RpcWa0vyg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733222942; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UHZN4LBWz627YHzbXVxnGHJAgxkoUdjA2UMPwUKhmH4=; b=eePf77IEmMCTxa7E/tX2gHk6+QhzxThWo5LNyWG/jaMuL9og/7Rr7U/dV4sN+Alh1Hg31n rXwSBuKw/6RR218OKUlHLShlWePD1IWQBbIqH/rIOMIvxdMPxUI8ugoReuvJrOw77dYLwp FZfVgxLiJhKRpGSUVB3c9l1FRGREQ4ltQ1WvqvD9YG+hOK7GZfrOhrGxayStF37QBGqvBC 82pfqbpES1Cf/7siz841KOMlo3nZKy0VAxOzz+K05whhtDreswNsEoCztn8VoD7NqSsTU9 6FxYHm/58+KGTgmDwL/smAvJdo/VJ+Vs2GTBxxUFfOdKjKT2zBFiKOGbjwZ2+A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733222942; a=rsa-sha256; cv=none; b=Z8Zu+qUEPkYHNP1JQNDdpt7OeENUBFFCkmuPy6LJRJEBccWOgEzumXz14XKMk1pESfZU0V rX8OHMqeEEyQVTlRZvWz/IiYZJPby+tCxsuWY5w7tl9DpRX3Jdvc1S1w5ZpZCB5QEmWcFA vti/TqZlIOGRSYx22CWlMWxiqzUc5L6Pz6/YgpsAnuZIzi/kdJFz06l7L1vmG6qx3KnMAR /uDCJvBO7p8DCyzktMSOh0KT3qu5HJXJUyu6ZzvStf+cUQ14Otmu2/Pn3RpC7gMiW43GGu 3m/xFKgOj/akzlHfseXIrwEo6Kb7kZqJV6UuX8skS2WVJVLI+SdQM+1R/JPA/w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y2cpQ0hpMzKTS; Tue, 3 Dec 2024 10:49:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4B3An1Hg020501; Tue, 3 Dec 2024 10:49:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4B3An1cm020498; Tue, 3 Dec 2024 10:49:01 GMT (envelope-from git) Date: Tue, 3 Dec 2024 10:49:01 GMT Message-Id: <202412031049.4B3An1cm020498@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Tijl Coosemans Subject: git: 6b17d944a1d4 - main - rc.d/sendmail: Fix error with some configurations List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tijl X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6b17d944a1d448dbb797c5fa5b0778242ba02e52 Auto-Submitted: auto-generated The branch main has been updated by tijl: URL: https://cgit.FreeBSD.org/src/commit/?id=6b17d944a1d448dbb797c5fa5b0778242ba02e52 commit 6b17d944a1d448dbb797c5fa5b0778242ba02e52 Author: Tijl Coosemans AuthorDate: 2024-12-03 10:45:10 +0000 Commit: Tijl Coosemans CommitDate: 2024-12-03 10:46:39 +0000 rc.d/sendmail: Fix error with some configurations The sendmail startup script can run 4 daemons: sendmail, sendmail_submit, sendmail_outbound, and sendmail_msp_queue. Of the first 3 at most one can be enabled. There's a run_rc_command call for each and the ones for sendmail and sendmail_msp_queue run unconditionally. For some rc commands this triggers warnings or errors when sendmail_enable="NO" or sendmail_msp_queue_enable="NO". Since d2e7bb630b83 these errors are propagated and the whole script fails. Fix this by first determining which daemons are enabled, setting ${name} and ${rcvar} accordingly, and then always calling run_rc_command conditionally. Also replace ${name}.cf with sendmail.cf because ${name} isn't always sendmail. PR: 282585 Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D47757 --- libexec/rc/rc.d/sendmail | 49 +++++++++++++++++++++++++----------------------- 1 file changed, 26 insertions(+), 23 deletions(-) diff --git a/libexec/rc/rc.d/sendmail b/libexec/rc/rc.d/sendmail index 5a780e5b15a1..fa82d44ecc35 100755 --- a/libexec/rc/rc.d/sendmail +++ b/libexec/rc/rc.d/sendmail @@ -42,11 +42,28 @@ esac if checkyesno sendmail_enable; then sendmail_submit_enable="NO" sendmail_outbound_enable="NO" + _sendmail_run=true fi # If sendmail_submit_enable=yes, don't need outbound daemon if checkyesno sendmail_submit_enable; then + name="sendmail_submit" + rcvar="sendmail_submit_enable" sendmail_outbound_enable="NO" + _sendmail_run=true +fi + +if checkyesno sendmail_outbound_enable; then + name="sendmail_outbound" + rcvar="sendmail_outbound_enable" + _sendmail_run=true +fi + +if checkyesno sendmail_msp_queue_enable; then + _sendmail_msp_queue_run=true +else + # Make sure run_rc_command is called at least once. + _sendmail_run=true fi sendmail_cert_create() @@ -166,8 +183,8 @@ sendmail_precmd() # Die if there's pre-8.10 custom configuration file. This check is # mandatory for smooth upgrade. See NetBSD PR 10100 for details. # - if checkyesno ${rcvar} && [ -f "/etc/${name}.cf" ]; then - if ! cmp -s "/etc/mail/${name}.cf" "/etc/${name}.cf"; then + if checkyesno ${rcvar} && [ -f "/etc/sendmail.cf" ]; then + if ! cmp -s "/etc/mail/sendmail.cf" "/etc/sendmail.cf"; then warn \ "${name} was not started; you have multiple copies of sendmail.cf." return 1 @@ -205,33 +222,19 @@ sendmail_precmd() fi } -run_rc_command "$1" -_ret=$? - -required_files= - -if checkyesno sendmail_submit_enable; then - name="sendmail_submit" - rcvar="sendmail_submit_enable" - _rc_restart_done=false +if ${_sendmail_run:-false}; then run_rc_command "$1" - _ret=$(( _ret > $? ? _ret : $? )) fi +_ret=$? -if checkyesno sendmail_outbound_enable; then - name="sendmail_outbound" - rcvar="sendmail_outbound_enable" +if ${_sendmail_msp_queue_run:-false}; then + name="sendmail_msp_queue" + rcvar="sendmail_msp_queue_enable" + pidfile="${sendmail_msp_queue_pidfile:-/var/spool/clientmqueue/sm-client.pid}" + required_files="/etc/mail/submit.cf" _rc_restart_done=false run_rc_command "$1" _ret=$(( _ret > $? ? _ret : $? )) fi -name="sendmail_msp_queue" -rcvar="sendmail_msp_queue_enable" -pidfile="${sendmail_msp_queue_pidfile:-/var/spool/clientmqueue/sm-client.pid}" -required_files="/etc/mail/submit.cf" -_rc_restart_done=false -run_rc_command "$1" -_ret=$(( _ret > $? ? _ret : $? )) - (exit "$_ret")