[freeside-commits] freeside/FS/FS svc_acct.pm, 1.217.2.17, 1.217.2.18

[Ivan,,,]

Update of /home/cvs/cvsroot/freeside/FS/FS
In directory wavetail.420.am:/tmp/cvs-serv25623

Modified Files:
      Tag: FREESIDE_1_7_BRANCH
	svc_acct.pm 
Log Message:
backport-ish from 1.9: blowfish apsswords exporting to LDAP should warn and return {CRYPT}* instead of throwing a fatal error

Index: svc_acct.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/svc_acct.pm,v
retrieving revision 1.217.2.17
retrieving revision 1.217.2.18
diff -u -d -r1.217.2.17 -r1.217.2.18
--- svc_acct.pm	8 Jan 2008 21:33:38 -0000	1.217.2.17
+++ svc_acct.pm	31 Jul 2008 21:16:07 -0000	1.217.2.18
@@ -2122,8 +2122,9 @@
   } 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