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 63D241FF140 for ; Fri, 13 Mar 2026 21:13:35 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 1D06BBBF8; Fri, 13 Mar 2026 21:13:44 +0100 (CET) From: Stoiko Ivanov To: pmg-devel@lists.proxmox.com Subject: [PATCH pmg-api] fix #3991: record changes to the smtp-welcomelist and reload postfix Date: Fri, 13 Mar 2026 21:13:34 +0100 Message-ID: <20260313201338.18613-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: 1773432781874 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.081 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 RCVD_IN_MSPIKE_H2 0.001 Average reputation (+2) 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: FK6ZYKP4QGZXCHIDJI4NPGMCW36AJCWZ X-Message-ID-Hash: FK6ZYKP4QGZXCHIDJI4NPGMCW36AJCWZ 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: adding an entry to the postfix welcomelist needs a reload of postfix, in order to become effective immediately. the writer sub already reflects if a change happened in its return value, we simply did not track that when deciding if postfix needs reloading. PMG::RuleDB::reload_ruledb is called with an argument only for the smtp-welcomelist (which is a special case of ruledb object), for regular objects it's called without (the API calls are generated in all cases via PMG::RuleDB::Object::register_api). Signed-off-by: Stoiko Ivanov --- src/PMG/Config.pm | 13 ++++++++----- src/PMG/DBTools.pm | 3 ++- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/PMG/Config.pm b/src/PMG/Config.pm index 495fe702..1ded3bac 100644 --- a/src/PMG/Config.pm +++ b/src/PMG/Config.pm @@ -1837,10 +1837,13 @@ sub rewrite_postfix_welcomelist { } } - $write_smtp_welcomelist->("/etc/postfix/senderaccess", $fromlist); - $write_smtp_welcomelist->("/etc/postfix/rcptaccess", $tolist); - $write_smtp_welcomelist->("/etc/postfix/clientaccess", $clientlist); - $write_smtp_welcomelist->("/etc/postfix/postscreen_access", $clientlist, 'permit'); + 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'); + + return $changes; } # rewrite /etc/postfix/* @@ -1868,7 +1871,7 @@ sub rewrite_config_postfix { postmap_tls_policy(); postmap_tls_inbound_domains(); - rewrite_postfix_welcomelist($rulecache) if $rulecache; + $changes ||= rewrite_postfix_welcomelist($rulecache) if $rulecache; # make sure aliases.db is up to date system('/usr/bin/newaliases'); diff --git a/src/PMG/DBTools.pm b/src/PMG/DBTools.pm index ff54acb3..01bde582 100644 --- a/src/PMG/DBTools.pm +++ b/src/PMG/DBTools.pm @@ -1419,7 +1419,8 @@ sub reload_ruledb { if (defined($ruledb)) { eval { my $rulecache = PMG::RuleCache->new($ruledb); - PMG::Config::rewrite_postfix_welcomelist($rulecache); + my $changed = PMG::Config::rewrite_postfix_welcomelist($rulecache); + PMG::Utils::service_cmd('postfix', 'reload') if $changed; }; warn "problems updating SMTP welcomelist - $@" if $@; } -- 2.47.3