From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1193812-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id 47D2E138359
for <garchives@archives.gentoo.org>; Wed, 5 Aug 2020 06:10:41 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 77D0AE0825;
Wed, 5 Aug 2020 06:10:40 +0000 (UTC)
Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 4D752E0825
for <gentoo-commits@lists.gentoo.org>; Wed, 5 Aug 2020 06:10:40 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 2E0A334F0B1
for <gentoo-commits@lists.gentoo.org>; Wed, 5 Aug 2020 06:10:38 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 513C3275
for <gentoo-commits@lists.gentoo.org>; Wed, 5 Aug 2020 06:10:34 +0000 (UTC)
From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" <sam@gentoo.org>
Message-ID: <1596607816.4e5e41c2e5607a298f30f679aa7ba8c4994033e3.sam@gentoo>
Subject: [gentoo-commits] proj/pambase:master commit in: templates/
X-VCS-Repository: proj/pambase
X-VCS-Files: templates/login.tpl templates/system-auth.tpl templates/system-login.tpl templates/system-session.tpl
X-VCS-Directories: templates/
X-VCS-Committer: sam
X-VCS-Committer-Name: Sam James
X-VCS-Revision: 4e5e41c2e5607a298f30f679aa7ba8c4994033e3
X-VCS-Branch: master
Date: Wed, 5 Aug 2020 06:10:34 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: dcc0698a-57a2-456c-8848-d4a7075aa60d
X-Archives-Hash: 046ba15d5de3da2c2179a96fa1442519
commit: 4e5e41c2e5607a298f30f679aa7ba8c4994033e3
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 5 06:10:02 2020 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Aug 5 06:10:16 2020 +0000
URL: https://gitweb.gentoo.org/proj/pambase.git/commit/?id=4e5e41c2
templates/*: remove unnecessary strips
Now obsolete as of 732fb3bbfd7d007fdca78dd4587f1a7bd34bfa6c.
Signed-off-by: Sam James <sam <AT> gentoo.org>
templates/login.tpl | 4 ++--
templates/system-auth.tpl | 44 ++++++++++++++++++++++----------------------
templates/system-login.tpl | 28 ++++++++++++++--------------
templates/system-session.tpl | 12 ++++++------
4 files changed, 44 insertions(+), 44 deletions(-)
diff --git a/templates/login.tpl b/templates/login.tpl
index 7476cb7..23e262a 100644
--- a/templates/login.tpl
+++ b/templates/login.tpl
@@ -1,6 +1,6 @@
-{% if securetty -%}
+{% if securetty %}
auth required pam_securetty.so
-{% endif -%}
+{% endif %}
auth include system-local-login
account include system-local-login
diff --git a/templates/system-auth.tpl b/templates/system-auth.tpl
index e8a6d91..298e45c 100644
--- a/templates/system-auth.tpl
+++ b/templates/system-auth.tpl
@@ -1,54 +1,54 @@
auth required pam_env.so {{ debug|default('', true) }}
-{% if pam_ssh -%}
+{% if pam_ssh %}
auth sufficient pam_ssh.so
-{% endif -%}
+{% endif %}
-{% if krb5 -%}
+{% if krb5 %}
auth [success=1 default=ignore] pam_krb5.so {{ krb5_params }}
-{% endif -%}
+{% endif %}
auth required pam_unix.so try_first_pass {{ likeauth }} {{ nullok|default('', true) }} {{ debug|default('', true) }}
auth optional pam_permit.so
-{% if not minimal -%}
+{% if not minimal %}
auth required pam_faillock.so preauth silent audit deny=3 unlock_time=600
auth sufficient pam_unix.so {{ nullok|default('', true) }} try_first_pass
auth [default=die] pam_faillock.so authfail audit deny=3 unlock_time=600
-{% endif -%}
+{% endif %}
-{% if krb5 -%}
+{% if krb5 %}
account [success=1 default=ignore] pam_krb5.so {{ krb5_params }}
-{% endif -%}
+{% endif %}
account required pam_unix.so {{ debug|default('', true) }}
account optional pam_permit.so
-{% if not minimal -%}
+{% if not minimal %}
account required pam_faillock.so
-{% endif -%}
+{% endif %}
-{% if passwdqc -%}
+{% if passwdqc %}
password required pam_passwdqc.so min=8,8,8,8,8 retry=3
-{% endif -%}
+{% endif %}
-{% if krb5 -%}
+{% if krb5 %}
password [success=1 default=ignore] pam_krb5.so {{ krb5_params }}
-{% endif -%}
+{% endif %}
password required pam_unix.so try_first_pass {{ unix_authtok|default('', true) }} {{ nullok|default('', true) }} {{ unix_extended_encryption|default('', true) }} {{ debug|default('', true) }}
password optional pam_permit.so
-{%- if pam_ssh %}
+{% if pam_ssh %}
session optional pam_ssh.so
-{% endif -%}
+{% endif %}
-{% if systemd -%}
+{% if systemd %}
-session optional pam_systemd.so
-{% endif -%}
+{% endif %}
-{% if elogind -%}
+{% if elogind %}
-session optional pam_elogind.so
-{% endif -%}
+{% endif %}
-{% if libcap -%}
+{% if libcap %}
-session optional pam_libcap.so
-{% endif -%}
+{% endif %}
{% include "templates/system-session.tpl" %}
diff --git a/templates/system-login.tpl b/templates/system-login.tpl
index d8df530..d51481b 100644
--- a/templates/system-login.tpl
+++ b/templates/system-login.tpl
@@ -1,39 +1,39 @@
auth required pam_shells.so {{ debug|default('', true) }}
auth required pam_nologin.so
auth include system-auth
-{% if not minimal -%}
+{% if not minimal %}
auth required pam_faillock.so preauth silent audit deny=3 unlock_time=600
auth sufficient pam_unix.so nullok try_first_pass
auth [default=die] pam_faillock.so authfail audit deny=3 unlock_time=600
-{% endif -%}
+{% endif %}
account required pam_access.so {{ debug|default('', true) }}
account required pam_nologin.so
account include system-auth
-{% if not minimal -%}
+{% if not minimal %}
account required pam_faillock.so
-{% endif -%}
+{% endif %}
password include system-auth
session optional pam_loginuid.so
-{% if selinux -%}
+{% if selinux %}
session required pam_selinux.so close
-{% endif -%}
+{% endif %}
session required pam_env.so envfile=/etc/profile.env {{ debug|default('', true) }}
-{% if not minimal -%}
+{% if not minimal %}
session optional pam_lastlog.so silent {{ debug|default('', true) }}
-{% endif -%}
+{% endif %}
session include system-auth
-{% if selinux -%}
+{% if selinux %}
# Note: modules that run in the user's context must come after this line.
session required pam_selinux.so multiple open
-{% endif -%}
+{% endif %}
-{% if not minimal -%}
+{% if not minimal %}
session optional pam_motd.so motd=/etc/motd
-{% endif -%}
+{% endif %}
-{% if not minimal -%}
+{% if not minimal %}
session optional pam_mail.so
-{% endif -%}
+{% endif %}
diff --git a/templates/system-session.tpl b/templates/system-session.tpl
index f2622a8..1538429 100644
--- a/templates/system-session.tpl
+++ b/templates/system-session.tpl
@@ -1,16 +1,16 @@
session required pam_limits.so {{ debug|default('', true) }}
session required pam_env.so {{ debug|default('', true) }}
-{% if mktemp -%}
+{% if mktemp %}
session optional pam_mktemp.so
-{% endif -%}
+{% endif %}
-{%if krb5 -%}
+{%if krb5 %}
session [success=1 default=ignore] {{ krb5_params }}
-{% endif -%}
+{% endif %}
session required pam_unix.so {{ debug|default('', true) }}
-{%if krb5 -%}
+{%if krb5 %}
session [success=1 default=ignore] {{ krb5_params }}
-{% endif -%}
+{% endif %}
session optional pam_permit.so