diff --git a/src/log/mod.rs b/src/log/mod.rs index 384f593d2..baee06189 100644 --- a/src/log/mod.rs +++ b/src/log/mod.rs @@ -8,7 +8,6 @@ use std::sync::OnceLock; mod simple_logger; mod syslog; -// TODO: logger_macro has an allow_unused that should be removed macro_rules! logger_macro { ($name:ident is $rule_level:ident to $target:expr, $d:tt) => { macro_rules! $name { diff --git a/test-framework/sudo-compliance-tests/src/sudo/sudoers/run_as.rs b/test-framework/sudo-compliance-tests/src/sudo/sudoers/run_as.rs index bfc634c9d..878aff485 100644 --- a/test-framework/sudo-compliance-tests/src/sudo/sudoers/run_as.rs +++ b/test-framework/sudo-compliance-tests/src/sudo/sudoers/run_as.rs @@ -305,11 +305,6 @@ fn when_no_run_as_spec_then_target_user_cannot_be_a_regular_user() { #[test] fn when_no_run_as_spec_then_an_arbitrary_target_group_may_not_be_specified() { - if sudo_test::sudo_version() < sudo_test::ogsudo("1.9.14p2") { - // original sudo should pass this test after 1.9.14p2 - return; - } - let env = Env("ALL ALL = NOPASSWD: ALL") .user(User(USERNAME)) .group(GROUPNAME) diff --git a/test-framework/sudo-compliance-tests/src/sudo/sudoers/runas_alias.rs b/test-framework/sudo-compliance-tests/src/sudo/sudoers/runas_alias.rs index 981f016eb..91cbe4a73 100644 --- a/test-framework/sudo-compliance-tests/src/sudo/sudoers/runas_alias.rs +++ b/test-framework/sudo-compliance-tests/src/sudo/sudoers/runas_alias.rs @@ -298,10 +298,6 @@ fn user_and_group_works_when_one_is_passed_as_arg() { #[test] fn user_and_group_succeeds_when_both_are_passed() { - if sudo_test::sudo_version() < sudo_test::ogsudo("1.9.14p2") { - return; - } - let env = Env([ &format!("Runas_Alias OP = otheruser, {GROUPNAME}"), &format!("{USERNAME} ALL = (OP:OP) NOPASSWD: ALL"), @@ -347,11 +343,6 @@ fn different_aliases_user_and_group_works_when_one_is_passed_as_arg() { #[test] fn different_aliases_user_and_group_succeeds_when_both_are_passed() { - if sudo_test::is_original_sudo() { - // TODO: original sudo should pass this test after 1.9.14b2 - return; - } - let env = Env([ &format!("Runas_Alias GROUPALIAS = {GROUPNAME}"), ("Runas_Alias USERALIAS = otheruser"),