Difuse/luci
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

luci-base: fix ubus luci.getConntrackHelpers call with firewall4

Browse source 
Fallback to firewall4's helper list if the fw3 one cannot be loaded.
Fixes broken zone configuration when firewall4 is installed as backend.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
This commit is contained in:
Jo-Philipp Wich 2022-01-22 00:28:50 +01:00
parent 433db83c65
commit 613080fbc9
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
modules/luci-base/root/usr/libexec/rpcd/luci
View file

@ -165,7 +165,11 @@ local methods = {
local ok, fd = pcall(io.open, "/usr/share/fw3/helpers.conf", "r") local ok, fd = pcall(io.open, "/usr/share/fw3/helpers.conf", "r")
local rv = {} local rv = {}
if ok then if not (ok and fd) then
ok, fd = pcall(io.open, "/usr/share/firewall4/helpers", "r")
end
if ok and fd then
local entry local entry
while true do while true do