public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Resolving that silly bad argument error.

Browse Source
This commit is contained in:
Parnell Springmeyer 2016-09-01 19:26:54 -05:00
parent c686da8655
commit d60581d4d6
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/modules/programs/shadow.nix
View File

@ -119,7 +119,7 @@ in
} }
] ++ ] ++
(lib.optionals config.users.mutableUsers (lib.optionals config.users.mutableUsers
map (x: x // { user = "root"; map (x: x // { owner = "root";
group = "root"; group = "root";
setuid = true; setuid = true;
}) })

4
nixos/modules/security/permissions-wrappers/default.nix
View File

@ -53,8 +53,6 @@ let
{ program { program
, source ? null , source ? null
, owner ? "nobody" , owner ? "nobody"
# Legacy code I can't find :(
, user ? null
, group ? "nogroup" , group ? "nogroup"
, setuid ? false , setuid ? false
, setgid ? false , setgid ? false
@ -64,7 +62,7 @@ let
# Prevent races # Prevent races
chmod 0000 ${permissionsWrapperDir}/${program} chmod 0000 ${permissionsWrapperDir}/${program}
chown ${if user != null then user else owner}.${group} ${permissionsWrapperDir}/${program} chown ${owner}.${group} ${permissionsWrapperDir}/${program}
chmod "u${if setuid then "+" else "-"}s,g${if setgid then "+" else "-"}s,${permissions}" ${permissionsWrapperDir}/${program} chmod "u${if setuid then "+" else "-"}s,g${if setgid then "+" else "-"}s,${permissions}" ${permissionsWrapperDir}/${program}
''; '';