Infra-Mirrors/BookStack
1
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2024-10-01 05:36:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'patch-2' of git://github.com/fredericmohr/BookStack into fredericmohr-patch-2

Browse Source
This commit is contained in:
Dan Brown 2017-01-14 17:30:49 +00:00
commit e211f31370
No known key found for this signature in database
GPG Key ID: 46D9F943C24A2EF9
1 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
app/Services/Ldap.php
View File

@ -18,6 +18,24 @@ class Ldap
*/
public function connect($hostName, $port)
{
/*
* LDAPS is not working because even if port 363 is specified,
* BookStack tries to open a LDAP connection on the LDAPS channel.
* The if-clause below fixed this, although it would be better to
* change the settings in .env from
* LDAP_SERVER=servername:port
* to
* LDAP_SERVER=ldap://servername:389
* LDAP_SERVER=ldaps://servername:363
* in order to be compatible with non-standard setups. Currently,
* specifying ldap:// or ldaps:// results in an error because BookStack
* splits at ":" and takes the seconds chunk (in this case "//servername"
* as the port value.
*/
if ($port == 363)
{
$hostName = "ldaps://".$hostName;
}
return ldap_connect($hostName, $port);
}
@ -94,4 +112,4 @@ class Ldap
return ldap_bind($ldapConnection, $bindRdn, $bindPassword);
}
}
}