]> source.dussan.org Git - rspamd.git/commitdiff
[Regression] Fix received parser
authorVsevolod Stakhov <vsevolod@highsecure.ru>
Mon, 4 Feb 2019 17:46:05 +0000 (17:46 +0000)
committerVsevolod Stakhov <vsevolod@highsecure.ru>
Mon, 4 Feb 2019 17:46:05 +0000 (17:46 +0000)
Issue: #2743

src/ragel/smtp_received.rl

index f43ad167c109c3bf9eb38067c2ab1038099c4fef..1c76f40fb470b059f882f1e9348235973e99f27e 100644 (file)
   TCP_info       = address_literal >Real_IP_Start %Real_IP_End |
                   ( Domain >Real_Domain_Start %Real_Domain_End FWS address_literal >Real_IP_Start %Real_IP_End ) |
                   ( non_conformant_address_literal >Real_IP_Start %Real_IP_End );
-  Extended_Domain  = Domain >Real_Domain_Start %Real_Domain_End | # Used to be a real domain
+  Extended_Domain  = (Domain >Real_Domain_Start %Real_Domain_End | # Used to be a real domain
                   ( Domain >Reported_Domain_Start %Reported_Domain_End FWS "(" TCP_info ")" ) | # Here domain is something specified by remote side
-                  ( address_literal >Real_Domain_Start %Real_Domain_End FWS "(" TCP_info ")" ) |
-                  address_literal >Real_IP_Start %Real_IP_End; # Not RFC conforming, but many MTA try this
+                  ( address_literal >Real_Domain_Start %Real_Domain_End FWS "(" TCP_info ")" ) );
 
   ccontent = ctext | FWS | '(' @{ fcall balanced_ccontent; };
   balanced_ccontent := ccontent* ')' @{ fret; };