[PR #1386] [CLOSED] Concat hostName and port for ldap_connect #5805

Closed
opened 2026-02-05 10:17:33 +03:00 by OVERLORD · 0 comments
Owner

📋 Pull Request Information

Original PR: https://github.com/BookStackApp/BookStack/pull/1386
Author: @arkraft
Created: 4/11/2019
Status: Closed

Base: masterHead: fix/ldap_over_tls


📝 Commits (1)

  • 5ad9487 concat hostName and port for ldap_connect

📊 Changes

1 file changed (+4 additions, -1 deletions)

View changed files

📝 app/Auth/Access/Ldap.php (+4 -1)

📄 Description

Instead of using two parameters for ldap_connect (hostName and port), this PR combines them to a single parameter. The docs of ldap_connect describe the host parameter as either a hostName or a LDAP URI. In case the latter is used, the second parameter (port) is ignored. When using a protocol, the parameters are combined, otherwise it stays the same.

It works for me with ldaps now, did not test it without the protocol.

resolves #1220


🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.

## 📋 Pull Request Information **Original PR:** https://github.com/BookStackApp/BookStack/pull/1386 **Author:** [@arkraft](https://github.com/arkraft) **Created:** 4/11/2019 **Status:** ❌ Closed **Base:** `master` ← **Head:** `fix/ldap_over_tls` --- ### 📝 Commits (1) - [`5ad9487`](https://github.com/BookStackApp/BookStack/commit/5ad9487ef6b28752fb174d80480e7989e9cd01ba) concat hostName and port for ldap_connect ### 📊 Changes **1 file changed** (+4 additions, -1 deletions) <details> <summary>View changed files</summary> 📝 `app/Auth/Access/Ldap.php` (+4 -1) </details> ### 📄 Description Instead of using two parameters for ldap_connect (hostName and port), this PR combines them to a single parameter. The docs of [ldap_connect](https://www.php.net/manual/en/function.ldap-connect.php) describe the host parameter as either a hostName or a LDAP URI. In case the latter is used, the second parameter (port) is ignored. When using a protocol, the parameters are combined, otherwise it stays the same. It works for me with `ldaps` now, did not test it without the protocol. resolves #1220 --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>
OVERLORD added the pull-request label 2026-02-05 10:17:33 +03:00
Sign in to join this conversation.
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: starred/BookStack#5805