summary refs log tree commit diff
diff options
context:
space:
mode:
authorParnell Springmeyer <parnell@digitalmentat.com>2017-01-29 05:44:29 -0600
committerParnell Springmeyer <parnell@digitalmentat.com>2017-01-29 05:44:29 -0600
commit9f82c9903d8cba0685795c526fe5e7c51a6bc9c8 (patch)
tree2faec8fad63714c250f4f305f25f4ba3c9e59ae1
parentcfe4351c33bd23e7007179d6c75299919a873210 (diff)
downloadnixpkgs-9f82c9903d8cba0685795c526fe5e7c51a6bc9c8.tar
nixpkgs-9f82c9903d8cba0685795c526fe5e7c51a6bc9c8.tar.gz
nixpkgs-9f82c9903d8cba0685795c526fe5e7c51a6bc9c8.tar.bz2
nixpkgs-9f82c9903d8cba0685795c526fe5e7c51a6bc9c8.tar.lz
nixpkgs-9f82c9903d8cba0685795c526fe5e7c51a6bc9c8.tar.xz
nixpkgs-9f82c9903d8cba0685795c526fe5e7c51a6bc9c8.tar.zst
nixpkgs-9f82c9903d8cba0685795c526fe5e7c51a6bc9c8.zip
More fixes
-rw-r--r--nixos/modules/programs/shadow.nix14
1 files changed, 10 insertions, 4 deletions
diff --git a/nixos/modules/programs/shadow.nix b/nixos/modules/programs/shadow.nix
index c5a50318026..d497b662113 100644
--- a/nixos/modules/programs/shadow.nix
+++ b/nixos/modules/programs/shadow.nix
@@ -101,9 +101,15 @@ in
         chpasswd = { rootOK = true; };
       };
 
-    security.setuidPrograms = [
-      "su" "chfn" "newuidmap" "newgidmap"
-      ] ++ lib.optionals config.users.mutableUsers
-      [ "passwd" "sg" "newgrp" ];
+    security.wrappers = {
+      su.source        = "${pkgs.shadow.su}/bin/su";
+      chfn.source      = "${pkgs.shadow.out}/bin/chfn";
+      newuidmap.source = "${pkgs.shadow.out}/bin/newuidmap";
+      newgidmap.source = "${pkgs.shadow.out}/bin/newgidmap";
+    } // (lib.mkIf config.users.mutableUsers {
+      passwd.source    = "${pkgs.shadow.out}/bin/passwd";
+      sg.source        = "${pkgs.shadow.out}/bin/sg";
+      newgrp.source    = "${pkgs.shadow.out}/bin/newgrp";
+    });
   };
 }