->setfixed untaints svcnum

diff --git a/FS/FS/svc_acct.pm b/FS/FS/svc_acct.pm
index b0e007f..253d56c 100644 (file)
--- a/FS/FS/svc_acct.pm
+++ b/FS/FS/svc_acct.pm
@@ -387,10 +387,7 @@ sub check {
   return $x unless ref($x);
   my $part_svc = $x;
 
-  my $error = 
-    $self->ut_numbern('svcnum')
-    || $self->ut_number('domsvc')
-  ;
+  my $error = $self->ut_number('domsvc');
   return $error if $error;
 
   my $ulen = $usernamemax || $self->dbdef_table->column('username')->length;
@@ -558,7 +555,7 @@ sub radius_check {
 
 =head1 VERSION
 
-$Id: svc_acct.pm,v 1.22 2001-08-19 08:15:10 ivan Exp $
+$Id: svc_acct.pm,v 1.23 2001-08-19 08:18:01 ivan Exp $
 
 =head1 BUGS
 

diff --git a/FS/FS/svc_domain.pm b/FS/FS/svc_domain.pm
index fce6cf2..b3b298b 100644 (file)
--- a/FS/FS/svc_domain.pm
+++ b/FS/FS/svc_domain.pm
@@ -289,16 +289,14 @@ Sets any fixed values; see L<FS::part_svc>.
 
 sub check {
   my $self = shift;
-  my $error =
-    $self->ut_numbern('svcnum')
-    || $self->ut_numbern('catchall')
-  ;
-  return $error if $error;
 
   my $x = $self->setfixed;
   return $x unless ref($x);
   my $part_svc = $x;
 
+  my $error = $self->ut_numbern('catchall');
+  return $error if $error;
+
   #hmm
   my $pkgnum;
   if ( $self->svcnum ) {
@@ -487,7 +485,7 @@ sub submit_internic {
 
 =head1 VERSION
 
-$Id: svc_domain.pm,v 1.14 2001-08-17 10:57:23 ivan Exp $
+$Id: svc_domain.pm,v 1.15 2001-08-19 08:18:01 ivan Exp $
 
 =head1 BUGS