about summary refs log tree commit diff
path: root/nixos/modules
diff options
context:
space:
mode:
authorJörg Thalheim <Mic92@users.noreply.github.com>2020-06-02 10:50:31 +0100
committerGitHub <noreply@github.com>2020-06-02 10:50:31 +0100
commit53d0dc663895d11bbbea9a78ce8bca6899acdee8 (patch)
tree50a5b52c384e99dac9ed8b73d4e4727cc1edb61f /nixos/modules
parent00df2371122aeb96b4ca80451b1ac7b9b7b8d847 (diff)
parent925b028f1779027d65ef75ecc87563c45805d0c3 (diff)
downloadnixlib-53d0dc663895d11bbbea9a78ce8bca6899acdee8.tar
nixlib-53d0dc663895d11bbbea9a78ce8bca6899acdee8.tar.gz
nixlib-53d0dc663895d11bbbea9a78ce8bca6899acdee8.tar.bz2
nixlib-53d0dc663895d11bbbea9a78ce8bca6899acdee8.tar.lz
nixlib-53d0dc663895d11bbbea9a78ce8bca6899acdee8.tar.xz
nixlib-53d0dc663895d11bbbea9a78ce8bca6899acdee8.tar.zst
nixlib-53d0dc663895d11bbbea9a78ce8bca6899acdee8.zip
Merge pull request #51270 from aneeshusa/enable-setuid-wrapper-for-chsh
nixos/shadow: create setuid wrapper for chsh
Diffstat (limited to 'nixos/modules')
-rw-r--r--nixos/modules/programs/shadow.nix5
1 files changed, 3 insertions, 2 deletions
diff --git a/nixos/modules/programs/shadow.nix b/nixos/modules/programs/shadow.nix
index fc352795c017..386ded9d98b6 100644
--- a/nixos/modules/programs/shadow.nix
+++ b/nixos/modules/programs/shadow.nix
@@ -114,8 +114,9 @@ in
       newgrp.source    = "${pkgs.shadow.out}/bin/newgrp";
       newuidmap.source = "${pkgs.shadow.out}/bin/newuidmap";
       newgidmap.source = "${pkgs.shadow.out}/bin/newgidmap";
-    } // (if config.users.mutableUsers then {
+    } // lib.optionalAttrs config.users.mutableUsers {
+      chsh.source      = "${pkgs.shadow.out}/bin/chsh";
       passwd.source    = "${pkgs.shadow.out}/bin/passwd";
-    } else {});
+    };
   };
 }