Skip to content

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

Merged
blizzz merged 2 commits into
masterfrom
fix/noid/ldapprovider-return-one-base
Jun 19, 2019
Merged

(LDAP) API: return one base properly when multiple are configured#16011
blizzz merged 2 commits into
masterfrom
fix/noid/ldapprovider-return-one-base

Conversation

@blizzz

Copy link
Copy Markdown
Member
  • 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>

@skjnldsvskjnldsv left a comment

Copy link
Copy Markdown
Member

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
Copy Markdown
MemberAuthor

/backport to stable16

@blizzz

Copy link
Copy Markdown
MemberAuthor

/backport to stable15

@skjnldsvskjnldsv 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 masterJun 19, 2019
@blizzz
blizzz deleted the fix/noid/ldapprovider-return-one-base branch June 19, 2019 15:19
@backportbot-nextcloud

Copy link
Copy Markdown

backport to stable16 in #16015

@backportbot-nextcloud

Copy link
Copy Markdown

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

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

Labels

4. to releaseReady to be released and/or waiting for tests to finishbugfeature: ldap

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@blizzz@ChristophWurst@skjnldsv