From 1b63d88cce181a8e84e185f32e0a0b88166d292d Mon Sep 17 00:00:00 2001 From: Vsevolod Stakhov Date: Mon, 4 Feb 2019 17:46:05 +0000 Subject: [PATCH] [Regression] Fix received parser Issue: #2743 --- src/ragel/smtp_received.rl | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/ragel/smtp_received.rl b/src/ragel/smtp_received.rl index f43ad167c..1c76f40fb 100644 --- a/src/ragel/smtp_received.rl +++ b/src/ragel/smtp_received.rl @@ -19,10 +19,9 @@ 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; }; -- 2.39.5