From: ivan <ivan>
Date: Wed, 6 Apr 2005 22:50:07 +0000 (+0000)
Subject: looks like a domain part for a literally-specified forward src or dst is required... 
X-Git-Tag: BEFORE_FINAL_MASONIZE~600
X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=commitdiff_plain;h=f5f7716c05a5a5bc718211f776bc9e1ee188422e

looks like a domain part for a literally-specified forward src or dst is required, not optional
---

diff --git a/FS/FS/svc_forward.pm b/FS/FS/svc_forward.pm
index b8d55fecb..6dea388a4 100644
--- a/FS/FS/svc_forward.pm
+++ b/FS/FS/svc_forward.pm
@@ -249,7 +249,7 @@ sub check {
   #         || ! $self->dstsvc;
 
   if ( $self->src ) {
-    $self->src =~ /^([\w\.\-\&]*)(\@([\w\-]+\.)+\w+)?$/
+    $self->src =~ /^([\w\.\-\&]*)(\@([\w\-]+\.)+\w+)$/
        or return "Illegal src: ". $self->dst;
     $self->src("$1$2");
   } else {
@@ -257,7 +257,7 @@ sub check {
   }
 
   if ( $self->dst ) {
-    $self->dst =~ /^([\w\.\-\&]*)(\@([\w\-]+\.)+\w+)?$/
+    $self->dst =~ /^([\w\.\-\&]*)(\@([\w\-]+\.)+\w+)$/
        or return "Illegal dst: ". $self->dst;
     $self->dst("$1$2");
   } else {