From 8b9e867ac83fdc8a3ec4bd7746b455c2b0b79b2d Mon Sep 17 00:00:00 2001 From: nicoo Date: Thu, 7 Sep 2023 12:08:28 +0000 Subject: [PATCH] nixos/sudo: Refactor checks for Todd C. Miller's implemetation --- nixos/modules/security/sudo.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/nixos/modules/security/sudo.nix b/nixos/modules/security/sudo.nix index 0c6b665ec59b..a7e16c5d6f83 100644 --- a/nixos/modules/security/sudo.nix +++ b/nixos/modules/security/sudo.nix @@ -4,13 +4,15 @@ with lib; let + inherit (pkgs) sudo; + cfg = config.security.sudo; enableSSHAgentAuth = with config.security; pam.enableSSHAgentAuth && pam.sudo.sshAgentAuth; - inherit (pkgs) sudo; + usingMillersSudo = cfg.package.pname == sudo.pname; toUserString = user: if (isInt user) then "#${toString user}" else "${user}"; toGroupString = group: if (isInt group) then "%#${toString group}" else "%${group}"; @@ -197,8 +199,8 @@ in config = mkIf cfg.enable { assertions = [ - { assertion = cfg.package.pname != "sudo-rs"; - message = "The NixOS `sudo` module does not work with `sudo-rs` yet."; } + { assertion = usingMillersSudo; + message = "The NixOS `sudo` module does not yet work with other implementations."; } ]; # We `mkOrder 600` so that the default rule shows up first, but there is