From: Andrey Igoshin <ai@vsu.ru>
Date: Fri, 20 Apr 2018 22:16:15 +0000 (+0300)
Subject: [Minor] Processing another messages sources
X-Git-Tag: 1.7.4~55^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F2192%2Fhead;p=thirdparty%2Frspamd.git

[Minor] Processing another messages sources
---

diff --git a/utils/cgp_rspamd.pl b/utils/cgp_rspamd.pl
index 6851e6dd45..986c0804ed 100644
--- a/utils/cgp_rspamd.pl
+++ b/utils/cgp_rspamd.pl
@@ -201,7 +201,7 @@ sub rspamd_scan {
           elsif ( $elt =~ /^R\s[^<]*(<[^>]*>).*$/ ) {
             push @rcpts, $1;
           }
-          elsif ( $elt =~ /^S (?:<([^>]+)>)?\s*S.*\[(.+)\]/ ) {
+          elsif ( $elt =~ /^S (?:<([^>]+)> )?(?:SMTP|HTTPU?|AIRSYNC|XIMSS) \[([0-9a-f.:]+)\]/ ) {
             if ($1) {
               $user = $1;
             }