[gentoo-commits] proj/pambase:master commit in: templates/, /

[Mike Gilbert]

commit:     c5fa23991973e63b6cde1cc8767a6fa125123c4e
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Sat Apr  5 20:41:11 2025 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sat Apr  5 20:42:48 2025 +0000
URL:        https://gitweb.gentoo.org/proj/pambase.git/commit/?id=c5fa2399

Inline krb5_params

Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>

 pambase.py                   | 3 ---
 templates/system-auth.tpl    | 6 +++---
 templates/system-session.tpl | 2 +-
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/pambase.py b/pambase.py
index d92117c..f8ef3d4 100755
--- a/pambase.py
+++ b/pambase.py
@@ -104,9 +104,6 @@ def process_args(args):
     output["likeauth"] = "likeauth"
     output["unix_authtok"] = "use_authtok"
 
-    if args.krb5:
-        output["krb5_params"] = f"{args.debug} ignore_root try_first_pass"
-
     if args.yescrypt:
         output["unix_extended_encryption"] = "yescrypt shadow"
     elif args.sha512:

diff --git a/templates/system-auth.tpl b/templates/system-auth.tpl
index 1c24c17..21924b3 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 {{ debug }} ignore_root try_first_pass
 {% endif %}
 
 {% if sssd %}
@@ -34,7 +34,7 @@ auth          optional        pam_cap.so
 auth           required        pam_deny.so
 {% endif %}
 {% if krb5 %}
-account                [success=2 default=ignore]      pam_krb5.so {{ 
krb5_params }}
+account                [success=2 default=ignore]      pam_krb5.so {{ debug }} 
ignore_root try_first_pass
 {% endif %}
 
 {% if homed %}
@@ -63,7 +63,7 @@ password      required        pam_pwhistory.so use_authtok 
remember=5 retry=3
 {% endif %}
 
 {% if krb5 %}
-password       [success=1 default=ignore]      pam_krb5.so {{ krb5_params }}
+password       [success=1 default=ignore]      pam_krb5.so {{ debug }} 
ignore_root try_first_pass
 {% endif %}
 
 {% if homed %}

diff --git a/templates/system-session.tpl b/templates/system-session.tpl
index bd2d562..4a0f435 100644
--- a/templates/system-session.tpl
+++ b/templates/system-session.tpl
@@ -5,7 +5,7 @@ session         optional        pam_mktemp.so
 {% endif %}
 
 {%if krb5 %}
-session                [success=1 default=ignore]      pam_krb5.so {{ 
krb5_params }}
+session                [success=1 default=ignore]      pam_krb5.so {{ debug }} 
ignore_root try_first_pass
 {% endif %}
 
 {% if homed %}