Skip to content

[autobackport: sssd-2-9] Fix compilation errors#8476

Merged
alexey-tikhonov merged 9 commits into
SSSD:sssd-2-9from
sssd-bot:SSSD-sssd-backport-pr8469-to-sssd-2-9
Feb 24, 2026
Merged

[autobackport: sssd-2-9] Fix compilation errors#8476
alexey-tikhonov merged 9 commits into
SSSD:sssd-2-9from
sssd-bot:SSSD-sssd-backport-pr8469-to-sssd-2-9

Conversation

@sssd-bot

Copy link
Copy Markdown
Contributor

This is an automatic backport of PR#8469 Fix compilation errors to branch sssd-2-9, created by @alexey-tikhonov.

Caution

@alexey-tikhonov 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 [email protected]:sssd-bot/sssd.git
git fetch sssd-bot refs/heads/SSSD-sssd-backport-pr8469-to-sssd-2-9
git checkout SSSD-sssd-backport-pr8469-to-sssd-2-9
git push sssd-bot SSSD-sssd-backport-pr8469-to-sssd-2-9 --force

Original commits
2de3751 - UTIL: fix discarded-qualifiers warning in domain_to_basedn()
5548493 - SDAP: fix discarded-qualifiers warning in are_sids_from_same_dom()
ef104b7 - SDAP: fix discarded-qualifiers warnings in sdap_parse_range()
086a52e - SDAP: fix discarded-qualifiers warning in split_extra_attr()
0f21660 - AD: fix discarded-qualifiers warnings in ad_access filter parsing
24de2bc - CERTMAP: fix discarded-qualifiers warnings in sss_certmap.c
68edad9 - KRB5: fix discarded-qualifiers warning in compare_principal_realm()
9e517f8 - Makefile: add missing 'CMOCKA_CFLAGS'
39db12d - BUILD: supress 'deprecated-declarations' error for cmocka tests
54c6340 - BUILD: fix _POSIX_C_SOURCE redefinition with Python 3.14 and glibc 2.41+

Backported commits

  • 1c079e2 - UTIL: fix discarded-qualifiers warning in domain_to_basedn()
  • 588d6dc - SDAP: fix discarded-qualifiers warning in are_sids_from_same_dom()
  • cd3a597 - SDAP: fix discarded-qualifiers warnings in sdap_parse_range()
  • 5192843 - SDAP: fix discarded-qualifiers warning in split_extra_attr()
  • 0a1a6f4 - AD: fix discarded-qualifiers warnings in ad_access filter parsing
  • 1b33fab - CERTMAP: fix discarded-qualifiers warnings in sss_certmap.c
  • 02cb585 - KRB5: fix discarded-qualifiers warning in compare_principal_realm()
  • 6feb337 - CONFLICT! Makefile: add missing 'CMOCKA_CFLAGS'
  • eb8a5c5 - BUILD: supress 'deprecated-declarations' error for cmocka tests
  • f8c2aed - CONFLICT! BUILD: fix _POSIX_C_SOURCE redefinition with Python 3.14 and glibc 2.41+

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

  • CONFLICT! Makefile: add missing 'CMOCKA_CFLAGS'
On branch SSSD-sssd-backport-pr8469-to-sssd-2-9
You are currently cherry-picking commit 9e517f84b.
  (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:   Makefile.am

no changes added to commit (use "git add" and/or "git commit -a")
```* CONFLICT! BUILD: fix _POSIX_C_SOURCE redefinition with Python 3.14 and glibc 2.41+

On branch SSSD-sssd-backport-pr8469-to-sssd-2-9
You are currently cherry-picking commit 54c6340.
(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 ..." to mark resolution)
both modified: src/util/sss_python.h

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


---

**Original Pull Request Body**


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

Copy link
Copy Markdown

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 is an automatic backport to fix compilation errors. The changes include correcting discarded-qualifiers warnings in several C files by adjusting pointer types for const correctness, which is appropriate. However, critical issues exist in Makefile.am and src/util/sss_python.h where unresolved merge conflicts are present. These conflicts must be resolved before the pull request can be merged.

Comment thread Makefile.am Outdated
Comment thread src/util/sss_python.h Outdated
@alexey-tikhonov
alexey-tikhonov force-pushed the SSSD-sssd-backport-pr8469-to-sssd-2-9 branch from f8c2aed to 6c7aa78 Compare February 23, 2026 15:30
@alexey-tikhonov alexey-tikhonov added the no-backport This should go to target branch only. label Feb 23, 2026
@alexey-tikhonov
alexey-tikhonov marked this pull request as ready for review February 23, 2026 15:57

@thalman thalman left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

ACK, thanks

Use a separate `const char *dot` variable for the strchr() result
on the const input string, keeping the mutable `char *p` for the
later iteration over the output buffer.

Implementation-By: Claude Code (Opus 4.6)
Reviewed-by: Tomáš Halman <[email protected]>
(cherry picked from commit 2de3751)
Make rid1 and rid2 `const char *` since they only hold strrchr()
results from const input strings and are used for pointer arithmetic.

Implementation-By: Claude Code (Opus 4.6)
Reviewed-by: Tomáš Halman <[email protected]>
(cherry picked from commit 5548493)
Make endptr and end_range `const char *` since they only hold
strchr()/strrchr() results from const input strings. Introduce a
separate `numendptr` variable for the strtouint32() output parameter.

Implementation-By: Claude Code (Opus 4.6)
Reviewed-by: Tomáš Halman <[email protected]>
(cherry picked from commit ef104b7)
Make sep `const char *` since it only holds a strchr() result
from a const input string and is used for pointer arithmetic.

Implementation-By: Claude Code (Opus 4.6)
Reviewed-by: Tomáš Halman <[email protected]>
(cherry picked from commit 086a52e)
Make specdelim and kwdelim `const char *` in parse_sub_filter() and
parse_filter() since they only hold strchr() results from const
input strings and are used for pointer arithmetic.

Implementation-By: Claude Code (Opus 4.6)
Reviewed-by: Tomáš Halman <[email protected]>
(cherry picked from commit 0f21660)
Make delim in get_type_prefix() and sep in expand_sid() `const char *`
since they only hold strchr()/strrchr() results from const input
strings and are used for pointer arithmetic and reading.

Implementation-By: Claude Code (Opus 4.6)
Reviewed-by: Tomáš Halman <[email protected]>
(cherry picked from commit 24de2bc)
Make at_sign `const char *` since it only holds a strchr() result
from a const input string and is used for reading.

Implementation-By: Claude Code (Opus 4.6)
Reviewed-by: Tomáš Halman <[email protected]>
(cherry picked from commit 68edad9)
Assisted-By: Claude Code (Opus 4.6)
Reviewed-by: Tomáš Halman <[email protected]>
(cherry picked from commit 9e517f8)
Older Fedora versions still have cmocka < 2.0.0 making it
inconvinient to support two interfaces.

Reviewed-by: Tomáš Halman <[email protected]>
(cherry picked from commit 39db12d)
@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-pr8469-to-sssd-2-9 branch from 6c7aa78 to d60e7e6 Compare February 24, 2026 10:08
@alexey-tikhonov
alexey-tikhonov merged commit 361b5d2 into SSSD:sssd-2-9 Feb 24, 2026
7 of 8 checks passed
@alexey-tikhonov alexey-tikhonov added backport-to-sssd-2-9-4 Corresponds to C8S and removed no-backport This should go to target branch only. labels Apr 15, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants