From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jonatan Schlag To: network@lists.ipfire.org Subject: [PATCH 1/5] zone: zone_config_check_same_setting check for config to edit Date: Sat, 12 Aug 2017 12:22:25 +0200 Message-ID: <1502533349-13935-1-git-send-email-jonatan.schlag@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============1487889642306134457==" List-Id: --===============1487889642306134457== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable We now check if we get the config, which we edit in this moment and when we c= ontinue. Fixes: #11451 Signed-off-by: Jonatan Schlag --- src/functions/functions.zone | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/src/functions/functions.zone b/src/functions/functions.zone index 1eb492f..941314d 100644 --- a/src/functions/functions.zone +++ b/src/functions/functions.zone @@ -1155,12 +1155,13 @@ zone_config_check_same_setting() { # with the same setting is already configured for this zone. # Returns True when yes and False when no. =20 - assert [ $# -eq 4 ] + assert [ $# -eq 5 ] =20 local zone=3D${1} local hook=3D${2} - local key=3D${3} - local value=3D${4} + local id=3D${3} + local key=3D${4} + local value=3D${5} =20 # The key should be local for this function local ${key} @@ -1171,6 +1172,12 @@ zone_config_check_same_setting() { if [[ $(zone_config_get_hook "${zone}" "${config}") !=3D ${hook} ]]; then continue fi + + # Check if we get the config we want to create or edit (we must ignore thi= s config on edit) + if [[ "${hook}.${id}" =3D "${config}" ]]; then + continue + fi + # Get the value of the key for a given function zone_config_settings_read "${zone}" "${config}" \ --ignore-superfluous-settings "${key}" --=20 2.6.3 --===============1487889642306134457==--