From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/pambase:master commit in: templates/
Date: Tue, 3 Nov 2020 07:22:04 +0000 (UTC) [thread overview]
Message-ID: <1604387956.3f36e2c3de28b3cde25a27d05e49d354e098c368.sam@gentoo> (raw)
commit: 3f36e2c3de28b3cde25a27d05e49d354e098c368
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 3 07:19:16 2020 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Nov 3 07:19:16 2020 +0000
URL: https://gitweb.gentoo.org/proj/pambase.git/commit/?id=3f36e2c3
templates/system-auth.tpl: shift cap to be with other auth
Signed-off-by: Sam James <sam <AT> gentoo.org>
templates/system-auth.tpl | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/templates/system-auth.tpl b/templates/system-auth.tpl
index 4ff78e4..19e08fa 100644
--- a/templates/system-auth.tpl
+++ b/templates/system-auth.tpl
@@ -12,6 +12,10 @@ auth [success=1 default=ignore] pam_unix.so {{ nullok|default('', true) }} {{ d
auth [default=die] pam_faillock.so authfail
auth optional pam_permit.so
+{% if caps %}
+-auth optional pam_cap.so
+{% endif %}
+
{% if krb5 %}
account [success=2 default=ignore] pam_krb5.so {{ krb5_params }}
{% endif %}
@@ -47,8 +51,4 @@ password optional pam_permit.so
session optional pam_ssh.so
{% endif %}
-{% if caps %}
--auth optional pam_cap.so
-{% endif %}
-
{% include "templates/system-session.tpl" %}
next reply other threads:[~2020-11-03 7:22 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-03 7:22 Sam James [this message]
-- strict thread matches above, loose matches on Subject: below --
2024-01-28 8:14 [gentoo-commits] proj/pambase:master commit in: templates/ Sam James
2022-08-13 18:29 Sam James
2022-08-13 18:29 Sam James
2022-08-13 18:29 Sam James
2022-02-14 16:52 Sam James
2021-02-02 20:56 Sam James
2020-12-20 17:53 Mikle Kolyada
2020-12-19 22:34 Mikle Kolyada
2020-11-02 23:41 Sam James
2020-10-28 19:25 Mikle Kolyada
2020-10-28 16:15 Mikle Kolyada
2020-10-26 22:49 Sam James
2020-10-26 22:49 Sam James
2020-10-26 22:49 Sam James
2020-10-20 2:38 Sam James
2020-10-12 17:30 Sam James
2020-10-12 15:32 Sam James
2020-10-12 15:28 Sam James
2020-10-12 15:28 Sam James
2020-10-12 15:28 Sam James
2020-10-10 15:40 Mikle Kolyada
2020-09-09 16:36 Mikle Kolyada
2020-08-05 6:10 Sam James
2020-08-04 13:36 Mikle Kolyada
2020-08-04 12:41 Mikle Kolyada
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1604387956.3f36e2c3de28b3cde25a27d05e49d354e098c368.sam@gentoo \
--to=sam@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox