[PATCH pmg-api] config: smtp-welcomelist: avoid short-circuiting due to side-effects

[PATCH pmg-api] config: smtp-welcomelist: avoid short-circuiting due to side-effects

[Stoiko Ivanov]

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 <s.ivanov@proxmox.com>
---
 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

applied: [PATCH pmg-api] config: smtp-welcomelist: avoid short-circuiting due to side-effects

[Thomas Lamprecht]

On Wed, 10 Jun 2026 11:13:53 +0200, Stoiko Ivanov wrote:
> 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
> 
> [...]

Applied, thanks!

[1/1] config: smtp-welcomelist: avoid short-circuiting due to side-effects
      commit: 02f0186c63e984e2b423f21fec3419eba35efebd