From d71ec771a3dfadd216991e4af094db429f6739bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Tue, 31 Dec 2019 13:33:40 +0100 Subject: [PATCH] sddm: rework pam MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * sync sddm.pam <-> sddm-autologin.pam * avoid warnings in syslog for optional components Signed-off-by: Andreas Müller --- recipes-graphics/sddm/sddm/sddm-autologin.pam | 7 +++++-- recipes-graphics/sddm/sddm/sddm.pam | 8 ++++---- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/recipes-graphics/sddm/sddm/sddm-autologin.pam b/recipes-graphics/sddm/sddm/sddm-autologin.pam index 284960b5..ca02a649 100644 --- a/recipes-graphics/sddm/sddm/sddm-autologin.pam +++ b/recipes-graphics/sddm/sddm/sddm-autologin.pam @@ -4,7 +4,8 @@ auth required pam_tally.so file=/var/log/faillog onerr=succeed auth required pam_shells.so auth required pam_nologin.so auth required pam_permit.so --auth optional pam_gnome_keyring.so +-auth optional pam_gnome_keyring.so +-auth optional pam_kwallet5.so account include common-account @@ -12,4 +13,6 @@ password include common-password session include common-session session required pam_limits.so --session optional pam_gnome_keyring.so auto_start +-session optional pam_kwallet5.so auto_start +-session optional pam_gnome_keyring.so auto_start + diff --git a/recipes-graphics/sddm/sddm/sddm.pam b/recipes-graphics/sddm/sddm/sddm.pam index 3d54ba50..3701e68e 100644 --- a/recipes-graphics/sddm/sddm/sddm.pam +++ b/recipes-graphics/sddm/sddm/sddm.pam @@ -2,8 +2,8 @@ auth requisite pam_nologin.so auth required pam_env.so -auth optional pam_kwallet5.so -auth optional pam_gnome_keyring.so +-auth optional pam_kwallet5.so +-auth optional pam_gnome_keyring.so #auth required pam_unix.so # To deny passwordless login comment next line and uncomment previous line auth required pam_unix.so nullok @@ -13,8 +13,8 @@ account required pam_unix.so session required pam_limits.so session required pam_unix.so -session optional pam_systemd.so -session optional pam_kwallet5.so auto_start -session optional pam_gnome_keyring.so auto_start +-session optional pam_kwallet5.so auto_start +-session optional pam_gnome_keyring.so auto_start password required pam_unix.so