tyler.durden
/
icingaweb2
mirror of https://github.com/Icinga/icingaweb2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert some unneeded changes 

refs #9605
This commit is contained in:
Matthias Jentsch 2015-07-15 09:56:18 +02:00
parent f4d8bfc309
commit 84899e3e56
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
library/Icinga/Protocol/Ldap/LdapConnection.php
View File

@ -1062,18 +1062,15 @@ class LdapConnection implements Selectable, Inspectable
putenv('LDAPTLS_REQCERT=never');
} else {
if ($this->validateCertificate) {
// $ldap_conf = $this->getConfigDir('ldap_ca.conf');
$ldap_conf = $this->getConfigDir('ldap_ca.conf');
} else {
// $ldap_conf = $this->getConfigDir('ldap_nocert.conf');
putenv('LDAPTLS_REQCERT=never');
$ldap_conf = $this->getConfigDir('ldap_nocert.conf');
}
/*
putenv('LDAPRC=' . $ldap_conf); // TODO: Does not have any effect
if (getenv('LDAPRC') !== $ldap_conf) {
throw new LdapException('putenv failed');
}
*/
}
}