Merge remote-tracking branch 'origin/develop'

This commit is contained in:
snipe 2016-08-02 02:36:40 -07:00
commit 848e3837aa

View file

@ -35,6 +35,11 @@ class Ldap extends Model
putenv('LDAPTLS_REQCERT=never'); putenv('LDAPTLS_REQCERT=never');
} }
// If the user specifies where CA Certs are, make sure to use them
if(env("LDAPTLS_CACERT")) {
putenv("LDAPTLS_CACERT=".env("LDAPTLS_CACERT"));
}
$connection = @ldap_connect($ldap_host); $connection = @ldap_connect($ldap_host);
if (!$connection) { if (!$connection) {