Skip to content

Commit d79e542

Browse files
authored
Merge pull request #3696 from flatcar/tormath1/pam-sssd
package.use: enable back sssd for pambase
2 parents b9927a5 + 24cd546 commit d79e542

File tree

4 files changed

+25
-9
lines changed

4 files changed

+25
-9
lines changed
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
- Enabled back PAM sssd support for LDAP authentication ([scripts#3696](https://github.com/flatcar/scripts/pull/3696))

sdk_container/src/third_party/coreos-overlay/coreos/user-patches/sys-auth/pambase/0001-Reorganize-the-login-sessions.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 3eb1fea6104cd4bbc978e11974f337549edaf2e4 Mon Sep 17 00:00:00 2001
1+
From 7dce3aef1c67e5884aa7962c5c34a51d9760bd13 Mon Sep 17 00:00:00 2001
22
From: Krzesimir Nowak <knowak@microsoft.com>
33
Date: Thu, 9 Oct 2025 17:32:38 +0200
44
Subject: [PATCH 1/2] Reorganize the login sessions
@@ -163,5 +163,5 @@ index 150061f..690396f 100644
163163

164164
{% if sssd %}
165165
--
166-
2.51.0
166+
2.52.0
167167

sdk_container/src/third_party/coreos-overlay/coreos/user-patches/sys-auth/pambase/0002-Flatcar-modifications.patch

Lines changed: 21 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
From 55c811bb55334a9c5ba19e5c7ec61a9ede365a37 Mon Sep 17 00:00:00 2001
1+
From 41efbef049829f738d1e6ad172f4b1a8bc6a6e6d Mon Sep 17 00:00:00 2001
22
From: Krzesimir Nowak <knowak@microsoft.com>
33
Date: Fri, 10 Oct 2025 11:47:43 +0200
44
Subject: [PATCH 2/2] Flatcar modifications
55

66
---
7-
templates/system-auth.tpl | 20 ++++++++++++++------
8-
1 file changed, 14 insertions(+), 6 deletions(-)
7+
templates/system-auth.tpl | 24 +++++++++++++++---------
8+
1 file changed, 15 insertions(+), 9 deletions(-)
99

1010
diff --git a/templates/system-auth.tpl b/templates/system-auth.tpl
11-
index 905d04f..c78f9d6 100644
11+
index 905d04f..b211abb 100644
1212
--- a/templates/system-auth.tpl
1313
+++ b/templates/system-auth.tpl
1414
@@ -9,11 +9,15 @@ auth [default={{ 3 + homed + (sssd * 3) }}] pam_permit.so
@@ -30,7 +30,22 @@ index 905d04f..c78f9d6 100644
3030

3131
{% if homed %}
3232
auth [success=2 default=ignore] pam_systemd_home.so
33-
@@ -45,9 +49,13 @@ account [success={{ 2 if sssd else 1 }} default=ignore] pam_systemd_home.so
33+
@@ -21,13 +25,11 @@ auth [success=2 default=ignore] pam_systemd_home.so
34+
35+
{% if sssd %}
36+
auth sufficient pam_unix.so {{ nullok }} {{ debug }}
37+
+auth sufficient pam_sss.so forward_pass {{ debug }}
38+
{% else %}
39+
auth [success=1 new_authtok_reqd=1 ignore=ignore default=bad] pam_unix.so {{ nullok }} {{ debug }} try_first_pass
40+
{% endif %}
41+
auth [default=die] pam_faillock.so authfail
42+
-{% if sssd %}
43+
-auth sufficient pam_sss.so forward_pass {{ debug }}
44+
-{% endif %}
45+
{% if caps %}
46+
auth optional pam_cap.so
47+
{% endif %}
48+
@@ -45,9 +47,13 @@ account [success={{ 2 if sssd else 1 }} default=ignore] pam_systemd_home.so
3449
account required pam_unix.so {{ debug }}
3550
account required pam_faillock.so
3651
{% if sssd %}
@@ -48,5 +63,5 @@ index 905d04f..c78f9d6 100644
4863
{% endif %}
4964

5065
--
51-
2.51.0
66+
2.52.0
5267

sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.use

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ sys-apps/gawk -mpfr
193193

194194
# We never had passwdqc stuff in old pam sys configs, so disable it
195195
# for now. Maybe this is something to enable later.
196-
sys-auth/pambase securetty -passwdqc
196+
sys-auth/pambase securetty -passwdqc sssd
197197

198198
# We run the server in a container.
199199
dev-db/etcd -server

0 commit comments

Comments
 (0)