diff --git a/lam/HISTORY b/lam/HISTORY index aa8daf2b..2101c2ea 100644 --- a/lam/HISTORY +++ b/lam/HISTORY @@ -4,6 +4,8 @@ December 2014 4.8 - Usability improvements - LAM Pro: -> Self service: added option if referrals should be followed + - fixed bugs: + -> missing LDAP_DEREF_NEVER in some cases (169) 07.10.2014 4.7.1 diff --git a/lam/lib/account.inc b/lam/lib/account.inc index c78011b7..22b00609 100644 --- a/lam/lib/account.inc +++ b/lam/lib/account.inc @@ -780,7 +780,7 @@ function ldapGetDN($dn, $attributes = array('dn'), $handle = null) { $handle = $_SESSION['ldap']->server(); } $return = null; - $sr = @ldap_read($handle, escapeDN($dn), 'objectClass=*', $attributes); + $sr = @ldap_read($handle, escapeDN($dn), 'objectClass=*', $attributes, 0, 0, 0, LDAP_DEREF_NEVER); if ($sr) { $entries = ldap_get_entries($_SESSION['ldap']->server(), $sr); if ($entries) { diff --git a/lam/lib/modules/imapAccess.inc b/lam/lib/modules/imapAccess.inc index 14974242..f5391d48 100644 --- a/lam/lib/modules/imapAccess.inc +++ b/lam/lib/modules/imapAccess.inc @@ -510,7 +510,7 @@ class imapAccess extends baseModule { // read LAM login user data $data = $_SESSION['ldap']->decrypt_login(); $dn = $data[0]; - $sr = @ldap_read($_SESSION['ldap']->server(), $dn, '(objectclass=*)', $attrNames); + $sr = @ldap_read($_SESSION['ldap']->server(), $dn, '(objectclass=*)', $attrNames, 0, 0, 0, LDAP_DEREF_NEVER); if ($sr) { $info = @ldap_get_entries($_SESSION['ldap']->server(), $sr); if ($info) { diff --git a/lam/templates/tests/lamdaemonTest.php b/lam/templates/tests/lamdaemonTest.php index 3a90367a..910d9d40 100644 --- a/lam/templates/tests/lamdaemonTest.php +++ b/lam/templates/tests/lamdaemonTest.php @@ -215,7 +215,7 @@ function lamRunLamdaemonTestSuite($serverName, $serverTitle, $testQuota, $contai $container->addElement($spacer); $credentials = $_SESSION['ldap']->decrypt_login(); $unixOk = false; - $sr = @ldap_read($_SESSION['ldap']->server(), $credentials[0], "objectClass=posixAccount", array('uid')); + $sr = @ldap_read($_SESSION['ldap']->server(), $credentials[0], "objectClass=posixAccount", array('uid'), 0, 0, 0, LDAP_DEREF_NEVER); if ($sr) { $entry = @ldap_get_entries($_SESSION['ldap']->server(), $sr); $userName = $entry[0]['uid'][0];