setcap-wrapper: Merging with upstream master and resolving conflicts

2017-01-25 11:08:05 -08:00
parent 1f9494b752 104c3db659
commit bae00e8aa8
4612 changed files with 200748 additions and 124553 deletions
@@ -99,7 +99,6 @@ in
        groupdel = { rootOK = true; };
        login = { startSession = true; allowNullPassword = true; showMotd = true; updateWtmp = true; };
        chpasswd = { rootOK = true; };
-        chgpasswd = { rootOK = true; };
      };