GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

Make LDAP connection error fatal - there really is no way to recover from that.

Browse Source
This commit is contained in:
Craig Andrews 2010-02-24 23:20:34 -05:00
parent beb776cfd6
commit 489bd935eb
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
plugins/LdapAuthentication/LdapAuthenticationPlugin.php
View File

@ -199,8 +199,7 @@ class LdapAuthenticationPlugin extends AuthenticationPlugin
$ldap->setErrorHandling(PEAR_ERROR_RETURN); $ldap->setErrorHandling(PEAR_ERROR_RETURN);
$err=$ldap->bind(); $err=$ldap->bind();
if (Net_LDAP2::isError($err)) { if (Net_LDAP2::isError($err)) {
common_log(LOG_WARNING, 'Could not connect to LDAP server: '.$err->getMessage()); throw new Exception('Could not connect to LDAP server: '.$err->getMessage());
return false;
} }
if($config == null) $this->default_ldap=$ldap; if($config == null) $this->default_ldap=$ldap;

5
plugins/LdapAuthorization/LdapAuthorizationPlugin.php
View File

@ -167,7 +167,7 @@ class LdapAuthorizationPlugin extends AuthorizationPlugin
$ldap->setErrorHandling(PEAR_ERROR_RETURN); $ldap->setErrorHandling(PEAR_ERROR_RETURN);
$err=$ldap->bind(); $err=$ldap->bind();
if (Net_LDAP2::isError($err)) { if (Net_LDAP2::isError($err)) {
common_log(LOG_WARNING, 'Could not connect to LDAP server: '.$err->getMessage()); throw new Exception('Could not connect to LDAP server: '.$err->getMessage());
return false; return false;
} }
if($config == null) $this->default_ldap=$ldap; if($config == null) $this->default_ldap=$ldap;
@ -185,6 +185,9 @@ class LdapAuthorizationPlugin extends AuthorizationPlugin
if($ldap==null) { if($ldap==null) {
$ldap = $this->ldap_get_connection(); $ldap = $this->ldap_get_connection();
} }
if(! $ldap) {
throw new Exception("Could not connect to LDAP");
}
$filter = Net_LDAP2_Filter::create($this->attributes['username'], 'equals', $username); $filter = Net_LDAP2_Filter::create($this->attributes['username'], 'equals', $username);
$options = array( $options = array(
'attributes' => $attributes 'attributes' => $attributes