summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorivan <ivan>2001-08-19 08:18:01 +0000
committerivan <ivan>2001-08-19 08:18:01 +0000
commitc2652bd1f1928b495e1dc5b4a43c46bffcc9022d (patch)
tree505dce5e72ce6e40dc31b6adc00a78d8fa1cf120
parentddb8528c025f6bef778f08885ae1411122874207 (diff)
->setfixed untaints svcnum
-rw-r--r--FS/FS/svc_acct.pm7
-rw-r--r--FS/FS/svc_domain.pm10
2 files changed, 6 insertions, 11 deletions
diff --git a/FS/FS/svc_acct.pm b/FS/FS/svc_acct.pm
index b0e007f6c..253d56c40 100644
--- 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 fce6cf28d..b3b298b97 100644
--- 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