From mboxrd@z Thu Jan  1 00:00:00 1970
From: Jonatan Schlag <jonatan.schlag@ipfire.org>
To: network@lists.ipfire.org
Subject: [PATCH] Fix parsing of hids and ids
Date: Sun, 28 Jan 2018 15:25:48 +0000
Message-ID: <1517153148-6844-1-git-send-email-jonatan.schlag@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============5309303751762806959=="
List-Id: <network.lists.ipfire.org>

--===============5309303751762806959==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

If we get an id insted of a hid we failed beacuse
we passed the wrong variable.

I also added some more comments.

Fixes: #11453

Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
---
 src/functions/functions.zone | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/functions/functions.zone b/src/functions/functions.zone
index f724f50..2d3d2c7 100644
--- a/src/functions/functions.zone
+++ b/src/functions/functions.zone
@@ -527,7 +527,8 @@ zone_config() {
 			zone_config_list "${zone}" "$@"
 			;;
 		*)
-			# usually ${1} is a valid hid
+			# usually ${cmd} is valid hid
+			# We get ${hid} ${cmd} $@ from the cli
 			local hid=3D${cmd}
 			local cmd=3D${1}
 			shift 1
@@ -538,11 +539,11 @@ zone_config() {
 			if isset id && [[ ${cmd} =3D=3D "edit" ]]; then
 				 zone_config_edit "${zone}" "${id}" "$@"
=20
-			# If we didn't get a valid hid we check if we got a valid id
+			# If we didn't get a valid hid we check if we got a valid id (saved in ${=
hid})
 			else
-				if zone_config_id_is_valid ${zone} ${id} && [[ ${cmd} =3D=3D "edit" ]]; =
then
+				if zone_config_id_is_valid ${zone} ${hid} && [[ ${cmd} =3D=3D "edit" ]];=
 then
 					shift 1
-					zone_config_edit "${zone}" "${id}" "$@"
+					zone_config_edit "${zone}" "${hid}" "$@"
 				else
 					# in ${hid} is saved the command after network zone ${zone} config
 					error "Unrecognized argument: ${hid}"
@@ -1171,6 +1172,8 @@ zone_config_id_is_valid() {
 	local zone=3D${1}
 	local id=3D${2}
=20
+	log DEBUG "Checking if id: ${id} is valid for zone: ${zone}"
+
 	local zone_path=3D"${NETWORK_ZONES_DIR}/${zone}"
=20
 	[ -f ${zone_path}/configs/*.${id} ];
--=20
2.6.3


--===============5309303751762806959==--