* security.setuidPrograms: don't set the default in the "default"

mkOption argument, because then we lose them if somebody sets
  security.setuidPrograms somewhere else.  (Shouldn't "default" be
  merged as well?)

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

modules/security/setuid-wrappers.nix

@@ -10,7 +10,8 @@ let
     name = "setuid-wrapper";
     buildCommand = ''
       ensureDir $out/bin
-      gcc -Wall -O2 -DWRAPPER_DIR=\"${wrapperDir}\" ${./setuid-wrapper.c} -o $out/bin/setuid-wrapper
+      gcc -Wall -O2 -DWRAPPER_DIR=\"${wrapperDir}\" \
+          ${./setuid-wrapper.c} -o $out/bin/setuid-wrapper
       strip -s $out/bin/setuid-wrapper
     '';
   };
@@ -24,10 +25,7 @@ in
   options = {
 
     security.setuidPrograms = mkOption {
-      default =
+      default = [];
-        [ "passwd" "su" "crontab" "ping" "ping6"
-          "fusermount" "wodim" "cdrdao" "growisofs"
-        ];
       description = ''
         Only the programs from system path listed here will be made
         setuid root (through a wrapper program).
@@ -76,6 +74,11 @@ in
 
   config = {
 
+    security.setuidPrograms =
+      [ "passwd" "su" "crontab" "ping" "ping6"
+        "fusermount" "wodim" "cdrdao" "growisofs"
+      ];
+
     system.activationScripts.setuid =
       let
         setuidPrograms =