mirror/iopsys-feed
1
0
Fork 0
mirror of https://dev.iopsys.eu/feed/iopsys.git synced 2025-12-10 07:44:50 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

icwmp,twamp,userinterface: Fix duplicate zone names

Browse source
This commit is contained in:
Suvendhu Hansa 2025-06-11 14:34:41 +05:30 • committed by IOPSYS Dev
parent a9b3a392dd
commit a47d302ec7
No known key found for this signature in database
3 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
icwmp/files/etc/icwmpd/firewall.cwmp
View file

@ -25,6 +25,7 @@ collect_zone_name() {
} }
load_zone_names() { load_zone_names() {
rm -f "${ZONE_NAME_FILE}"
config_load firewall config_load firewall
config_foreach collect_zone_name zone config_foreach collect_zone_name zone
} }
@ -36,7 +37,7 @@ get_firewall_zone() {
fi fi
var="${1}_zone=" var="${1}_zone="
name="$(cat ${ZONE_NAME_FILE} | grep ${var} | cut -d'=' -f 2)" name="$(cat ${ZONE_NAME_FILE} | grep ${var} | head -n 1 | cut -d'=' -f 2)"
echo "${name}" echo "${name}"
} }

3
twamp/files/etc/firewall.twamp
View file

@ -29,6 +29,7 @@ collect_zone_name() {
} }
load_zone_names() { load_zone_names() {
rm -f "${ZONE_NAME_FILE}"
config_load firewall config_load firewall
config_foreach collect_zone_name zone config_foreach collect_zone_name zone
} }
@ -40,7 +41,7 @@ get_firewall_zone() {
fi fi
var="${1}_zone=" var="${1}_zone="
name="$(cat ${ZONE_NAME_FILE} | grep ${var} | cut -d'=' -f 2)" name="$(cat ${ZONE_NAME_FILE} | grep ${var} | head -n 1 | cut -d'=' -f 2)"
echo "${name}" echo "${name}"
} }

3
userinterface/files/etc/firewall.userinterface
View file

@ -35,6 +35,7 @@ collect_zone_name() {
} }
load_zone_names() { load_zone_names() {
rm -f "${ZONE_NAME_FILE}"
config_load firewall config_load firewall
config_foreach collect_zone_name zone config_foreach collect_zone_name zone
} }
@ -46,7 +47,7 @@ get_firewall_zone() {
fi fi
var="${1}_zone=" var="${1}_zone="
name="$(cat ${ZONE_NAME_FILE} | grep ${var} | cut -d'=' -f 2)" name="$(cat ${ZONE_NAME_FILE} | grep ${var} | head -n 1 | cut -d'=' -f 2)"
echo "${name}" echo "${name}"
} }