referral credits overhaul, use billing events, agents can self-configure, limit to...

[freeside.git] / FS / FS / svc_acct.pm

diff --git a/FS/FS/svc_acct.pm b/FS/FS/svc_acct.pm
index 41fe1ea..a4876c5 100644 (file)
--- a/FS/FS/svc_acct.pm
+++ b/FS/FS/svc_acct.pm
@@ -1134,10 +1134,10 @@ sub check {
 
     if ( $recref->{_password} =~
            #/^(\$\w+\$.*|[\w\+\/]{13}|_[\w\+\/]{19}|\*)$/
-           /^(!!?)?(\$\w+\$.*|[\w\+\/]{13}|_[\w\+\/]{19}|\*)$/
+           /^(!!?)?(\$\w+\$.*|[\w\+\/\.]{13}|_[\w\+\/\.]{19}|\*)$/
        ) {
 
-      $recref->{_password} = $1.$2;
+      $recref->{_password} = ( defined($1) ? $1 : '' ). $2;
 
     } else {
       return 'Illegal (crypt-encoded) password: '. $recref->{_password};
@@ -1455,8 +1455,8 @@ sub radius_password {
   my($pw_attrib, $password);
   if ( $self->_password_encoding eq 'ldap' ) {
 
-     $pw_attrib = 'Password-With-Header';
-     $password = $self->_password;
+    $pw_attrib = 'Password-With-Header';
+    $password = $self->_password;
 
   } elsif ( $self->_password_encoding eq 'crypt' ) {
 
@@ -1466,6 +1466,7 @@ sub radius_password {
   } elsif ( $self->_password_encoding eq 'plain' ) {
 
     $pw_attrib = $radius_password; #Cleartext-Password?  man rlm_pap
+    $password = $self->_password;
 
   } else {