projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
don't generate random sip_password values if you set it to fixed+blank, RT#25239
[freeside.git]
/
FS
/
FS
/
svc_phone.pm
diff --git
a/FS/FS/svc_phone.pm
b/FS/FS/svc_phone.pm
index
7e5e26f
..
69f2d91
100644
(file)
--- a/
FS/FS/svc_phone.pm
+++ b/
FS/FS/svc_phone.pm
@@
-451,7
+451,11
@@
and replace methods.
sub check {
my $self = shift;
sub check {
my $self = shift;
- my $conf = new FS::Conf;
+ #my $conf = new FS::Conf;
+
+ my $x = $self->setfixed;
+ return $x unless ref($x);
+ my $part_svc = $x;
my $phonenum = $self->phonenum;
my $phonenum_check_method;
my $phonenum = $self->phonenum;
my $phonenum_check_method;
@@
-525,8
+529,9
@@
sub check {
return "SIP password must be shorter than $passwordmax characters"
if length($self->sip_password) > $passwordmax;
return "SIP password must be shorter than $passwordmax characters"
if length($self->sip_password) > $passwordmax;
- } els
e { # option for this?
+ } els
if ( $part_svc->part_svc_column('sip_password')->columnflag ne 'F' ) {
+ # option for this?
$self->sip_password(
join('', map $pw_set[ int(rand $#pw_set) ], (1..min($passwordmax,16)) )
);
$self->sip_password(
join('', map $pw_set[ int(rand $#pw_set) ], (1..min($passwordmax,16)) )
);
@@
-627,7
+632,7
@@
sub radius_check {
my $self = shift;
my %check = ();
my $self = shift;
my %check = ();
- my $conf = new FS::Conf;
+
#
my $conf = new FS::Conf;
$check{'User-Password'} = $conf->config('svc_phone-radius-default_password');
$check{'User-Password'} = $conf->config('svc_phone-radius-default_password');