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 6B9B71FF146 for ; Tue, 09 Jun 2026 10:59:42 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 18B8E9504; Tue, 9 Jun 2026 10:59:42 +0200 (CEST) From: Stoiko Ivanov To: pmg-devel@lists.proxmox.com Subject: [PATCH pmg-api] config: do not shortcircuit smtp-welcomelist generation Date: Tue, 9 Jun 2026 10:58:44 +0200 Message-ID: <20260609085851.828503-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: 1780995503457 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.086 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. [config.pm] Message-ID-Hash: L6SPCE6TUULGRXT4YF46ZMT7S7RL33FM X-Message-ID-Hash: L6SPCE6TUULGRXT4YF46ZMT7S7RL33FM 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: combining the results with ||= causes the write_smtp_welcomelist calls not to be run, after the first one signals a change. gather the combined changes in a different variable, to ensure each config-file is actually created/written, as postfix refuses to run if its config files are missing. Fixes: de0ba685 ("fix #3991: record changes to the smtp-welcomelist and reload postfix") Reported-by: Dominik Csapak Signed-off-by: Stoiko Ivanov --- src/PMG/Config.pm | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/PMG/Config.pm b/src/PMG/Config.pm index 2d2b6c83..ddbabe7e 100644 --- a/src/PMG/Config.pm +++ b/src/PMG/Config.pm @@ -1878,10 +1878,15 @@ sub rewrite_postfix_welcomelist { } my $changes = 0; - $changes ||= $write_smtp_welcomelist->("/etc/postfix/senderaccess", $fromlist); - $changes ||= $write_smtp_welcomelist->("/etc/postfix/rcptaccess", $tolist); - $changes ||= $write_smtp_welcomelist->("/etc/postfix/clientaccess", $clientlist); - $changes ||= $write_smtp_welcomelist->("/etc/postfix/postscreen_access", $clientlist, 'permit'); + 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; return $changes; } -- 2.47.3