WMDE
/
LDAPAccountManager
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #64 from dhoffend/fix-ldap-exop 

create correct error message when ldap_exop fails
This commit is contained in:
gruberroland 2019-03-06 18:03:45 +01:00 committed by GitHub
parent cc90b307b0 8da632d4a0
commit b2d1f5de58
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lam/lib/modules/inetOrgPerson.inc
View File

@ -958,7 +958,7 @@ class inetOrgPerson extends baseModule implements passwordService {
&& ($settings['posixAccount_pwdHash'][0] === 'LDAP_EXOP')) { && ($settings['posixAccount_pwdHash'][0] === 'LDAP_EXOP')) {
$success = ldap_exop_passwd($_SESSION['ldap']->server(), $this->getAccountContainer()->finalDN, null, $this->clearTextPassword); $success = ldap_exop_passwd($_SESSION['ldap']->server(), $this->getAccountContainer()->finalDN, null, $this->clearTextPassword);
if (!$success) { if (!$success) {
return array('ERROR', _('Unable to set password'), getExtendedLDAPErrorMessage($_SESSION['ldap']->server())); return array(array('ERROR', _('Unable to set password'), getExtendedLDAPErrorMessage($_SESSION['ldap']->server())));
} }
} }
return array(); return array();

2
lam/lib/modules/posixAccount.inc
View File

@ -901,7 +901,7 @@ class posixAccount extends baseModule implements passwordService {
&& ($settings['posixAccount_pwdHash'][0] === 'LDAP_EXOP')) { && ($settings['posixAccount_pwdHash'][0] === 'LDAP_EXOP')) {
$success = ldap_exop_passwd($_SESSION['ldap']->server(), $this->getAccountContainer()->finalDN, null, $this->clearTextPassword); $success = ldap_exop_passwd($_SESSION['ldap']->server(), $this->getAccountContainer()->finalDN, null, $this->clearTextPassword);
if (!$success) { if (!$success) {
return array('ERROR', _('Unable to set password'), getExtendedLDAPErrorMessage($_SESSION['ldap']->server())); return array(array('ERROR', _('Unable to set password'), getExtendedLDAPErrorMessage($_SESSION['ldap']->server())));
} }
} }
return array(); return array();