X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Fsvc_acct.pm;h=b5ade6face971891ca3da71c62bfa26b1593790d;hb=3fcc6847417cbda9fd027a4286db5e59aea6d901;hp=6c0807df245bea4ed91453fc46c3a68fc81d5614;hpb=b3c55b5f123b1b5c8ebedfa1826cbf19a0dcc013;p=freeside.git diff --git a/FS/FS/svc_acct.pm b/FS/FS/svc_acct.pm index 6c0807df2..b5ade6fac 100644 --- a/FS/FS/svc_acct.pm +++ b/FS/FS/svc_acct.pm @@ -9,6 +9,7 @@ use vars qw( @ISA $noexport_hack $conf $username_uppercase $welcome_template $welcome_from $welcome_subject $welcome_mimetype $smtpmachine + $radius_password $dirhash @saltset @pw_set ); use Carp; @@ -60,6 +61,7 @@ $FS::UID::callback{'FS::svc_acct'} = sub { $welcome_template = ''; } $smtpmachine = $conf->config('smtpmachine'); + $radius_password = $conf->config('radius-password') || 'Password'; }; @saltset = ( 'a'..'z' , 'A'..'Z' , '0'..'9' , '.' , '/' ); @@ -858,7 +860,7 @@ expected to change in the future. sub radius_check { my $self = shift; my $password = $self->_password; - my $pw_attrib = length($password) <= 12 ? 'Password' : 'Crypt-Password'; + my $pw_attrib = length($password) <= 12 ? $radius_password : 'Crypt-Password'; ( $pw_attrib => $password, map { /^(rc_(.*))$/;