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