public nobgit read

NobMail

Based on mailcow: dockerized

Languages

Repository composition by tracked source files.

PHP

PHP 49% JavaScript 35% HTML 9% CSS 4% Shell 2% Python 1% Lua 0% Perl 0% Ruby 0% SCSS 0%

Create file Wiki Documentation

Clone

https://nobgit.com/orgs/nobgit/nobmail.git

ssh://[email protected]:2222/orgs/nobgit/nobmail.git

Commit

[Rspamd] Fix tag handling for mailboxes

9034e0f3

andryyy <[email protected]> 6 years ago

data/conf/rspamd/dynmaps/aliasexp.php | 3 ++-
 data/conf/rspamd/lua/rspamd.local.lua | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

Diff

diff --git a/data/conf/rspamd/dynmaps/aliasexp.php b/data/conf/rspamd/dynmaps/aliasexp.php
index 4cd57deb..947a0244 100644
--- a/data/conf/rspamd/dynmaps/aliasexp.php
+++ b/data/conf/rspamd/dynmaps/aliasexp.php
@@ -167,7 +167,8 @@ catch (PDOException $e) {
   exit;
 }
 
-if (count($rcpt_final_mailboxes) == 1 && $rcpt_final_mailboxes[0] != $rcpt) {
+// Does also return the mailbox name if question == answer (query == mailbox)
+if (count($rcpt_final_mailboxes) == 1) {
   error_log("ALIASEXP: direct alias " . $rcpt . " expanded to " . $rcpt_final_mailboxes[0] . PHP_EOL);
   echo trim($rcpt_final_mailboxes[0]);
 }
diff --git a/data/conf/rspamd/lua/rspamd.local.lua b/data/conf/rspamd/lua/rspamd.local.lua
index 645c9511..6e7c7115 100644
--- a/data/conf/rspamd/lua/rspamd.local.lua
+++ b/data/conf/rspamd/lua/rspamd.local.lua
@@ -234,7 +234,7 @@ rspamd_config:register_symbol({
 
       local function http_callback(err_message, code, body, headers)
         if body ~= nil and body ~= "" then
-          rspamd_logger.infox(rspamd_config, "expanding alias to \"%s\"", body)
+          rspamd_logger.infox(rspamd_config, "expanding rcpt to \"%s\"", body)
 
           local function tag_callback_subject(err, data)
             if err or type(data) ~= 'string' then