X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Fsvc_acct.pm;h=6c0807df245bea4ed91453fc46c3a68fc81d5614;hb=b3c55b5f123b1b5c8ebedfa1826cbf19a0dcc013;hp=04a86a8e09bcf67359510b045e1bd16514ce87c5;hpb=c7b4ef5e2731387e15d369d6561db679ad070cfa;p=freeside.git

diff --git a/FS/FS/svc_acct.pm b/FS/FS/svc_acct.pm
index 04a86a8e0..6c0807df2 100644
--- a/FS/FS/svc_acct.pm
+++ b/FS/FS/svc_acct.pm
@@ -791,7 +791,7 @@ sub check {
     #$recref->{password} = $1.
     #  crypt($3,$saltset[int(rand(64))].$saltset[int(rand(64))]
     #;
-  } elsif ( $recref->{_password} =~ /^((\*SUSPENDED\* )?)([\w\.\/\$\;]{13,34})$/ ) {
+  } elsif ( $recref->{_password} =~ /^((\*SUSPENDED\* )?)([\w\.\/\$\;\+]{13,34})$/ ) {
     $recref->{_password} = $1.$3;
   } elsif ( $recref->{_password} eq '*' ) {
     $recref->{_password} = '*';
@@ -857,7 +857,9 @@ expected to change in the future.
 
 sub radius_check {
   my $self = shift;
-  ( 'Password' => $self->_password,
+  my $password = $self->_password;
+  my $pw_attrib = length($password) <= 12 ? 'Password' : 'Crypt-Password';
+  ( $pw_attrib => $password,
     map {
       /^(rc_(.*))$/;
       my($column, $attrib) = ($1, $2);