From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Thu, 7 Feb 2019 15:08:14 +0000 (+0000)
Subject: [Minor] Restore smtp address parser machine
X-Git-Tag: 1.9.0~201
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=44906967dd5c09a22dc4bdb599681bc155bfffd3;p=thirdparty%2Frspamd.git

[Minor] Restore smtp address parser machine
---

diff --git a/src/ragel/smtp_addr_parser.rl b/src/ragel/smtp_addr_parser.rl
index 9ae7c51730..b5b4863d33 100644
--- a/src/ragel/smtp_addr_parser.rl
+++ b/src/ragel/smtp_addr_parser.rl
@@ -2,8 +2,6 @@
 
   machine smtp_addr_parser;
 
-
-
   action IP6_start {}
   action IP6_end {}
   action IP4_start {}
diff --git a/src/ragel/smtp_address.rl b/src/ragel/smtp_address.rl
index 3f03d405b5..68226f7487 100644
--- a/src/ragel/smtp_address.rl
+++ b/src/ragel/smtp_address.rl
@@ -28,10 +28,8 @@
   QcontentSMTP   = qtextSMTP | quoted_pairSMTP %User_has_backslash;
   Quoted_string  = ( DQUOTE QcontentSMTP* >User_start %User_end DQUOTE ) %Quoted_addr;
   Local_part     = Dot_string >User_start %User_end | Quoted_string;
-  String         = Atom | Quoted_string;
-
   Mailbox        = Local_part "@" (address_literal | Domain >Domain_start %Domain_end);
-  UnangledPath = ( Adl ":" )? Mailbox >Domain_start %Addr_end "."?;
+  UnangledPath = ( Adl ":" )? Mailbox >Addr_start %Addr_end "."?;
   AngledPath = "<" UnangledPath ">" %Addr_has_angle;
   Path = AngledPath | UnangledPath;
   SMTPAddr = space* (Path | "<>" %Empty_addr ) %Valid_addr space*;