Skip to content

[autobackport: sssd-2-9] pam: gate PAC indicator code on BUILD_SAMBA#8628

Merged
alexey-tikhonov merged 1 commit intoSSSD:sssd-2-9from
sssd-bot:SSSD-sssd-backport-pr8620-to-sssd-2-9
Apr 23, 2026
Merged

[autobackport: sssd-2-9] pam: gate PAC indicator code on BUILD_SAMBA#8628
alexey-tikhonov merged 1 commit intoSSSD:sssd-2-9from
sssd-bot:SSSD-sssd-backport-pr8620-to-sssd-2-9

Conversation

@sssd-bot
Copy link
Copy Markdown
Contributor

This is an automatic backport of PR#8620 pam: gate PAC indicator code on BUILD_SAMBA to branch sssd-2-9, created by @padelsbach.

Caution

@padelsbach 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-pr8620-to-sssd-2-9
git checkout SSSD-sssd-backport-pr8620-to-sssd-2-9
git push sssd-bot SSSD-sssd-backport-pr8620-to-sssd-2-9 --force

Original commits
d0becea - pam: gate PAC indicator code on BUILD_SAMBA

Backported commits

  • 63ab500 - CONFLICT! pam: gate PAC indicator code on BUILD_SAMBA

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

  • CONFLICT! pam: gate PAC indicator code on BUILD_SAMBA
On branch SSSD-sssd-backport-pr8620-to-sssd-2-9
You are currently cherry-picking commit d0beceaa1.
  (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)

Changes to be committed:
	modified:   src/man/sssd.conf.5.xml
	modified:   src/responder/pam/pamsrv.c
	modified:   src/responder/pam/pamsrv_gssapi.c

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   Makefile.am
	both modified:   src/man/Makefile.am

Original Pull Request Body

Commit 1f680ed added ad_pac_common.c and $(NDR_KRB5PAC_LIBS) to sssd_pam unconditionally. So when building --without-samba, sssd_pam fails to link with undefined references to ndr_pull_init_blob and ndr_pull_PAC_DATA.

This change qualifies those additions with BUILD_SAMBA so the PAC indicator feature is compiled in only when samba support is enabled.

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 gates PAC indicator functionality and its dependencies behind the BUILD_SAMBA conditional across the build system, man pages, and PAM responder. While the logic for conditional compilation appears correct, the PR contains critical issues: unresolved merge conflict markers are present in Makefile.am and src/man/Makefile.am, which will cause build failures. Furthermore, new test targets are defined but not registered for execution, and several man page conditionals were lost in the conflict, potentially leading to incomplete documentation.

Comment thread Makefile.am Outdated
Comment thread src/man/Makefile.am Outdated
@sumit-bose sumit-bose force-pushed the SSSD-sssd-backport-pr8620-to-sssd-2-9 branch from 63ab500 to 96415ae Compare April 22, 2026 10:48
@sumit-bose sumit-bose marked this pull request as ready for review April 22, 2026 10:48
@alexey-tikhonov
Copy link
Copy Markdown
Member

'system/c9s':

  /usr/include/gdm/gdm-pam-extensions.h:24:10: fatal error: gdm-choice-list-pam-extension.h: No such file or directory
     24 | #include "gdm-choice-list-pam-extension.h"
        |          ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

Copy link
Copy Markdown
Contributor

@sumit-bose sumit-bose left a comment

Choose a reason for hiding this comment

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

Hi,

the backport matches the original version of the patch, ACK.

bye,
Sumit

@alexey-tikhonov alexey-tikhonov removed the request for review from thalman April 23, 2026 14:28
@alexey-tikhonov alexey-tikhonov added no-backport This should go to target branch only. Accepted and removed Accepted labels Apr 23, 2026
@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-pr8620-to-sssd-2-9 branch from 96415ae to 0336b37 Compare April 23, 2026 14:36
Commit 1f680ed added ad_pac_common.c and
$(NDR_KRB5PAC_LIBS) to sssd_pam unconditionally. So when building --without-samba, sssd_pam fails to link with undefined references to ndr_pull_init_blob and ndr_pull_PAC_DATA.

This change qualifies those additions with `BUILD_SAMBA` so the PAC
indicator feature is compiled in only when samba support is enabled.

Reviewed-by: Sumit Bose <sbose@redhat.com>
Reviewed-by: Tomáš Halman <thalman@redhat.com>
(cherry picked from commit d0becea)
@sssd-bot sssd-bot force-pushed the SSSD-sssd-backport-pr8620-to-sssd-2-9 branch from 0336b37 to 95fd0b4 Compare April 23, 2026 14:39
@SSSD SSSD deleted a comment from sssd-bot Apr 23, 2026
@alexey-tikhonov alexey-tikhonov merged commit 423a309 into SSSD:sssd-2-9 Apr 23, 2026
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.

5 participants