Skip to content

[autobackport: sssd-2-9] sdap: handle missing rootDSE gracefully#8735

Merged
alexey-tikhonov merged 1 commit into
SSSD:sssd-2-9from
sssd-bot:SSSD-sssd-backport-pr8706-to-sssd-2-9
May 27, 2026
Merged

[autobackport: sssd-2-9] sdap: handle missing rootDSE gracefully#8735
alexey-tikhonov merged 1 commit into
SSSD:sssd-2-9from
sssd-bot:SSSD-sssd-backport-pr8706-to-sssd-2-9

Conversation

@sssd-bot
Copy link
Copy Markdown
Contributor

This is an automatic backport of PR#8706 sdap: handle missing rootDSE gracefully to branch sssd-2-9, created by @pbrezina.

Caution

@pbrezina The patches did not apply cleanly. It is necessary to resolve conflicts before merging this pull request. Commits that introduced conflict are marked with CONFLICT!.

You can push changes to this pull request

git remote add sssd-bot git@github.com:sssd-bot/sssd.git
git fetch sssd-bot refs/heads/SSSD-sssd-backport-pr8706-to-sssd-2-9
git checkout SSSD-sssd-backport-pr8706-to-sssd-2-9
git push sssd-bot SSSD-sssd-backport-pr8706-to-sssd-2-9 --force

Original commits
2cc7dfa - sdap: handle missing rootDSE gracefully

Backported commits

  • 7a96d83 - CONFLICT! sdap: handle missing rootDSE gracefully

Conflicting Files Information (check for deleted and re-added files)

  • CONFLICT! sdap: handle missing rootDSE gracefully
On branch SSSD-sssd-backport-pr8706-to-sssd-2-9
You are currently cherry-picking commit 2cc7dfa18.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   src/providers/ldap/sdap_async_connection.c

no changes added to commit (use "git add" and/or "git commit -a")

Original Pull Request Body

If ldap_read_rootdse = never then srv_opts which is unexpected. It can
also happen on other path in the connection code, because
sdap_cli_use_rootdse() is called only when the rootDSE is successfully
fetch. This patch makes sure that srv_opts are always set.

:fixes: SSSD no longer crashes if ldap_read_rootdse = never and
enumarete = true

Copy link
Copy Markdown

@gemini-code-assist gemini-code-assist Bot left a comment

Choose a reason for hiding this comment

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

Code Review

This pull request introduces changes to handle missing rootDSE gracefully in sdap_async_connection.c. However, the changes contain multiple unresolved git merge conflict markers (such as <<<<<<< HEAD, =======, and >>>>>>>), which will prevent compilation. These conflict markers must be resolved and cleaned up.

Comment thread src/providers/ldap/sdap_async_connection.c Outdated
Comment thread src/providers/ldap/sdap_async_connection.c Outdated
@pbrezina pbrezina force-pushed the SSSD-sssd-backport-pr8706-to-sssd-2-9 branch from 7a96d83 to 4d9dd2f Compare May 27, 2026 12:45
@pbrezina pbrezina marked this pull request as ready for review May 27, 2026 12:45
Copy link
Copy Markdown
Contributor

@thalman thalman left a comment

Choose a reason for hiding this comment

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

ACK

@alexey-tikhonov alexey-tikhonov added no-backport This should go to target branch only. Accepted labels May 27, 2026
If `ldap_read_rootdse = never` then srv_opts is NULL which is unexpected.
It can also happen on other path in the connection code, because
sdap_cli_use_rootdse() is called only when the rootDSE is successfully
fetch. This patch makes sure that srv_opts are always set.

:fixes: SSSD no longer crashes if `ldap_read_rootdse = never` and
  `enumerate = true`

Reviewed-by: Alexey Tikhonov <atikhono@redhat.com>
Reviewed-by: Tomáš Halman <thalman@redhat.com>
(cherry picked from commit 2cc7dfa)
@sssd-bot
Copy link
Copy Markdown
Contributor Author

The pull request was accepted by @alexey-tikhonov with the following PR CI status:


🟢 CodeQL (success)
🟢 rpm-build:centos-stream-9-x86_64:upstream (success)
🟢 Build / make-distcheck (success)
🟢 ci / prepare (success)
🟢 ci / system (centos-9) (success)
🟢 Static code analysis / codeql (success)
🟢 Static code analysis / pre-commit (success)
🟢 Static code analysis / python-system-tests (success)


There are unsuccessful or unfinished checks. Make sure that the failures are not related to this pull request before merging.

@sssd-bot sssd-bot force-pushed the SSSD-sssd-backport-pr8706-to-sssd-2-9 branch from 4d9dd2f to efd8df8 Compare May 27, 2026 15:35
@alexey-tikhonov alexey-tikhonov merged commit 7640a7a into SSSD:sssd-2-9 May 27, 2026
8 of 9 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Accepted no-backport This should go to target branch only.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants