From e4d104ed8546e457d223dc1472942427241f0e44 Mon Sep 17 00:00:00 2001 From: Eric Garver Date: Mon, 2 Dec 2019 08:47:47 -0500 Subject: [PATCH 04/37] fix: dbus/firewall.conf: fix check for AutomaticHelpers If nft fib is not available the test was checking for "system", but it always yields "no". Fixes: 6cd756b15685 ("chore: deprecate AutomaticHelpers") (cherry picked from commit 58c19a06e9b47bc16cc00d2b7d26d5fce6f91a7a) (cherry picked from commit 3fbeb0d92fa632ecd7174afccd8e5cb71c9adaa6) --- src/tests/dbus/firewalld.conf.at | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/tests/dbus/firewalld.conf.at b/src/tests/dbus/firewalld.conf.at index a26be3213d79..06f6df9bdd70 100644 --- a/src/tests/dbus/firewalld.conf.at +++ b/src/tests/dbus/firewalld.conf.at @@ -17,7 +17,7 @@ string "MinimalMark" : variant int32 100 string "RFC3964_IPv4" : variant string "yes" ])], [ DBUS_GETALL([config], [config], 0, [dnl -string "AutomaticHelpers" : variant string "system" +string "AutomaticHelpers" : variant string "no" string "CleanupOnExit" : variant string "no" string "DefaultZone" : variant string "public" string "FirewallBackend" : variant string "nftables" -- 2.23.0