From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9]) by lore.proxmox.com (Postfix) with ESMTPS id E87851FF13A for ; Wed, 10 Jun 2026 11:14:06 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id B2B2877A2; Wed, 10 Jun 2026 11:14:06 +0200 (CEST) From: Stoiko Ivanov To: pmg-devel@lists.proxmox.com Subject: [PATCH pmg-api] config: smtp-welcomelist: avoid short-circuiting due to side-effects Date: Wed, 10 Jun 2026 11:13:53 +0200 Message-ID: <20260610091356.958395-1-s.ivanov@proxmox.com> X-Mailer: git-send-email 2.47.3 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1781082795816 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.084 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [master.cf,config.pm] Message-ID-Hash: RAVP2FQB3AHZRK5RCBLVFSII4EGBVQ5S X-Message-ID-Hash: RAVP2FQB3AHZRK5RCBLVFSII4EGBVQ5S X-MailFrom: s.ivanov@proxmox.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list List-Id: Proxmox Mail Gateway development discussion List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: the version with the post-if also reads a bit nicer to me. a similar issue was fixed in 2022: 991d8f1c ("pmg-daily: avoid short-circuting update of local channels") minimally tested by: * removing all smtp-welcomelist files in /etc/postfix and their postmap .db result (senderaccess rcptaccess clientaccess postscreen_access) * manually modifying /etc/postfix/master.cf (adding a -v to smtpd) * adding an entry to the Mail Proxy Welcomelist in the GUI * checking that all files were created and that postfix was reloaded Fixes: 17f17bce ("config: do not shortcircuit smtp-welcomelist generation") Signed-off-by: Stoiko Ivanov --- src/PMG/Config.pm | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/src/PMG/Config.pm b/src/PMG/Config.pm index 9b22b676..83d687bd 100644 --- a/src/PMG/Config.pm +++ b/src/PMG/Config.pm @@ -1878,15 +1878,10 @@ sub rewrite_postfix_welcomelist { } my $changes = 0; - my $ret; - $ret = $write_smtp_welcomelist->("/etc/postfix/senderaccess", $fromlist); - $changes ||= $ret; - $ret = $write_smtp_welcomelist->("/etc/postfix/rcptaccess", $tolist); - $changes ||= $ret; - $ret = $write_smtp_welcomelist->("/etc/postfix/clientaccess", $clientlist); - $changes ||= $ret; - $ret = $write_smtp_welcomelist->("/etc/postfix/postscreen_access", $clientlist, 'permit'); - $changes ||= $ret; + $changes = 1 if $write_smtp_welcomelist->("/etc/postfix/senderaccess", $fromlist); + $changes = 1 if $write_smtp_welcomelist->("/etc/postfix/rcptaccess", $tolist); + $changes = 1 if $write_smtp_welcomelist->("/etc/postfix/clientaccess", $clientlist); + $changes = 1 if $write_smtp_welcomelist->("/etc/postfix/postscreen_access", $clientlist, 'permit'); return $changes; } -- 2.47.3