Get rid of extraSetuidPrograms.

Also state in description that it is obsolete.

svn path=/nixos/trunk/; revision=21777

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.
       '';
     };
 

modules/security/sudo.nix

@@ -51,7 +51,7 @@ in
 
   config = mkIf cfg.enable {
 
-    security.extraSetuidPrograms = [ "sudo" ];
+    security.setuidPrograms = [ "sudo" ];
 
     environment.systemPackages = [ sudo ];
 

modules/services/x11/desktop-managers/kde.nix

@@ -52,11 +52,7 @@ mkIf (xcfg.enable && cfg.enable) {
     };
   };
 
-  security = {
-    extraSetuidPrograms = [
-      "kcheckpass"
-    ];
-  };
+  security.setuidPrograms = [ "kcheckpass" ];
 
   environment = {
     kdePackages = [