diff options
| author | Stig <stig@stig.io> | 2022-07-26 03:19:01 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-07-26 03:19:01 +0200 |
| commit | 550aaf8c963e272051b46fa6f44439475689afa4 (patch) | |
| tree | ac834705e985866f33960c9a9d5c6f464039b923 /nixos/modules/security | |
| parent | a2609639f7e33adc95508fa8dbc2171d89592fc0 (diff) | |
| parent | d07f3037e2f440ff4a059e63681efb2647352da2 (diff) | |
Merge pull request #182379 from stigtsp/fix/pam-u2f-cue
nixos/security/pam: fix u2f options leakage
Diffstat (limited to 'nixos/modules/security')
| -rw-r--r-- | nixos/modules/security/pam.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nixos/modules/security/pam.nix b/nixos/modules/security/pam.nix index a80312367d856..d9d072b36e6e6 100644 --- a/nixos/modules/security/pam.nix +++ b/nixos/modules/security/pam.nix @@ -482,10 +482,10 @@ let (let p11 = config.security.pam.p11; in optionalString cfg.p11Auth '' auth ${p11.control} ${pkgs.pam_p11}/lib/security/pam_p11.so ${pkgs.opensc}/lib/opensc-pkcs11.so '') + - (let u2f = config.security.pam.u2f; in optionalString cfg.u2fAuth '' + (let u2f = config.security.pam.u2f; in optionalString cfg.u2fAuth ('' auth ${u2f.control} ${pkgs.pam_u2f}/lib/security/pam_u2f.so ${optionalString u2f.debug "debug"} ${optionalString (u2f.authFile != null) "authfile=${u2f.authFile}"} '' + ''${optionalString u2f.interactive "interactive"} ${optionalString u2f.cue "cue"} ${optionalString (u2f.appId != null) "appid=${u2f.appId}"} ${optionalString (u2f.origin != null) "origin=${u2f.origin}"} - '') + + '')) + optionalString cfg.usbAuth '' auth sufficient ${pkgs.pam_usb}/lib/security/pam_usb.so '' + |