X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Fsvc_acct.pm;h=26c634be3bb42137223250cda823e9b204e93644;hb=5072965ec7e8d55ef82769fc322240abc7fb7e00;hp=14979ed098883a2c47c3cac297507c0122276c45;hpb=be4e54da250b7b94ddfd67c9f8eeb02288e10020;p=freeside.git

diff --git a/FS/FS/svc_acct.pm b/FS/FS/svc_acct.pm
index 14979ed09..26c634be3 100644
--- a/FS/FS/svc_acct.pm
+++ b/FS/FS/svc_acct.pm
@@ -380,7 +380,6 @@ sub check {
     ;
 
     unless ( $recref->{username} eq 'sync' ) {
-      my($shell);
       if ( grep $_ eq $recref->{shell}, @shells ) {
         $recref->{shell} = (grep $_ eq $recref->{shell}, @shells)[0];
       } else {
@@ -437,7 +436,7 @@ sub check {
     #$recref->{password} = $1.
     #  crypt($3,$saltset[int(rand(64))].$saltset[int(rand(64))]
     #;
-  } elsif ( $recref->{_password} =~ /^((\*SUSPENDED\* )?)([\w\.\/]{13,24})$/ ) {
+  } elsif ( $recref->{_password} =~ /^((\*SUSPENDED\* )?)([\w\.\/\$]{13,34})$/ ) {
     $recref->{_password} = $1.$3;
   } elsif ( $recref->{_password} eq '*' ) {
     $recref->{_password} = '*';
@@ -473,7 +472,7 @@ sub radius {
 
 =head1 VERSION
 
-$Id: svc_acct.pm,v 1.5 2000-06-28 12:52:22 ivan Exp $
+$Id: svc_acct.pm,v 1.7 2000-06-29 11:56:52 ivan Exp $
 
 =head1 BUGS