From 9bb9620620d4e132d0d422bda7a57d2c0dfee28c Mon Sep 17 00:00:00 2001 From: Nicolas Graves Date: Sat, 13 Nov 2021 21:48:16 +0100 Subject: [PATCH 3/3] Moving parts of pam configuration for better compliance. --- gnu/system/pam.scm | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/gnu/system/pam.scm b/gnu/system/pam.scm index d6d02e59f5..0f0b09e347 100644 --- a/gnu/system/pam.scm +++ b/gnu/system/pam.scm @@ -244,19 +244,19 @@ (module (file-append pam-gnupg "/lib/security/pam_gnupg.so")) (module "pam_unix.so") ;; Store SHA-512 encrypted passwords in /etc/shadow. (arguments '("sha512" "shadow"))))) - (session `(,@(if motd + (session `(,env ,unix + ,@(if login-uid? + (list (pam-entry ;to fill in /proc/self/loginuid + (control "required") + (module "pam_loginuid.so"))) + '()) + ,@(if motd (list (pam-entry (control "optional") (module "pam_motd.so") (arguments (list #~(string-append "motd=" #$motd))))) '()) - ,@(if login-uid? - (list (pam-entry ;to fill in /proc/self/loginuid - (control "required") - (module "pam_loginuid.so"))) - '()) - ,env ,unix ,@(if gnupg? (list (pam-entry (control "optional") -- 2.33.1