1 files changed, 7 insertions, 1 deletions
diff --git a/tests/ftpserver.pl b/tests/ftpserver.pl
index 6709769d7..59a1665bd 100755
--- a/tests/ftpserver.pl
+++ b/tests/ftpserver.pl
@@ -1040,7 +1040,13 @@ sub VRFY_smtp {
             my @data = getreplydata($smtp_client);
 
             if(!@data) {
-              push @data, "250 <$username\@example.com>\r\n"
+                if ($username !~
+                    /^([a-zA-Z0-9._%+-]+)\@(([a-zA-Z0-9-]+)\.)+([a-zA-Z]{2,4})$/) {
+                  push @data, "250 <$username\@example.com>\r\n"
+                }
+                else {
+                  push @data, "250 <$username>\r\n"
+                }
             }
 
             for my $d (@data) {