ftpserver.pl: Updated email regex from commit 98f7ca7e971006

...to not be as strict as it was rejecting valid numeric email
addresses.
This commit is contained in:
Steve Holme 2013-09-19 12:44:27 +01:00
parent dfe7ee1429
commit 9300bb826d

View File

@ -764,7 +764,7 @@ sub MAIL_smtp {
# Validate the from address (only <> and a valid email address inside # Validate the from address (only <> and a valid email address inside
# <> are allowed, such as <user@example.com>) # <> are allowed, such as <user@example.com>)
if ((!$from) || (($from ne "<>") && ($from !~ if ((!$from) || (($from ne "<>") && ($from !~
/^<([a-zA-Z][\w_.]+)\@([a-zA-Z0-9.-]+).([a-zA-Z]{2,4})>$/))) { /^<([a-zA-Z0-9._%+-]+)\@([a-zA-Z0-9.-]+).([a-zA-Z]{2,4})>$/))) {
sendcontrol "501 Invalid address\r\n"; sendcontrol "501 Invalid address\r\n";
} }
else { else {