diff options
| author | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2019-02-07 15:08:14 +0000 |
|---|---|---|
| committer | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2019-02-07 15:08:14 +0000 |
| commit | 44906967dd5c09a22dc4bdb599681bc155bfffd3 (patch) | |
| tree | e6f8fc451b2afcd9fb9117afd1f83e6b5feb9110 /src/ragel | |
| parent | 7341d06340cfc2c887d4c8fef180e459e97f508c (diff) | |
| download | rspamd-44906967dd5c09a22dc4bdb599681bc155bfffd3.tar.gz rspamd-44906967dd5c09a22dc4bdb599681bc155bfffd3.zip | |
[Minor] Restore smtp address parser machine
Diffstat (limited to 'src/ragel')
| -rw-r--r-- | src/ragel/smtp_addr_parser.rl | 2 | ||||
| -rw-r--r-- | src/ragel/smtp_address.rl | 4 |
2 files changed, 1 insertions, 5 deletions
diff --git a/src/ragel/smtp_addr_parser.rl b/src/ragel/smtp_addr_parser.rl index 9ae7c5173..b5b4863d3 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 3f03d405b..68226f748 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*; |