diff options
| -rw-r--r-- | tests/data/test914 | 3 | ||||
| -rw-r--r-- | tests/data/test955 | 3 | ||||
| -rw-r--r-- | tests/data/test959 | 3 | ||||
| -rwxr-xr-x | tests/ftpserver.pl | 9 |
4 files changed, 11 insertions, 7 deletions
diff --git a/tests/data/test914 b/tests/data/test914 index d1532c806..0124b7671 100644 --- a/tests/data/test914 +++ b/tests/data/test914 @@ -8,6 +8,9 @@ SMTP # # Server-side <reply> +<servercmd> +REPLY MAIL 501 not fine enough +</servercmd> </reply> # diff --git a/tests/data/test955 b/tests/data/test955 index 57d618c7d..97ef29561 100644 --- a/tests/data/test955 +++ b/tests/data/test955 @@ -8,6 +8,9 @@ SMTP # # Server-side <reply> +<servercmd> +REPLY MAIL 501 not fine enough +</servercmd> </reply> # diff --git a/tests/data/test959 b/tests/data/test959 index a61c3d142..1b2d65842 100644 --- a/tests/data/test959 +++ b/tests/data/test959 @@ -8,6 +8,9 @@ SMTP # # Server-side <reply> +<servercmd> +REPLY MAIL 501 not fine enough +</servercmd> </reply> # diff --git a/tests/ftpserver.pl b/tests/ftpserver.pl index 92420ea4b..a0b36e5de 100755 --- a/tests/ftpserver.pl +++ b/tests/ftpserver.pl @@ -835,13 +835,8 @@ sub MAIL_smtp { } } - # Validate the from address (only <> and a valid email address inside - # <> are allowed, such as <user@example.com>) - if (($from eq "<>") || - (!$smtputf8 && $from =~ - /^<([a-zA-Z0-9._%+-]+)\@(([a-zA-Z0-9-]+)\.)+([a-zA-Z]{2,4})>$/) || - ($smtputf8 && $from =~ - /^<([a-zA-Z0-9\x{80}-\x{ff}._%+-]+)\@(([a-zA-Z0-9\x{80}-\x{ff}-]+)\.)+([a-zA-Z]{2,4})>$/)) { + # this server doesn't "validate" MAIL FROM addresses + if (length($from)) { my @found; my $valid = 1; |