|
|
| @@ -0,0 +1,20 @@
+--- libexec/NfAlert.pm.orig 2010-07-14 10:57:21.493224997 +0200
++++ libexec/NfAlert.pm 2010-07-14 10:57:57.857040765 +0200
+@@ -1366,7 +1366,7 @@
+ $action_email =~ s/^\s+//;
+ $action_email =~ s/\s$//;
+ foreach my $email_addr ( split /\s*,\s*/, $action_email ) {
+- if ( $action_email !~ /^([A-Z0-9]+[._]?){1,}[A-Z0-9\-]+\@(([A-Z0-9]+[-]?){1,}[A-Z0-9]+\.){1,}[A-Z]{2,4}$/i ) {
++ if ( $action_email !~ /^([A-Z0-9]+[._]?){1,}[A-Z0-9\-]+\@(([A-Z0-9]+[-]?){1,}[A-Z0-9]+\.){1,}(?:[a-zA-Z0-9][a-zA-Z0-9._-]+\\.)*[A-Z]{2,4}$/i ) {
+ print $socket $EODATA;
+ print $socket "ERR action_email '$action_email' not a valid email address\n";
+ return;
+@@ -1747,7 +1747,7 @@
+ $action_email =~ s/^\s+//;
+ $action_email =~ s/\s$//;
+ foreach my $email_addr ( split /\s*,\s*/, $action_email ) {
+- if ( $email_addr !~ /^([A-Z0-9]+[._]?){1,}[A-Z0-9]+\@(([A-Z0-9]+[-]?){1,}[A-Z0-9]+\.){1,}[A-Z]{2,4}$/i ) {
++ if ( $email_addr !~ /^([A-Z0-9]+[._]?){1,}[A-Z0-9\-]+\@(([A-Z0-9]+[-]?){1,}[A-Z0-9]+\.){1,}(?:[a-zA-Z0-9][a-zA-Z0-9._-]+\\.)*[A-Z]{2,4}$/i ) {
+ print $socket $EODATA;
+ print $socket "ERR action_email '$email_addr' not a valid email address\n";
+ return;
|
