oqapi/webgui
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

merging 5.4.3 changes

Browse source
This commit is contained in:
JT Smith 2003-07-27 21:32:32 +00:00
parent c1f4105699
commit dc9a81080a
17 changed files with 106 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

17
lib/WebGUI/Authentication/LDAP.pm
View file

@ -112,14 +112,17 @@ sub registrationFormSave {
$ldap->bind;
my $search = $ldap->search (base => $uri->dn, filter => $session{setting}{ldapId}."=".$session{form}{'authLDAP.ldapId'});
if (defined $search->entry(0)) {
$connectDN = $search->entry(0)->get_value($session{setting}{ldapUserRDN});
if ($session{setting}{ldapUserRDN} eq 'dn') {
$connectDN = $search->entry(0)->dn;
} else {
$connectDN = $search->entry(0)->get_value($session{setting}{ldapUserRDN});
}
}
$ldap->unbind;
WebGUI::Authentication::saveParams($uid,'LDAP',
{
WebGUI::Authentication::saveParams($uid,'LDAP', {
connectDN => $connectDN,
ldapUrl => $session{setting}{ldapURL}
});
});
}
#-------------------------------------------------------------------
@ -130,7 +133,11 @@ sub registrationFormValidate {
if ($ldap->bind) {
$search = $ldap->search (base=>$uri->dn,filter=>$session{setting}{ldapId}."=".$session{form}{'authLDAP.ldapId'});
if (defined $search->entry(0)) {
$connectDN = $search->entry(0)->get_value($session{setting}{ldapUserRDN});
if ($session{setting}{ldapUserRDN} eq 'dn') {
$connectDN = $search->entry(0)->dn;
} else {
$connectDN = $search->entry(0)->get_value($session{setting}{ldapUserRDN});
}
$ldap->unbind;
$ldap = Net::LDAP->new($uri->host, (port=>$uri->port)) or $error .= WebGUI::International::get(2,'Auth/LDAP');
$auth = $ldap->bind(dn=>$connectDN, password=>$session{form}{'authLDAP.ldapPassword'});