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};
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' ) {
} elsif ( $self->_password_encoding eq 'plain' ) {
$pw_attrib = $radius_password; #Cleartext-Password? man rlm_pap
+ $password = $self->_password;
} else {