diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2016-08-19 21:10:50 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2016-08-20 01:18:04 +0200 |
| commit | c74145467d831fd0ded6d6add2d4a4a285044f70 (patch) | |
| tree | fa1883ae98ffa770008a138df79522ca0c0c9a84 /nixos | |
| parent | 532f88cd3a568a18b4dc8f1b5dc39baae94b3374 (diff) | |
| parent | c60f1e9af5264c0f20d8378b486e8b0e8b7b0415 (diff) | |
| download | nixlib-c74145467d831fd0ded6d6add2d4a4a285044f70.tar nixlib-c74145467d831fd0ded6d6add2d4a4a285044f70.tar.gz nixlib-c74145467d831fd0ded6d6add2d4a4a285044f70.tar.bz2 nixlib-c74145467d831fd0ded6d6add2d4a4a285044f70.tar.lz nixlib-c74145467d831fd0ded6d6add2d4a4a285044f70.tar.xz nixlib-c74145467d831fd0ded6d6add2d4a4a285044f70.tar.zst nixlib-c74145467d831fd0ded6d6add2d4a4a285044f70.zip | |
Merge #17852: gtk3: 3.20.8 -> 3.20.9
Note: the merge also adds a few master commits, but those should matter.
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/programs/shadow.nix | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/nixos/modules/programs/shadow.nix b/nixos/modules/programs/shadow.nix index 6398509357a6..878c9cc0cf09 100644 --- a/nixos/modules/programs/shadow.nix +++ b/nixos/modules/programs/shadow.nix @@ -103,10 +103,9 @@ in }; security.setuidPrograms = [ "su" "chfn" ] + ++ [ "newuidmap" "newgidmap" ] # new in shadow 4.2.x ++ lib.optionals config.users.mutableUsers - [ "passwd" "sg" "newgrp" - "newuidmap" "newgidmap" # new in shadow 4.2.x - ]; + [ "passwd" "sg" "newgrp" ]; }; |