From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 4D458138359 for ; Mon, 2 Nov 2020 23:41:31 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6B98BE081E; Mon, 2 Nov 2020 23:41:30 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 4FA25E081E for ; Mon, 2 Nov 2020 23:41:30 +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 159F1335DA7 for ; Mon, 2 Nov 2020 23:41:29 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 96F323B2 for ; Mon, 2 Nov 2020 23:41:27 +0000 (UTC) From: "Sam James" 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" Message-ID: <1604360450.94a9b5f76fc8fa1a3c6c34c5baa3fb25825e1dc2.sam@gentoo> Subject: [gentoo-commits] proj/pambase:master commit in: /, templates/ X-VCS-Repository: proj/pambase X-VCS-Files: pambase.py templates/system-auth.tpl X-VCS-Directories: / templates/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 94a9b5f76fc8fa1a3c6c34c5baa3fb25825e1dc2 X-VCS-Branch: master Date: Mon, 2 Nov 2020 23:41:27 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: f585f5ef-41fc-4f93-8292-a686365603e1 X-Archives-Hash: 137c70df8c1c5a8a6f5a15424d9322b7 commit: 94a9b5f76fc8fa1a3c6c34c5baa3fb25825e1dc2 Author: Sam James gentoo org> AuthorDate: Mon Nov 2 23:40:50 2020 +0000 Commit: Sam James gentoo org> CommitDate: Mon Nov 2 23:40:50 2020 +0000 URL: https://gitweb.gentoo.org/proj/pambase.git/commit/?id=94a9b5f7 pambase.py: rename --libcap -> --caps Signed-off-by: Sam James gentoo.org> pambase.py | 2 +- templates/system-auth.tpl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pambase.py b/pambase.py index de5dddb..278d578 100755 --- a/pambase.py +++ b/pambase.py @@ -8,7 +8,7 @@ import pathlib def main(): parser = argparse.ArgumentParser(description='basic Gentoo PAM configuration files') parser.add_argument('--gnome-keyring', action="store_true", help='enable pam_gnome_keyring.so module') - parser.add_argument('--libcap', action="store_true", help='enable pam_caps.so module') + parser.add_argument('--caps', action="store_true", help='enable pam_cap.so module') parser.add_argument('--passwdqc', action="store_true", help='enable pam_passwdqc.so module') parser.add_argument('--pwhistory', action="store_true", help='enable pam_pwhistory.so module') parser.add_argument('--pwquality', action="store_true", help='enable pam_pwquality.so module') diff --git a/templates/system-auth.tpl b/templates/system-auth.tpl index 2f2fe76..4ff78e4 100644 --- a/templates/system-auth.tpl +++ b/templates/system-auth.tpl @@ -47,7 +47,7 @@ password optional pam_permit.so session optional pam_ssh.so {% endif %} -{% if libcap %} +{% if caps %} -auth optional pam_cap.so {% endif %}