From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jonatan Schlag To: network@lists.ipfire.org Subject: [PATCH] Fix zone_config_check_same_setting Date: Sun, 28 Jan 2018 18:59:22 +0000 Message-ID: <1517165962-12420-1-git-send-email-jonatan.schlag@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============0414485159866973529==" List-Id: --===============0414485159866973529== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Every time we edited a config zone_config_check_same_setting returns that a identical config was found but this config was the config we want to edit. So we now generate the id inside hook_new and pass the id always to hook_parse_cmdline and to zone_config_check_same_setting. So we cann skip this config. Fixes: #11451 Signed-off-by: Jonatan Schlag --- src/functions/functions.zone | 18 +++++++++++------- src/header-config | 2 +- src/hooks/configs/dhcp | 10 ++++++++-- src/hooks/configs/ipv4-static | 12 +++++++++--- src/hooks/configs/ipv6-auto | 10 ++++++++-- src/hooks/configs/ipv6-static | 12 +++++++++--- src/hooks/configs/pppoe-server | 10 ++++++++-- 7 files changed, 54 insertions(+), 20 deletions(-) diff --git a/src/functions/functions.zone b/src/functions/functions.zone index 2d3d2c7..0d767cf 100644 --- a/src/functions/functions.zone +++ b/src/functions/functions.zone @@ -1098,22 +1098,29 @@ 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} local config =20 for config in $(zone_configs_list ${zone}); do + # Check if the config is eqal with the config we want to edit, when contin= ue + if [[ "${config}" =3D "${hook}.${id}" ]]; then + continue + fi + # Check if the config is from the given hook, when not continue if [[ $(zone_config_get_hook "${zone}" "${config}") !=3D ${hook} ]]; then continue fi + # Get the value of the key for a given function zone_config_settings_read "${zone}" "${config}" \ --ignore-superfluous-settings "${key}" @@ -1346,10 +1353,7 @@ zone_config_settings_write() { local hook=3D"${2}" local id=3D${3} =20 - if ! isset id; then - id=3D$(zone_config_get_new_id ${zone}) - log DEBUG "ID for the config is: ${id}" - fi + assert isset id =20 local args if function_exists "hook_check_config_settings"; then diff --git a/src/header-config b/src/header-config index ec85a70..10b0279 100644 --- a/src/header-config +++ b/src/header-config @@ -55,7 +55,7 @@ hook_edit() { return ${EXIT_ERROR} fi =20 - if ! hook_parse_cmdline "$@"; then + if ! hook_parse_cmdline "${id}" "$@"; then # Return an error if the parsing of the cmd line fails return ${EXIT_ERROR} fi diff --git a/src/hooks/configs/dhcp b/src/hooks/configs/dhcp index f22507c..40c6b48 100644 --- a/src/hooks/configs/dhcp +++ b/src/hooks/configs/dhcp @@ -35,6 +35,9 @@ hook_check_config_settings() { } =20 hook_parse_cmdline() { + local id=3D"${1}" + shift + while [ $# -gt 0 ]; do case "${1}" in --enable-ipv6) @@ -72,12 +75,15 @@ hook_new() { return ${EXIT_ERROR} fi =20 - if ! hook_parse_cmdline "$@"; then + id=3D$(zone_config_get_new_id ${zone}) + log DEBUG "ID for the config is: ${id}" + + if ! hook_parse_cmdline "${id}" "$@"; then # Return an error if the parsing of the cmd line fails return ${EXIT_ERROR} fi =20 - zone_config_settings_write "${zone}" "${HOOK}" + zone_config_settings_write "${zone}" "${HOOK}" "${id}" =20 exit ${EXIT_OK} } diff --git a/src/hooks/configs/ipv4-static b/src/hooks/configs/ipv4-static index 7aea0b9..0c16322 100644 --- a/src/hooks/configs/ipv4-static +++ b/src/hooks/configs/ipv4-static @@ -36,6 +36,9 @@ hook_check_config_settings() { } =20 hook_parse_cmdline() { + local id=3D"${1}" + shift + local arg =20 while read -r arg; do @@ -99,7 +102,7 @@ hook_parse_cmdline() { exit ${EXIT_CONF_ERROR} fi =20 - if zone_config_check_same_setting "${zone}" "ipv4-static" "ADDRESS" "${ADDR= ESS}"; then + if zone_config_check_same_setting "${zone}" "ipv4-static" "${id}" "ADDRESS"= "${ADDRESS}"; then error "An ipv4-static config with the same IPv4 address is already configu= red" exit ${EXIT_CONF_ERROR} fi @@ -115,12 +118,15 @@ hook_new() { =20 assert zone_exists "${zone}" =20 - if ! hook_parse_cmdline "$@"; then + id=3D$(zone_config_get_new_id ${zone}) + log DEBUG "ID for the config is: ${id}" + + if ! hook_parse_cmdline "${id}" "$@"; then # Return an error if the parsing of the cmd line fails return ${EXIT_ERROR} fi =20 - zone_config_settings_write "${zone}" "${HOOK}" + zone_config_settings_write "${zone}" "${HOOK}" "${id}" =20 exit ${EXIT_OK} } diff --git a/src/hooks/configs/ipv6-auto b/src/hooks/configs/ipv6-auto index bf1003d..b6301b0 100644 --- a/src/hooks/configs/ipv6-auto +++ b/src/hooks/configs/ipv6-auto @@ -31,6 +31,9 @@ hook_check_config_settings() { } =20 hook_parse_cmdline() { + local id=3D"${1}" + shift + local arg =20 while read arg; do @@ -57,12 +60,15 @@ hook_new() { return ${EXIT_ERROR} fi =20 - if ! hook_parse_cmdline "$@"; then + id=3D$(zone_config_get_new_id ${zone}) + log DEBUG "ID for the config is: ${id}" + + if ! hook_parse_cmdline "${id}" "$@"; then # Return an error if the parsing of the cmd line fails return ${EXIT_ERROR} fi =20 - zone_config_settings_write "${zone}" "${HOOK}" + zone_config_settings_write "${zone}" "${HOOK}" "${id}" =20 exit ${EXIT_OK} } diff --git a/src/hooks/configs/ipv6-static b/src/hooks/configs/ipv6-static index 273c201..8f94819 100644 --- a/src/hooks/configs/ipv6-static +++ b/src/hooks/configs/ipv6-static @@ -34,6 +34,9 @@ hook_check_config_settings() { } =20 hook_parse_cmdline() { + local id=3D"${1}" + shift + while [ $# -gt 0 ]; do case "${1}" in --address=3D*) @@ -49,7 +52,7 @@ hook_parse_cmdline() { shift done =20 - if zone_config_check_same_setting "${zone}" "ipv6-static" "ADDRESS" "${ADDR= ESS}"; then + if zone_config_check_same_setting "${zone}" "ipv6-static" "${id}" "ADDRESS"= "${ADDRESS}"; then error "An ipv6-static config with the same IPv6 address is already configu= red" exit ${EXIT_CONF_ERROR} fi @@ -66,12 +69,15 @@ hook_new() { local zone=3D${1} shift =20 - if ! hook_parse_cmdline "$@"; then + id=3D$(zone_config_get_new_id ${zone}) + log DEBUG "ID for the config is: ${id}" + + if ! hook_parse_cmdline "${id}" "$@"; then # Return an error if the parsing of the cmd line fails return ${EXIT_ERROR} fi =20 - zone_config_settings_write "${zone}" "${HOOK}" + zone_config_settings_write "${zone}" "${HOOK}" "${id}" =20 exit ${EXIT_OK} } diff --git a/src/hooks/configs/pppoe-server b/src/hooks/configs/pppoe-server index 7021be2..35de2eb 100644 --- a/src/hooks/configs/pppoe-server +++ b/src/hooks/configs/pppoe-server @@ -49,6 +49,9 @@ hook_check_config_settings() { } =20 hook_parse_cmdline() { + local id=3D"${1}" + shift + while [ $# -gt 0 ]; do case "${1}" in --dns-server=3D*) @@ -105,12 +108,15 @@ hook_new() { return ${EXIT_ERROR} fi =20 - if ! hook_parse_cmdline "$@"; then + id=3D$(zone_config_get_new_id ${zone}) + log DEBUG "ID for the config is: ${id}" + + if ! hook_parse_cmdline "${id}" "$@"; then # Return an error if the parsing of the cmd line fails return ${EXIT_ERROR} fi =20 - zone_config_settings_write "${zone}" "${HOOK}" + zone_config_settings_write "${zone}" "${HOOK}" "${id}" =20 exit ${EXIT_OK} } --=20 2.6.3 --===============0414485159866973529==--