From: ivan <ivan>
Date: Thu, 31 Jul 2008 21:16:07 +0000 (+0000)
Subject: backport-ish from 1.9: blowfish apsswords exporting to LDAP should warn and return... 
X-Git-Tag: freeside_1_7_4rc1~227
X-Git-Url: http://git.freeside.biz/gitweb/?a=commitdiff_plain;h=12f52398d69509cd8823d1ef420e3c4d032688d3;p=freeside.git

backport-ish from 1.9: blowfish apsswords exporting to LDAP should warn and return {CRYPT}* instead of throwing a fatal error
---

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