projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
don't re-crypt encrypted passwords
[freeside.git]
/
FS
/
FS
/
part_export
/
ldap.pm
diff --git
a/FS/FS/part_export/ldap.pm
b/FS/FS/part_export/ldap.pm
index
68a6352
..
57fd1f3
100644
(file)
--- a/
FS/FS/part_export/ldap.pm
+++ b/
FS/FS/part_export/ldap.pm
@@
-1,11
+1,13
@@
package FS::part_export::ldap;
package FS::part_export::ldap;
-use vars qw(@ISA);
+use vars qw(@ISA
@saltset
);
use FS::Record qw( dbh );
use FS::part_export;
@ISA = qw(FS::part_export);
use FS::Record qw( dbh );
use FS::part_export;
@ISA = qw(FS::part_export);
+@saltset = ( 'a'..'z' , 'A'..'Z' , '0'..'9' , '.' , '/' );
+
sub rebless { shift; }
sub _export_insert {
sub rebless { shift; }
sub _export_insert {
@@
-23,10
+25,9
@@
sub _export_insert {
}
}
$crypt_password = ''; #surpress "used only once" warnings
}
}
$crypt_password = ''; #surpress "used only once" warnings
- $crypt_password = crypt( $svc_acct->_password,
+ $crypt_password =
'{crypt}'.
crypt( $svc_acct->_password,
$saltset[int(rand(64))].$saltset[int(rand(64))] );
$saltset[int(rand(64))].$saltset[int(rand(64))] );
-
my $username_attrib;
my %attrib = map { /^\s*(\w+)\s+(.*\S)\s*$/;
$username_attrib = $1 if $2 eq '$username';
my $username_attrib;
my %attrib = map { /^\s*(\w+)\s+(.*\S)\s*$/;
$username_attrib = $1 if $2 eq '$username';
@@
-218,7
+219,7
@@
sub ldap_insert { #subroutine, not method
}
my $status = $ldap->add( $userdn, attrs => [ %attrib ] );
}
my $status = $ldap->add( $userdn, attrs => [ %attrib ] );
- die
$status->error
if $status->is_error;
+ die
'LDAP error: '. $status->error. "\n"
if $status->is_error;
$ldap->unbind;
}
$ldap->unbind;
}
@@
-245,7
+246,7
@@
sub ldap_connect {
my $ldap = Net::LDAP->new($machine) or die $@;
my $status = $ldap->bind( $dn, %bind_options );
my $ldap = Net::LDAP->new($machine) or die $@;
my $status = $ldap->bind( $dn, %bind_options );
- die
$status->error
if $status->is_error;
+ die
'LDAP error: '. $status->error. "\n"
if $status->is_error;
$ldap;
}
$ldap;
}