commit: 901694ca04d8f508fef56a1ff3b697bf9dab22df Author: Thibaud CANALE <thican <AT> thican <DOT> net> AuthorDate: Sun Feb 23 13:07:12 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Thu Mar 13 08:53:41 2025 +0000 URL: https://gitweb.gentoo.org/proj/pambase.git/commit/?id=901694ca
templates/*: replace groups of spaces by tabulations Signed-off-by: Thibaud CANALE <thican <AT> thican.net> Closes: https://github.com/gentoo/pambase/pull/23 Signed-off-by: Sam James <sam <AT> gentoo.org> templates/other.tpl | 2 +- templates/system-auth.tpl | 22 +++++++++++----------- templates/system-login.tpl | 2 +- templates/system-services.tpl | 2 +- templates/system-session.tpl | 2 +- tests/rendered/custom/other | 2 +- tests/rendered/custom/system-auth | 4 ++-- tests/rendered/custom/system-services | 2 +- tests/rendered/default/other | 2 +- tests/rendered/default/system-auth | 6 +++--- tests/rendered/default/system-services | 2 +- tests/rendered/minimal/other | 2 +- tests/rendered/minimal/system-auth | 6 +++--- tests/rendered/minimal/system-services | 2 +- 14 files changed, 29 insertions(+), 29 deletions(-) diff --git a/templates/other.tpl b/templates/other.tpl index 9544f8e..d58f0c1 100644 --- a/templates/other.tpl +++ b/templates/other.tpl @@ -1,4 +1,4 @@ auth required pam_deny.so account required pam_deny.so -password required pam_deny.so +password required pam_deny.so session required pam_deny.so diff --git a/templates/system-auth.tpl b/templates/system-auth.tpl index 9a274a4..9ecb27a 100644 --- a/templates/system-auth.tpl +++ b/templates/system-auth.tpl @@ -4,7 +4,7 @@ auth sufficient pam_ssh.so {% endif %} {% if krb5 %} -auth [success={{ 4 if homed else 3 }} default=ignore] pam_krb5.so {{ krb5_params }} +auth [success={{ 4 if homed else 3 }} default=ignore] pam_krb5.so {{ krb5_params }} {% endif %} {% if sssd %} @@ -15,13 +15,13 @@ auth [default=3 ignore=ignore success=ok] pam_localuser.so auth requisite pam_faillock.so preauth {% if homed %} -auth [success=2 default=ignore] pam_systemd_home.so +auth [success=2 default=ignore] pam_systemd_home.so {% endif %} {% if sssd %} -auth sufficient pam_unix.so {{ nullok|default('', true) }} {{ debug|default('', true) }} +auth sufficient pam_unix.so {{ nullok|default('', true) }} {{ debug|default('', true) }} {% else %} -auth [success=1 new_authtok_reqd=1 ignore=ignore default=bad] pam_unix.so {{ nullok|default('', true) }} {{ debug|default('', true) }} try_first_pass +auth [success=1 new_authtok_reqd=1 ignore=ignore default=bad] pam_unix.so {{ nullok|default('', true) }} {{ debug|default('', true) }} try_first_pass {% endif %} auth [default=die] pam_faillock.so authfail {% if sssd %} @@ -38,15 +38,15 @@ account [success=2 default=ignore] pam_krb5.so {{ krb5_params }} {% endif %} {% if homed %} -account [success={{ 2 if sssd else 1 }} default=ignore] pam_systemd_home.so +account [success={{ 2 if sssd else 1 }} default=ignore] pam_systemd_home.so {% endif %} account required pam_unix.so {{ debug|default('', true) }} -account required pam_faillock.so +account required pam_faillock.so {% if sssd %} account sufficient pam_localuser.so account sufficient pam_usertype.so issystem -account [default=bad success=ok user_unknown=ignore] pam_sss.so {{ debug|default('', true) }} +account [default=bad success=ok user_unknown=ignore] pam_sss.so {{ debug|default('', true) }} account required pam_permit.so {% endif %} @@ -55,11 +55,11 @@ password required pam_passwdqc.so config=/etc/security/passwdqc.conf {% endif %} {% if pwquality %} -password required pam_pwquality.so {{ local_users_only|default('', true ) }} +password required pam_pwquality.so {{ local_users_only|default('', true ) }} {% endif %} {% if pwhistory %} -password required pam_pwhistory.so use_authtok remember=5 retry=3 +password required pam_pwhistory.so use_authtok remember=5 retry=3 {% endif %} {% if krb5 %} @@ -67,13 +67,13 @@ password [success=1 default=ignore] pam_krb5.so {{ krb5_params }} {% endif %} {% if homed %} -password [success=1 default=ignore] pam_systemd_home.so +password [success=1 default=ignore] pam_systemd_home.so {% endif %} {% if passwdqc or pwquality %} password {{ 'sufficient' if sssd else 'required' }} pam_unix.so try_first_pass {{ unix_authtok|default('', true) }} {{ nullok|default('', true) }} {{ unix_extended_encryption|default('', true) }} {{ debug|default('', true) }} {% else %} -password {{ 'sufficient' if sssd else 'required' }} pam_unix.so try_first_pass {{ nullok|default('', true) }} {{ unix_extended_encryption|default('', true) }} {{ debug|default('', true) }} +password {{ 'sufficient' if sssd else 'required' }} pam_unix.so try_first_pass {{ nullok|default('', true) }} {{ unix_extended_encryption|default('', true) }} {{ debug|default('', true) }} {% endif %} {% if sssd %} diff --git a/templates/system-login.tpl b/templates/system-login.tpl index 35faaeb..44dad37 100644 --- a/templates/system-login.tpl +++ b/templates/system-login.tpl @@ -18,7 +18,7 @@ session required pam_selinux.so close session required pam_env.so envfile=/etc/profile.env {{ debug|default('', true) }} session include system-auth {% if selinux %} - # Note: modules that run in the user's context must come after this line. +# Note: modules that run in the user's context must come after this line. session required pam_selinux.so multiple open {% endif %} diff --git a/templates/system-services.tpl b/templates/system-services.tpl index cbfab6f..b65d645 100644 --- a/templates/system-services.tpl +++ b/templates/system-services.tpl @@ -1,4 +1,4 @@ auth sufficient pam_permit.so account include system-auth -session optional pam_loginuid.so +session optional pam_loginuid.so {% include "templates/system-session.tpl" %} diff --git a/templates/system-session.tpl b/templates/system-session.tpl index 4c5585b..efcb464 100644 --- a/templates/system-session.tpl +++ b/templates/system-session.tpl @@ -9,7 +9,7 @@ session [success=1 default=ignore] pam_krb5.so {{ krb5_params }} {% endif %} {% if homed %} -session [success=1 default=ignore] pam_systemd_home.so +session [success=1 default=ignore] pam_systemd_home.so {% endif %} session required pam_unix.so {{ debug|default('', true) }} diff --git a/tests/rendered/custom/other b/tests/rendered/custom/other index 9544f8e..d58f0c1 100644 --- a/tests/rendered/custom/other +++ b/tests/rendered/custom/other @@ -1,4 +1,4 @@ auth required pam_deny.so account required pam_deny.so -password required pam_deny.so +password required pam_deny.so session required pam_deny.so diff --git a/tests/rendered/custom/system-auth b/tests/rendered/custom/system-auth index aae3914..92d48e4 100644 --- a/tests/rendered/custom/system-auth +++ b/tests/rendered/custom/system-auth @@ -1,9 +1,9 @@ auth required pam_env.so auth requisite pam_faillock.so preauth -auth [success=1 new_authtok_reqd=1 ignore=ignore default=bad] pam_unix.so nullok try_first_pass +auth [success=1 new_authtok_reqd=1 ignore=ignore default=bad] pam_unix.so nullok try_first_pass auth [default=die] pam_faillock.so authfail account required pam_unix.so -account required pam_faillock.so +account required pam_faillock.so password required pam_passwdqc.so config=/etc/security/passwdqc.conf password required pam_unix.so try_first_pass use_authtok nullok sha512 shadow session required pam_limits.so diff --git a/tests/rendered/custom/system-services b/tests/rendered/custom/system-services index 857363a..06f80df 100644 --- a/tests/rendered/custom/system-services +++ b/tests/rendered/custom/system-services @@ -1,6 +1,6 @@ auth sufficient pam_permit.so account include system-auth -session optional pam_loginuid.so +session optional pam_loginuid.so session required pam_limits.so session required pam_env.so session required pam_unix.so diff --git a/tests/rendered/default/other b/tests/rendered/default/other index 9544f8e..d58f0c1 100644 --- a/tests/rendered/default/other +++ b/tests/rendered/default/other @@ -1,4 +1,4 @@ auth required pam_deny.so account required pam_deny.so -password required pam_deny.so +password required pam_deny.so session required pam_deny.so diff --git a/tests/rendered/default/system-auth b/tests/rendered/default/system-auth index 4c069c3..98f5305 100644 --- a/tests/rendered/default/system-auth +++ b/tests/rendered/default/system-auth @@ -1,10 +1,10 @@ auth required pam_env.so auth requisite pam_faillock.so preauth -auth [success=1 new_authtok_reqd=1 ignore=ignore default=bad] pam_unix.so try_first_pass +auth [success=1 new_authtok_reqd=1 ignore=ignore default=bad] pam_unix.so try_first_pass auth [default=die] pam_faillock.so authfail account required pam_unix.so -account required pam_faillock.so -password required pam_unix.so try_first_pass md5 shadow +account required pam_faillock.so +password required pam_unix.so try_first_pass md5 shadow session required pam_limits.so session required pam_env.so session required pam_unix.so diff --git a/tests/rendered/default/system-services b/tests/rendered/default/system-services index 857363a..06f80df 100644 --- a/tests/rendered/default/system-services +++ b/tests/rendered/default/system-services @@ -1,6 +1,6 @@ auth sufficient pam_permit.so account include system-auth -session optional pam_loginuid.so +session optional pam_loginuid.so session required pam_limits.so session required pam_env.so session required pam_unix.so diff --git a/tests/rendered/minimal/other b/tests/rendered/minimal/other index 9544f8e..d58f0c1 100644 --- a/tests/rendered/minimal/other +++ b/tests/rendered/minimal/other @@ -1,4 +1,4 @@ auth required pam_deny.so account required pam_deny.so -password required pam_deny.so +password required pam_deny.so session required pam_deny.so diff --git a/tests/rendered/minimal/system-auth b/tests/rendered/minimal/system-auth index 4c069c3..98f5305 100644 --- a/tests/rendered/minimal/system-auth +++ b/tests/rendered/minimal/system-auth @@ -1,10 +1,10 @@ auth required pam_env.so auth requisite pam_faillock.so preauth -auth [success=1 new_authtok_reqd=1 ignore=ignore default=bad] pam_unix.so try_first_pass +auth [success=1 new_authtok_reqd=1 ignore=ignore default=bad] pam_unix.so try_first_pass auth [default=die] pam_faillock.so authfail account required pam_unix.so -account required pam_faillock.so -password required pam_unix.so try_first_pass md5 shadow +account required pam_faillock.so +password required pam_unix.so try_first_pass md5 shadow session required pam_limits.so session required pam_env.so session required pam_unix.so diff --git a/tests/rendered/minimal/system-services b/tests/rendered/minimal/system-services index 857363a..06f80df 100644 --- a/tests/rendered/minimal/system-services +++ b/tests/rendered/minimal/system-services @@ -1,6 +1,6 @@ auth sufficient pam_permit.so account include system-auth -session optional pam_loginuid.so +session optional pam_loginuid.so session required pam_limits.so session required pam_env.so session required pam_unix.so
