From aa9f133219940a947cbc2af23c69134700a19eb4 Mon Sep 17 00:00:00 2001 From: Packit Service Date: Feb 04 2021 06:16:42 +0000 Subject: Apply patch 0035-fix-cli-add-zone-is-an-invalid-option-with-direct.patch patch_name: 0035-fix-cli-add-zone-is-an-invalid-option-with-direct.patch present_in_specfile: true location_in_specfile: 35 --- diff --git a/src/firewall-cmd.in b/src/firewall-cmd.in index 317da5e..014f388 100755 --- a/src/firewall-cmd.in +++ b/src/firewall-cmd.in @@ -962,6 +962,9 @@ if (a.direct and not options_direct) or (options_direct and not a.direct): cmd.fail(parser.format_usage() + "Wrong usage of 'direct' options.") +if a.zone and a.direct: + cmd.fail(parser.format_usage() + "--zone is an invalid option with --direct") + if a.name and not (a.new_zone_from_file or a.new_service_from_file or \ a.new_ipset_from_file or a.new_icmptype_from_file or \ a.new_helper_from_file): diff --git a/src/tests/regression/regression.at b/src/tests/regression/regression.at index 1c8f76a..5241a11 100644 --- a/src/tests/regression/regression.at +++ b/src/tests/regression/regression.at @@ -31,3 +31,4 @@ m4_include([regression/gh599.at]) m4_include([regression/rhbz1829104.at]) m4_include([regression/rhbz1843398.at]) m4_include([regression/rhbz1689429.at]) +m4_include([regression/rhbz1483921.at]) diff --git a/src/tests/regression/rhbz1483921.at b/src/tests/regression/rhbz1483921.at new file mode 100644 index 0000000..d3dd60b --- /dev/null +++ b/src/tests/regression/rhbz1483921.at @@ -0,0 +1,8 @@ +FWD_START_TEST([direct zone]) + AT_KEYWORDS(direct rhbz1483921) + + FWD_CHECK([firewall-cmd --zone=public --permanent --direct --add-rule ipv4 nat OUTPUT 1 -p tcp --dport 8443 -j DNAT --to-port 9443], 2, ignore,ignore) + + FWD_CHECK([firewall-cmd --zone=public --direct --add-rule ipv4 nat OUTPUT 1 -p tcp --dport 8443 -j DNAT --to-port 9443], 2, ignore,ignore) +FWD_END_TEST +