1 |
commit: 93165fa671e7c6fe41a09302f3c00a140dd6ec9b |
2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Jan 31 21:36:48 2021 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Jan 31 21:37:12 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/pambase.git/commit/?id=93165fa6 |
7 |
|
8 |
Revert "systemd-auth: add systemd-homed support" |
9 |
|
10 |
This reverts commit 5a545eb14a1220af1ba8031f3669471e77edbc2f. |
11 |
Auto-merged on a reverted commit. |
12 |
|
13 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
14 |
|
15 |
pambase.py | 1 - |
16 |
templates/system-auth.tpl | 18 ++---------------- |
17 |
templates/system-session.tpl | 4 ---- |
18 |
3 files changed, 2 insertions(+), 21 deletions(-) |
19 |
|
20 |
diff --git a/pambase.py b/pambase.py |
21 |
index c078156..278d578 100755 |
22 |
--- a/pambase.py |
23 |
+++ b/pambase.py |
24 |
@@ -14,7 +14,6 @@ def main(): |
25 |
parser.add_argument('--pwquality', action="store_true", help='enable pam_pwquality.so module') |
26 |
parser.add_argument('--elogind', action="store_true", help='enable pam_elogind.so module') |
27 |
parser.add_argument('--systemd', action="store_true", help='enable pam_systemd.so module') |
28 |
- parser.add_argument('--homed', action="store_true", help='enable pam_systemd_home.so module') |
29 |
parser.add_argument('--selinux', action="store_true", help='enable pam_selinux.so module') |
30 |
parser.add_argument('--mktemp', action="store_true", help='enable pam_mktemp.so module') |
31 |
parser.add_argument('--pam-ssh', action="store_true", help='enable pam_ssh.so module') |
32 |
|
33 |
diff --git a/templates/system-auth.tpl b/templates/system-auth.tpl |
34 |
index 1adee05..01a29db 100644 |
35 |
--- a/templates/system-auth.tpl |
36 |
+++ b/templates/system-auth.tpl |
37 |
@@ -8,26 +8,16 @@ auth [success=3 default=ignore] pam_krb5.so {{ krb5_params }} |
38 |
{% endif %} |
39 |
|
40 |
auth requisite pam_faillock.so preauth |
41 |
-{% if homed %} |
42 |
-auth [success=2 default=ignore] pam_unix.so {{ nullok|default('', true) }} {{ debug|default('', true) }} try_first_pass |
43 |
-auth [success=1 default=ignore] pam_systemd_home.so |
44 |
-{% else %} |
45 |
-auth [success=1 default=ignore] pam_unix.so {{ nullok|default('', true) }} {{ debug|default('', true) }} try_first_pas |
46 |
-{% endif %} |
47 |
+auth [success=1 default=ignore] pam_unix.so {{ nullok|default('', true) }} {{ debug|default('', true) }} try_first_pass |
48 |
auth [default=die] pam_faillock.so authfail |
49 |
|
50 |
{% if caps %} |
51 |
-auth optional pam_cap.so |
52 |
+-auth optional pam_cap.so |
53 |
{% endif %} |
54 |
|
55 |
{% if krb5 %} |
56 |
account [success=2 default=ignore] pam_krb5.so {{ krb5_params }} |
57 |
{% endif %} |
58 |
- |
59 |
-{% if homed %} |
60 |
-account [success=1 default=ignore] pam_systemd_home.so |
61 |
-{% endif %} |
62 |
- |
63 |
account required pam_unix.so {{ debug|default('', true) }} |
64 |
account required pam_faillock.so |
65 |
|
66 |
@@ -47,10 +37,6 @@ password required pam_pwhistory.so use_authtok remember=5 retry=3 |
67 |
password [success=1 default=ignore] pam_krb5.so {{ krb5_params }} |
68 |
{% endif %} |
69 |
|
70 |
-{% if homed %} |
71 |
-password [success=1 default=ignore] pam_systemd_home.so |
72 |
-{% endif %} |
73 |
- |
74 |
{% if passwdqc or pwquality %} |
75 |
password required pam_unix.so try_first_pass {{ unix_authtok|default('', true) }} {{ nullok|default('', true) }} {{ unix_extended_encryption|default('', true) }} {{ debug|default('', true) }} |
76 |
{% else %} |
77 |
|
78 |
diff --git a/templates/system-session.tpl b/templates/system-session.tpl |
79 |
index 536db49..2a7024b 100644 |
80 |
--- a/templates/system-session.tpl |
81 |
+++ b/templates/system-session.tpl |
82 |
@@ -8,8 +8,4 @@ session optional pam_mktemp.so |
83 |
session [success=1 default=ignore] pam_krb5.so {{ krb5_params }} |
84 |
{% endif %} |
85 |
|
86 |
-{% if homed %} |
87 |
-session [success=1 default=ignore] pam_systemd_home.so |
88 |
-{% endif %} |
89 |
- |
90 |
session required pam_unix.so {{ debug|default('', true) }} |