[autobackport: 1.2.x] profiles: add with-group-merging feature by sssd-bot · Pull Request #450 · authselect/authselect · GitHub
Skip to content

[autobackport: 1.2.x] profiles: add with-group-merging feature#450

Merged
thalman merged 3 commits into
authselect:1.2.xfrom
sssd-bot:authselect-authselect-backport-pr444-to-1.2.x
Jun 3, 2026
Merged

[autobackport: 1.2.x] profiles: add with-group-merging feature#450
thalman merged 3 commits into
authselect:1.2.xfrom
sssd-bot:authselect-authselect-backport-pr444-to-1.2.x

Conversation

@sssd-bot

Copy link
Copy Markdown

This is an automatic backport of PR#444 profiles: add with-group-merging feature to branch 1.2.x, 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/authselect.git
git fetch sssd-bot refs/heads/authselect-authselect-backport-pr444-to-1.2.x
git checkout authselect-authselect-backport-pr444-to-1.2.x
git push sssd-bot authselect-authselect-backport-pr444-to-1.2.x --force

Original commits
addc11a - profiles: add with-group-merging feature
d7eb795 - ci: check hardcoded altfiles on ostree systems

Backported commits

  • 0cdaf53 - CONFLICT! profiles: add with-group-merging feature
  • df39396 - CONFLICT! ci: check hardcoded altfiles on ostree systems

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

  • CONFLICT! profiles: add with-group-merging feature
On branch authselect-authselect-backport-pr444-to-1.2.x
You are currently cherry-picking commit addc11a.
  (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/rm <file>..." as appropriate to mark resolution)
	deleted by us:   profiles/local/README
	deleted by us:   profiles/local/nsswitch.conf
	both modified:   profiles/nis/README
	both modified:   profiles/nis/nsswitch.conf
	both modified:   profiles/sssd/README
	both modified:   profiles/sssd/nsswitch.conf
	both modified:   profiles/winbind/README
	both modified:   profiles/winbind/nsswitch.conf
	deleted by us:   src/tests/system/tests/test_sssd.py

no changes added to commit (use "git add" and/or "git commit -a")
```* CONFLICT! ci: check hardcoded altfiles on ostree systems

On branch authselect-authselect-backport-pr444-to-1.2.x
You are currently cherry-picking commit d7eb795.
(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/rm ..." as appropriate to mark resolution)
deleted by us: .github/workflows/ci.yml

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


---

**Original Pull Request Body**

This also makes group merging disabled by default. Group mergin
is not required by majority of users, but it makes all group lookups
to reach all providers (files, sss, systemd) which may cause performance
issues under some conditions.

It is better to let users who need it to enable it explicitly.

This also makes group merging disabled by default. Group mergin
is not required by majority of users, but it makes all group lookups
to reach all providers (files, sss, systemd) which may cause performance
issues under some conditions.

It is better to let users who need it to enable it explicitly.

(cherry picked from commit addc11a)
@pbrezina pbrezina force-pushed the authselect-authselect-backport-pr444-to-1.2.x branch 6 times, most recently from 4e5003c to 8e2ff1b Compare June 1, 2026 09:20
@pbrezina pbrezina force-pushed the authselect-authselect-backport-pr444-to-1.2.x branch from 8e2ff1b to 8f46196 Compare June 1, 2026 09:27
@pbrezina pbrezina marked this pull request as ready for review June 1, 2026 09:27
@pbrezina pbrezina requested a review from thalman June 2, 2026 12:47
Comment thread rpm/authselect.spec.in Outdated

@thalman thalman 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.

Please see the nitpicking comment ;-)

This simplifies future backports from master and especiall ostree
handling.
@pbrezina pbrezina force-pushed the authselect-authselect-backport-pr444-to-1.2.x branch from 8f46196 to 39cafbe Compare June 3, 2026 12:23
@pbrezina

pbrezina commented Jun 3, 2026

Copy link
Copy Markdown
Member

@thalman thalman 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.

ACK

@thalman thalman merged commit 7eb4a97 into authselect:1.2.x Jun 3, 2026
7 checks passed
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