From a47d302ec73b00477c6162063aaec305b7abf4fe Mon Sep 17 00:00:00 2001
From: Suvendhu Hansa <suvendhu.hansa@iopsys.eu>
Date: Wed, 11 Jun 2025 14:34:41 +0530
Subject: [PATCH] icwmp,twamp,userinterface: Fix duplicate zone names

---
 icwmp/files/etc/icwmpd/firewall.cwmp           | 3 ++-
 twamp/files/etc/firewall.twamp                 | 3 ++-
 userinterface/files/etc/firewall.userinterface | 3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/icwmp/files/etc/icwmpd/firewall.cwmp b/icwmp/files/etc/icwmpd/firewall.cwmp
index e8632b4fe..ceb1c6364 100644
--- a/icwmp/files/etc/icwmpd/firewall.cwmp
+++ b/icwmp/files/etc/icwmpd/firewall.cwmp
@@ -25,6 +25,7 @@ collect_zone_name() {
 }
 
 load_zone_names() {
+	rm -f "${ZONE_NAME_FILE}"
 	config_load firewall
 	config_foreach collect_zone_name zone
 }
@@ -36,7 +37,7 @@ get_firewall_zone() {
 	fi
 
 	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}"
 }
 
diff --git a/twamp/files/etc/firewall.twamp b/twamp/files/etc/firewall.twamp
index 3d8ccc0f4..7296cef2a 100644
--- a/twamp/files/etc/firewall.twamp
+++ b/twamp/files/etc/firewall.twamp
@@ -29,6 +29,7 @@ collect_zone_name() {
 }
 
 load_zone_names() {
+	rm -f "${ZONE_NAME_FILE}"
 	config_load firewall
 	config_foreach collect_zone_name zone
 }
@@ -40,7 +41,7 @@ get_firewall_zone() {
 	fi
 
 	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}"
 }
 
diff --git a/userinterface/files/etc/firewall.userinterface b/userinterface/files/etc/firewall.userinterface
index a4033ba30..7d7932693 100755
--- a/userinterface/files/etc/firewall.userinterface
+++ b/userinterface/files/etc/firewall.userinterface
@@ -35,6 +35,7 @@ collect_zone_name() {
 }
 
 load_zone_names() {
+	rm -f "${ZONE_NAME_FILE}"
 	config_load firewall
 	config_foreach collect_zone_name zone
 }
@@ -46,7 +47,7 @@ get_firewall_zone() {
 	fi
 
 	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}"
 }