[backport] [stable8] always use an LDAP URL when connecting to LDAP #21634

Merged
merged 1 commit into from Mar 1, 2016

Projects

None yet

5 participants

@blizzz
Contributor
blizzz commented Jan 11, 2016

Backport of #17924, cf. #17924 (comment)

Please test and review @PVince81 @MorrisJobke @owncloud/ldap

Oh, and give doublecare โ€“ the integration test cannot be backported, because those were only introduced into 8.1.

@blizzz blizzz added this to the 8.0.11-current-maintenance milestone Jan 11, 2016
@mention-bot

By analyzing the blame information on this pull request, we identified @LukasReschke, @MorrisJobke and @Xenopathic to be potential reviewers

@MorrisJobke
Member

@rperezb Can we have QA on this? Thanks

@MorrisJobke
Member

Tested and LDAP setup still works here ๐Ÿ‘

@blizzz blizzz always use an LDAP URL when connecting to LDAP
- without original integration test as infrastructure was introduced in 8.1 only
cb54370
@blizzz
Contributor
blizzz commented Jan 29, 2016

rebased

@MorrisJobke
Member

@owncloud/ldap @davitol @SergioBertolinSG This needs another reviewer ;)

@PVince81
Collaborator
PVince81 commented Mar 1, 2016

Somehow I can't reproduce the original issue. IIRC the issue was entering "localhost" instead of "ldap://localhost". But here both work on stable8.

@blizzz can you confirm ?

@blizzz
Contributor
blizzz commented Mar 1, 2016

@PVince81 Unfortunately,

This was independently observed by @MorrisJobke and @PVince81, but I cannot reproduce it on my system.

However, now in any case the connect should work in both wizard and normals usage, using the ldap:// protocol no matter whether you typed it or not. $host should always have protocol and port here https://github.com/owncloud/core/pull/21634/files#diff-e312bc894f109ef4a3a652b8db28734dR55 which is also the only place now for handling the connect parameters.

@PVince81
Collaborator
PVince81 commented Mar 1, 2016

Both variants "localhost" and "ldap://localhost" work for me on this branch. I checked that the users could be listed.

๐Ÿ‘

@PVince81 PVince81 merged commit b558fc4 into stable8 Mar 1, 2016

13 of 20 checks passed

core-ci-linux-swift-primary-storage/database=mysql,label=SLAVE Build #51111 failed in 23 sec
Details
ocs-api-integration-tests-ci Build #6811 failed in 10 sec
Details
server-master-linux-externals-ci/database=sqlite,external=smb-silvershell,label=SLAVE Build #6553 failed in 40 sec
Details
server-master-linux-externals-ci/database=sqlite,external=swift-ceph,label=SLAVE Build #6553 failed in 40 sec
Details
server-master-linux-externals-smb-windows-ext-ci/database=sqlite,external=smb-windows,label=master Build #6770 failed in 41 sec
Details
server-master-linux-php7-ci/database=sqlite,label=SLAVE Build #33978 failed in 40 sec
Details
smashbox-on-docker-ci/DOCKER_IMAGE=ubuntu_oc_lamp-git,TEST_NAME=test_sharePropagationInsideGroups,mirallBranch=v2.0.2,slave=SMASH Build #10959 failed in 5 min 54 sec
Details
cla-bot Build #1524 succeeded in 9.7 sec
Details
core-ci-linux-jsunit/database=sqlite,label=SLAVE Build #57400 succeeded in 31 sec
Details
core-ci-linux/database=mysql,label=SLAVE Build #26026 succeeded in 6 min 57 sec
Details
core-ci-linux/database=oci,label=SLAVE Build #26026 succeeded in 17 min
Details
core-ci-linux/database=pgsql,label=SLAVE Build #26026 succeeded in 7 min 5 sec
Details
core-ci-linux/database=sqlite,label=SLAVE Build #26026 succeeded in 3 min 40 sec
Details
server-master-linux-externals-ci/database=sqlite,external=webdav-ownCloud,label=SLAVE Build #6553 succeeded in 3 min 7 sec
Details
smashbox-on-docker-ci/DOCKER_IMAGE=ubuntu_oc_lamp-git,TEST_NAME=litmus,mirallBranch=v2.0.2,slave=SMASH Build #10959 succeeded in 3 min 53 sec
Details
smashbox-on-docker-ci/DOCKER_IMAGE=ubuntu_oc_lamp-git,TEST_NAME=test_basicSync@0,mirallBranch=v2.0.2,slave=SMASH Build #10959 succeeded in 12 min
Details
smashbox-on-docker-ci/DOCKER_IMAGE=ubuntu_oc_lamp-git,TEST_NAME=test_basicSync@1,mirallBranch=v2.0.2,slave=SMASH Build #10959 succeeded in 13 min
Details
smashbox-on-docker-ci/DOCKER_IMAGE=ubuntu_oc_lamp-git,TEST_NAME=test_shareLink,mirallBranch=v2.0.2,slave=SMASH Build #10959 succeeded in 17 min
Details
smashbox-on-docker-ci/DOCKER_IMAGE=ubuntu_oc_lamp-git,TEST_NAME=test_sharePermissions,mirallBranch=v2.0.2,slave=SMASH Build #10959 succeeded in 11 min
Details
smashbox-on-docker-ci/DOCKER_IMAGE=ubuntu_oc_lamp-git,TEST_NAME=test_sharePropagationGroups,mirallBranch=v2.0.2,slave=SMASH Build #10959 succeeded in 18 min
Details
@PVince81 PVince81 deleted the backport-17924-stable8 branch Mar 1, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment