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.

Sign up for GitHub

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

Jump to bottom

Avoid double ldap_unbind in Wizard.php #34523

Merged
merged 2 commits into from
Oct 11, 2022
Merged

Avoid double ldap_unbind in Wizard.php #34523

merged 2 commits into from
Oct 11, 2022

Conversation

come-nc
Copy link
Contributor

@come-nc come-nc commented Oct 11, 2022

Fix #34086

Signed-off-by: Côme Chilliet come.chilliet@nextcloud.com

@come-nc come-nc added the 3. to review Waiting for reviews label Oct 11, 2022
@come-nc come-nc added this to the Nextcloud 25 milestone Oct 11, 2022
@come-nc come-nc requested a review from blizzz October 11, 2022 07:51
@come-nc come-nc self-assigned this Oct 11, 2022
@come-nc come-nc requested review from a team, icewind1991 and CarlSchwan and removed request for a team October 11, 2022 07:51
@come-nc
Fix code style with codesniffer
0a9a749 
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
@come-nc
Avoid double ldap_unbind in Wizard.php
1d2d6e8 
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
@come-nc come-nc force-pushed the fix/ldap-avoid-double-unbind-in-wizard branch from c1e6c2a to 1d2d6e8 Compare October 11, 2022 07:54
@come-nc
Copy link
Contributor Author

come-nc commented Oct 11, 2022 •
edited
Loading

First commit is codesniffer only, what needs reviewing is the second commit, which removes a second call to unbind.
The first call is on 1d2d6e8#diff-03b35462543a3b900e8f873748210bae9370322383d5acd5c17913f31df1db96L1090 (Line 1090)

@blizzz blizzz mentioned this pull request Oct 11, 2022
Merged
2 tasks
@blizzz blizzz modified the milestones: Nextcloud 25, Nextcloud 26 Oct 11, 2022
@blizzz
Copy link
Member

blizzz commented Oct 11, 2022

master is 26

@come-nc
Copy link
Contributor Author

come-nc commented Oct 11, 2022

/backport to stable25

PVince81
PVince81 approved these changes Oct 11, 2022
View reviewed changes
Copy link
Member

@PVince81 PVince81 left a comment

Choose a reason for hiding this comment

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

👍

@PVince81 PVince81 added 4. to release Ready to be released and/or waiting for tests to finish and removed 3. to review Waiting for reviews labels Oct 11, 2022
@come-nc
Copy link
Contributor Author

come-nc commented Oct 11, 2022

/backport to stable24

@come-nc
Copy link
Contributor Author

come-nc commented Oct 11, 2022

/backport to stable23

@come-nc
Copy link
Contributor Author

come-nc commented Oct 11, 2022

CI failure unrelated

@come-nc come-nc merged commit 8d05e18 into master Oct 11, 2022
@come-nc come-nc deleted the fix/ldap-avoid-double-unbind-in-wizard branch October 11, 2022 13:50
@come-nc
Copy link
Contributor Author

come-nc commented Oct 13, 2022

/backport to stable25

@backportbot-nextcloud
Copy link

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

@come-nc come-nc mentioned this pull request Oct 13, 2022
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@PVince81 PVince81 PVince81 approved these changes

@blizzz blizzz blizzz approved these changes

@icewind1991 icewind1991 Awaiting requested review from icewind1991

@CarlSchwan CarlSchwan Awaiting requested review from CarlSchwan

Assignees

@come-nc come-nc

Labels
4. to release Ready to be released and/or waiting for tests to finish
Projects
None yet
Milestone
Nextcloud 26
Development

Successfully merging this pull request may close these issues.

[Bug]: Nc 25 TypeError: ldap_unbind(): supplied resource is not a valid ldap link resource
3 participants
@come-nc @blizzz @PVince81