Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

(LDAP) API: return one base properly when multiple are configured #16011

Merged
merged 2 commits into from
Jun 19, 2019

Conversation

blizzz
Copy link
Member

@blizzz blizzz commented Jun 19, 2019

  • reading the config directly will return the value with line breaks
  • using the proper accessor gives us all bases in an array
  • returns the first matching one
  • having user id provided for the group base is strange and does not let
    us operate like this. here we return the first one. might change in
    future, a backportable fix won't have an API change however.

blizzz added 2 commits June 19, 2019 13:39
* reading the config directly will return the value with line breaks
* using the proper accessor gives us all bases in an array
* returns the first matching one
* having user id provided for the group base is strange and does not let
  us operate like this. here we return the first one. might change in
  future, a backportable fix won't have an API change however.

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* the backend already expects and works with the string

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
Copy link
Member

@skjnldsv skjnldsv left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Much cleaner!
Code looks good to me.

Though tests will tell ;)

@blizzz
Copy link
Member Author

blizzz commented Jun 19, 2019

/backport to stable16

@blizzz
Copy link
Member Author

blizzz commented Jun 19, 2019

/backport to stable15

@skjnldsv skjnldsv added 4. to release Ready to be released and/or waiting for tests to finish and removed 3. to review Waiting for reviews labels Jun 19, 2019
@blizzz blizzz merged commit 0d6e9a4 into master Jun 19, 2019
@blizzz blizzz deleted the fix/noid/ldapprovider-return-one-base branch June 19, 2019 15:19
@backportbot-nextcloud
Copy link

backport to stable16 in #16015

@backportbot-nextcloud
Copy link

The backport to stable15 failed. Please do this backport manually.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
4. to release Ready to be released and/or waiting for tests to finish bug feature: ldap
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants