From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) by lore.proxmox.com (Postfix) with ESMTPS id ABC381FF146 for ; Tue, 09 Jun 2026 11:11:34 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 804F29934; Tue, 9 Jun 2026 11:11:34 +0200 (CEST) Message-ID: Date: Tue, 9 Jun 2026 11:11:28 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Beta Subject: Re: [PATCH pmg-api v2] config: do not shortcircuit smtp-welcomelist generation To: Stoiko Ivanov , pmg-devel@lists.proxmox.com References: <20260609090517.828636-1-s.ivanov@proxmox.com> Content-Language: en-US From: Dominik Csapak In-Reply-To: <20260609090517.828636-1-s.ivanov@proxmox.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1780996244013 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.049 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 Message-ID-Hash: L2X5KEBAOVYQMOFI6GTPAY4C6AZV7LFP X-Message-ID-Hash: L2X5KEBAOVYQMOFI6GTPAY4C6AZV7LFP X-MailFrom: d.csapak@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: after applying these changes and rebooting, receiving mail works again. changes look sensible, so Tested-by: Dominik Csapak Reviewed-by: Dominik Csapak On 6/9/26 11:04 AM, Stoiko Ivanov wrote: > 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 > --- > v1->v2: > * fix the use of ||= I kept by mistake for the 3. and 4. call to > write_smtp_welcomlist - thanks to Dominik for spotting it! > > 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..f48c31dc 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; > }