freeside/FS/FS svc_forward.pm,1.16,1.17

[ivan]

Update of /home/cvs/cvsroot/freeside/FS/FS
In directory pouncequick:/tmp/cvs-serv23382

Modified Files:
	svc_forward.pm 
Log Message:
looks like a domain part for a literally-specified forward src or dst is required, not optional

Index: svc_forward.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/svc_forward.pm,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- svc_forward.pm	3 Mar 2004 13:42:08 -0000	1.16
+++ svc_forward.pm	6 Apr 2005 22:50:07 -0000	1.17
@@ -249,7 +249,7 @@
   #         || ! $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 @@
   }
 
   if ( $self->dst ) {
-    $self->dst =~ /^([\w\.\-\&]*)(\@([\w\-]+\.)+\w+)?$/
+    $self->dst =~ /^([\w\.\-\&]*)(\@([\w\-]+\.)+\w+)$/
        or return "Illegal dst: ". $self->dst;
     $self->dst("$1$2");
   } else {