suzanne.soy/nixpkgs
1
0
Fork 0
Code Issues Pull Requests 2 Actions Packages Projects Releases Wiki Activity

nixos/pam: Fix wrong string concatenation

Browse Source 
Regression introduced by 1010271c63.

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 <aszlig@redmoonstudios.org>
This commit is contained in:
aszlig 2016-09-16 15:36:31 +02:00
parent 0201869418
commit e85e51d41f
No known key found for this signature in database
GPG Key ID: 1DE8E48E57DB5436
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
nixos/modules/security/pam.nix
View File

@ -301,11 +301,11 @@ let
session required pam_env.so envfile=${config.system.build.pamEnvironment} session required pam_env.so envfile=${config.system.build.pamEnvironment}
'' + '' '' + ''
session required pam_unix.so session required pam_unix.so
'' + optionalString cfg.setLoginUid '' + optionalString cfg.setLoginUid ''
"session ${ session ${
if config.boot.isContainer then "optional" else "required" if config.boot.isContainer then "optional" else "required"
} pam_loginuid.so" } pam_loginuid.so
+ optionalString cfg.makeHomeDir '' '' + optionalString cfg.makeHomeDir ''
session required ${pkgs.pam}/lib/security/pam_mkhomedir.so silent skel=/etc/skel umask=0022 session required ${pkgs.pam}/lib/security/pam_mkhomedir.so silent skel=/etc/skel umask=0022
'' + optionalString cfg.updateWtmp '' '' + optionalString cfg.updateWtmp ''
session required ${pkgs.pam}/lib/security/pam_lastlog.so silent session required ${pkgs.pam}/lib/security/pam_lastlog.so silent