From e85e51d41f0f3be40490b0de9a76f20f3685659c Mon Sep 17 00:00:00 2001 From: aszlig Date: Fri, 16 Sep 2016 15:36:31 +0200 Subject: [PATCH] nixos/pam: Fix wrong string concatenation Regression introduced by 1010271c63f503113c0e8337977610ea783880ec. This caused the line after using the loginuid module to be concatenated with the next line without a newline. In turn this has caused a lot of the NixOS VM tests to either run very slowly (because of constantly hitting PAM errors) or simply fail. I have tested this only with one of the failing NixOS tests. Signed-off-by: aszlig --- nixos/modules/security/pam.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/nixos/modules/security/pam.nix b/nixos/modules/security/pam.nix index 6a4f6634c4b..f6ca6877022 100644 --- a/nixos/modules/security/pam.nix +++ b/nixos/modules/security/pam.nix @@ -301,11 +301,11 @@ let session required pam_env.so envfile=${config.system.build.pamEnvironment} '' + '' session required pam_unix.so - '' + optionalString cfg.setLoginUid - "session ${ - if config.boot.isContainer then "optional" else "required" - } pam_loginuid.so" - + optionalString cfg.makeHomeDir '' + '' + optionalString cfg.setLoginUid '' + session ${ + if config.boot.isContainer then "optional" else "required" + } pam_loginuid.so + '' + optionalString cfg.makeHomeDir '' session required ${pkgs.pam}/lib/security/pam_mkhomedir.so silent skel=/etc/skel umask=0022 '' + optionalString cfg.updateWtmp '' session required ${pkgs.pam}/lib/security/pam_lastlog.so silent