about summary refs log tree commit diff
path: root/nixos/modules/security/pam.nix
diff options
context:
space:
mode:
authorworldofpeace <worldofpeace@users.noreply.github.com>2019-04-14 09:52:17 -0400
committerGitHub <noreply@github.com>2019-04-14 09:52:17 -0400
commit4616b4ec85cd1779cda1dc8519288aebb1c4011d (patch)
tree9a257726af998e36c0402aa1e67e2ee33ed29549 /nixos/modules/security/pam.nix
parent41ac07b29f5971800e7d8b3367a4c06a485eb09e (diff)
parent56bd0110e7f3ad5ea5a0870d1f47279e7b4e410e (diff)
downloadnixlib-4616b4ec85cd1779cda1dc8519288aebb1c4011d.tar
nixlib-4616b4ec85cd1779cda1dc8519288aebb1c4011d.tar.gz
nixlib-4616b4ec85cd1779cda1dc8519288aebb1c4011d.tar.bz2
nixlib-4616b4ec85cd1779cda1dc8519288aebb1c4011d.tar.lz
nixlib-4616b4ec85cd1779cda1dc8519288aebb1c4011d.tar.xz
nixlib-4616b4ec85cd1779cda1dc8519288aebb1c4011d.tar.zst
nixlib-4616b4ec85cd1779cda1dc8519288aebb1c4011d.zip
Merge pull request #21860 from e-user/bugfix/upstream/gnome-pam
nixos/gdm: use provided PAM login configuration wherever possible
Diffstat (limited to 'nixos/modules/security/pam.nix')
-rw-r--r--nixos/modules/security/pam.nix2
1 files changed, 2 insertions, 0 deletions
diff --git a/nixos/modules/security/pam.nix b/nixos/modules/security/pam.nix
index 46ce274a2a9a..89e71c5136e4 100644
--- a/nixos/modules/security/pam.nix
+++ b/nixos/modules/security/pam.nix
@@ -410,6 +410,8 @@ let
               "password sufficient ${pam_krb5}/lib/security/pam_krb5.so use_first_pass"}
           ${optionalString config.services.samba.syncPasswordsByPam
               "password optional ${pkgs.samba}/lib/security/pam_smbpass.so nullok use_authtok try_first_pass"}
+          ${optionalString cfg.enableGnomeKeyring
+              "password optional ${pkgs.gnome3.gnome-keyring}/lib/security/pam_gnome_keyring.so use_authtok"}
 
           # Session management.
           ${optionalString cfg.setEnvironment ''