Skip to content

Update Ldap.php to allow LDAP over SSL/TLS connections - #236

Merged
ssddanbrown merged 1 commit into
BookStackApp:masterfrom
fredericmohr:patch-2
Jan 14, 2017
Merged

ssddanbrown merged 1 commit into
BookStackApp:masterfrom
fredericmohr:patch-2

Conversation

@fredericmohr

Copy link
Copy Markdown
Contributor

This is a very crude workaround to allow LDAPS connections. A better solution would be the one explained in the comments.

This is a very crude workaround, a better solution is explained in the comments I added.
@ssddanbrown ssddanbrown added this to the BookStack Beta v0.14 milestone Dec 3, 2016
@ssddanbrown
ssddanbrown merged commit 340d3f8 into BookStackApp:master Jan 14, 2017
ssddanbrown added a commit that referenced this pull request Jan 14, 2017
As per details by fredericmohr in #236
@ssddanbrown

Copy link
Copy Markdown
Member

@fredericmohr Thanks for this and sorry it's taken me a while to getting round to merging your pull request.

I have followed your comments and updated the ldap in 598b07b so that a protocol can be optionally specified without breaking. Port 636 or 389 will then be used, depending on protocol type, unless a port is specified by the user.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Development

Successfully merging this pull request may close these issues.

2 participants