summaryrefslogtreecommitdiffstats
path: root/apps/user_ldap/lib/connection.php
diff options
context:
space:
mode:
authorArthur Schiwon <blizzz@owncloud.com>2015-07-28 12:14:05 +0200
committerArthur Schiwon <blizzz@owncloud.com>2015-12-05 00:09:15 +0100
commita32b002cff4ace48a06fe7f45be85cb64862fbbe (patch)
tree6052d6f075fac8a2cb56c77c810164bd9b218b7b /apps/user_ldap/lib/connection.php
parente91eba4b5bd856cb1ef81996ace6d16c09f1bb01 (diff)
downloadnextcloud-server-a32b002cff4ace48a06fe7f45be85cb64862fbbe.tar.gz
nextcloud-server-a32b002cff4ace48a06fe7f45be85cb64862fbbe.zip
always use an LDAP URL when connecting to LDAP
Diffstat (limited to 'apps/user_ldap/lib/connection.php')
-rw-r--r--apps/user_ldap/lib/connection.php4
1 files changed, 0 insertions, 4 deletions
diff --git a/apps/user_ldap/lib/connection.php b/apps/user_ldap/lib/connection.php
index 3f3953bb28b..57dc060f38e 100644
--- a/apps/user_ldap/lib/connection.php
+++ b/apps/user_ldap/lib/connection.php
@@ -575,10 +575,6 @@ class Connection extends LDAPUtility {
if(empty($host)) {
return false;
}
- if(strpos($host, '://') !== false) {
- //ldap_connect ignores port parameter when URLs are passed
- $host .= ':' . $port;
- }
$this->ldapConnectionRes = $this->ldap->connect($host, $port);
if($this->ldap->setOption($this->ldapConnectionRes, LDAP_OPT_PROTOCOL_VERSION, 3)) {
if($this->ldap->setOption($this->ldapConnectionRes, LDAP_OPT_REFERRALS, 0)) {