diff options
| author | ivan <ivan> | 2008-07-31 21:16:07 +0000 |
|---|---|---|
| committer | ivan <ivan> | 2008-07-31 21:16:07 +0000 |
| commit | 12f52398d69509cd8823d1ef420e3c4d032688d3 (patch) | |
| tree | a73a98bc5713c40e2a38f0ed1822afcbc9f5aae9 | |
| parent | a537c45ffae0431f6c9cdc4e8d2ca376b2685d97 (diff) | |
backport-ish from 1.9: blowfish apsswords exporting to LDAP should warn and return {CRYPT}* instead of throwing a fatal error
| -rw-r--r-- | FS/FS/svc_acct.pm | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/FS/FS/svc_acct.pm b/FS/FS/svc_acct.pm index 9fb72d17b..480290309 100644 --- a/FS/FS/svc_acct.pm +++ b/FS/FS/svc_acct.pm @@ -2122,8 +2122,9 @@ sub ldap_password { } elsif ( $self->_password =~ /^\$1\$(.*)$/ && length($1) == 31 ) { #passwdMD5 return '{MD5}'. $1; } elsif ( $self->_password =~ /^\$2a?\$(.*)$/ ) { #Blowfish - die "Blowfish encryption not supported in this context, svcnum ". - $self->svcnum. "\n"; + warn "Blowfish encryption not supported in this context, svcnum ". + $self->svcnum. "\n"; + return '{CRYPT}*'; #unsupported, should not auth } elsif ( $self->_password =~ /^(\w{48})$/ ) { #LDAP SSHA return '{SSHA}'. $1; } elsif ( $self->_password =~ /^(\w{64})$/ ) { #LDAP NS-MTA-MD5 |