summary refs log tree commit diff
path: root/modules/security
diff options
context:
space:
mode:
authorYury G. Kudryashov <urkud.urkud@gmail.com>2010-05-14 21:01:06 +0000
committerYury G. Kudryashov <urkud.urkud@gmail.com>2010-05-14 21:01:06 +0000
commit7ae39feedbe7dcf31ced3a4a744e29057e87301f (patch)
tree956030384ffa4dc1161a1c07cc5d6114bc2cc399 /modules/security
parent03caab45729f3f7e01cbde7f7832bbbfa6a78fac (diff)
downloadnixpkgs-7ae39feedbe7dcf31ced3a4a744e29057e87301f.tar
nixpkgs-7ae39feedbe7dcf31ced3a4a744e29057e87301f.tar.gz
nixpkgs-7ae39feedbe7dcf31ced3a4a744e29057e87301f.tar.bz2
nixpkgs-7ae39feedbe7dcf31ced3a4a744e29057e87301f.tar.lz
nixpkgs-7ae39feedbe7dcf31ced3a4a744e29057e87301f.tar.xz
nixpkgs-7ae39feedbe7dcf31ced3a4a744e29057e87301f.tar.zst
nixpkgs-7ae39feedbe7dcf31ced3a4a744e29057e87301f.zip
Get rid of extraSetuidPrograms.
Also state in description that it is obsolete.

svn path=/nixos/trunk/; revision=21777
Diffstat (limited to 'modules/security')
-rw-r--r--modules/security/setuid-wrappers.nix3
-rw-r--r--modules/security/sudo.nix2
2 files changed, 2 insertions, 3 deletions
diff --git a/modules/security/setuid-wrappers.nix b/modules/security/setuid-wrappers.nix
index 5450bbb7bab..510c99b2f58 100644
--- a/modules/security/setuid-wrappers.nix
+++ b/modules/security/setuid-wrappers.nix
@@ -32,13 +32,12 @@ in
       '';
     };
 
-    # !!! obsolete
     security.extraSetuidPrograms = mkOption {
       default = [];
       example = ["fusermount"];
       description = ''
         This option lists additional programs that must be made setuid
-        root.
+        root. Obsolete, use setuidPrograms instead.
       '';
     };
 
diff --git a/modules/security/sudo.nix b/modules/security/sudo.nix
index e911a257bbf..845371050cc 100644
--- a/modules/security/sudo.nix
+++ b/modules/security/sudo.nix
@@ -51,7 +51,7 @@ in
 
   config = mkIf cfg.enable {
 
-    security.extraSetuidPrograms = [ "sudo" ];
+    security.setuidPrograms = [ "sudo" ];
 
     environment.systemPackages = [ sudo ];