| 1 |
commit: 2c873cb38ef20d7eb83b5e4aee723c34d64bde3d |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Jan 31 21:36:41 2021 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Jan 31 21:37:04 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/pambase.git/commit/?id=2c873cb3 |
| 7 |
|
| 8 |
Revert "Add systemd-homed support" |
| 9 |
|
| 10 |
This reverts commit 639b45ccb986de7314372a4a841e6f04c536c49a. |
| 11 |
Unintentionally had this staged still. |
| 12 |
|
| 13 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 14 |
|
| 15 |
pambase.py | 1 - |
| 16 |
templates/system-auth.tpl | 6 ------ |
| 17 |
templates/system-session.tpl | 4 ---- |
| 18 |
3 files changed, 11 deletions(-) |
| 19 |
|
| 20 |
diff --git a/pambase.py b/pambase.py |
| 21 |
index b306ca4..c078156 100755 |
| 22 |
--- a/pambase.py |
| 23 |
+++ b/pambase.py |
| 24 |
@@ -9,7 +9,6 @@ def main(): |
| 25 |
parser = argparse.ArgumentParser(description='basic Gentoo PAM configuration files') |
| 26 |
parser.add_argument('--gnome-keyring', action="store_true", help='enable pam_gnome_keyring.so module') |
| 27 |
parser.add_argument('--caps', action="store_true", help='enable pam_cap.so module') |
| 28 |
- parser.add_argument('--homed', action="store_true", help='enable pam_systemd_homed.so module') |
| 29 |
parser.add_argument('--passwdqc', action="store_true", help='enable pam_passwdqc.so module') |
| 30 |
parser.add_argument('--pwhistory', action="store_true", help='enable pam_pwhistory.so module') |
| 31 |
parser.add_argument('--pwquality', action="store_true", help='enable pam_pwquality.so module') |
| 32 |
|
| 33 |
diff --git a/templates/system-auth.tpl b/templates/system-auth.tpl |
| 34 |
index 174aacf..1adee05 100644 |
| 35 |
--- a/templates/system-auth.tpl |
| 36 |
+++ b/templates/system-auth.tpl |
| 37 |
@@ -2,9 +2,6 @@ auth required pam_env.so {{ debug|default('', true) }} |
| 38 |
{% if pam_ssh %} |
| 39 |
auth sufficient pam_ssh.so |
| 40 |
{% endif %} |
| 41 |
-{% if homed %} |
| 42 |
--auth sufficient pam_systemd_home.so |
| 43 |
-{% endif %} |
| 44 |
|
| 45 |
{% if krb5 %} |
| 46 |
auth [success=3 default=ignore] pam_krb5.so {{ krb5_params }} |
| 47 |
@@ -23,9 +20,6 @@ auth [default=die] pam_faillock.so authfail |
| 48 |
auth optional pam_cap.so |
| 49 |
{% endif %} |
| 50 |
|
| 51 |
-{% if homed %} |
| 52 |
--account sufficient pam_systemd_home.so |
| 53 |
-{% endif %} |
| 54 |
{% if krb5 %} |
| 55 |
account [success=2 default=ignore] pam_krb5.so {{ krb5_params }} |
| 56 |
{% endif %} |
| 57 |
|
| 58 |
diff --git a/templates/system-session.tpl b/templates/system-session.tpl |
| 59 |
index 48653d4..536db49 100644 |
| 60 |
--- a/templates/system-session.tpl |
| 61 |
+++ b/templates/system-session.tpl |
| 62 |
@@ -4,10 +4,6 @@ session required pam_env.so {{ debug|default('', true) }} |
| 63 |
session optional pam_mktemp.so |
| 64 |
{% endif %} |
| 65 |
|
| 66 |
-{% if homed %} |
| 67 |
--session optional pam_systemd_home.so |
| 68 |
-{% endif %} |
| 69 |
- |
| 70 |
{%if krb5 %} |
| 71 |
session [success=1 default=ignore] pam_krb5.so {{ krb5_params }} |
| 72 |
{% endif %} |
Archives