Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/pambase:master commit in: templates/
Date: Tue, 03 Nov 2020 07:22:07
Message-Id: 1604387956.3f36e2c3de28b3cde25a27d05e49d354e098c368.sam@gentoo
1 commit: 3f36e2c3de28b3cde25a27d05e49d354e098c368
2 Author: Sam James <sam <AT> gentoo <DOT> org>
3 AuthorDate: Tue Nov 3 07:19:16 2020 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Tue Nov 3 07:19:16 2020 +0000
6 URL: https://gitweb.gentoo.org/proj/pambase.git/commit/?id=3f36e2c3
7
8 templates/system-auth.tpl: shift cap to be with other auth
9
10 Signed-off-by: Sam James <sam <AT> gentoo.org>
11
12 templates/system-auth.tpl | 8 ++++----
13 1 file changed, 4 insertions(+), 4 deletions(-)
14
15 diff --git a/templates/system-auth.tpl b/templates/system-auth.tpl
16 index 4ff78e4..19e08fa 100644
17 --- a/templates/system-auth.tpl
18 +++ b/templates/system-auth.tpl
19 @@ -12,6 +12,10 @@ auth [success=1 default=ignore] pam_unix.so {{ nullok|default('', true) }} {{ d
20 auth [default=die] pam_faillock.so authfail
21 auth optional pam_permit.so
22
23 +{% if caps %}
24 +-auth optional pam_cap.so
25 +{% endif %}
26 +
27 {% if krb5 %}
28 account [success=2 default=ignore] pam_krb5.so {{ krb5_params }}
29 {% endif %}
30 @@ -47,8 +51,4 @@ password optional pam_permit.so
31 session optional pam_ssh.so
32 {% endif %}
33
34 -{% if caps %}
35 --auth optional pam_cap.so
36 -{% endif %}
37 -
38 {% include "templates/system-session.tpl" %}