|
 |
34791e |
commit 7a86d66f27a8c657a3cd9fbecdf26d167c2ee92e
|
|
|
dddd59 |
Author: Thomas Woerner <twoerner@redhat.com>
|
|
|
34791e |
Date: Wed Apr 26 15:07:18 2017 +0200
|
|
|
dddd59 |
|
|
|
34791e |
firewall-cmd: Fix --{set,get}-{short,description} for zone
|
|
|
dddd59 |
|
|
|
34791e |
The options --{set,get}-{short,description} have been used on the wrong object
|
|
|
34791e |
in firewall-cmd which resulted in a back trace.
|
|
|
dddd59 |
|
|
|
34791e |
Fixes: RHBZ#1445238
|
|
|
dddd59 |
|
|
|
dddd59 |
diff --git a/src/firewall-cmd b/src/firewall-cmd
|
|
|
34791e |
index 9988a79..1a864b3 100755
|
|
|
dddd59 |
--- a/src/firewall-cmd
|
|
|
dddd59 |
+++ b/src/firewall-cmd
|
|
|
34791e |
@@ -1987,31 +1987,31 @@ if a.permanent:
|
|
|
34791e |
elif a.list_all_zones:
|
|
|
34791e |
names = fw.config().getZoneNames()
|
|
|
34791e |
for zone in sorted(names):
|
|
|
34791e |
- settings = fw.config().getZoneByName(zone)
|
|
|
34791e |
- cmd.print_zone_info(zone, settings.getSettings())
|
|
|
34791e |
+ settings = fw.config().getZoneByName(zone).getSettings()
|
|
|
34791e |
+ cmd.print_zone_info(zone, settings)
|
|
|
34791e |
cmd.print_msg("")
|
|
|
34791e |
sys.exit(0)
|
|
|
dddd59 |
|
|
|
dddd59 |
# set zone description
|
|
|
dddd59 |
elif a.set_description:
|
|
|
34791e |
- settings = fw.config().getZoneByName(zone)
|
|
|
34791e |
+ settings = fw.config().getZoneByName(zone).getSettings()
|
|
|
dddd59 |
settings.setDescription(a.set_description)
|
|
|
dddd59 |
fw_zone.update(settings)
|
|
|
dddd59 |
|
|
|
dddd59 |
# get zone description
|
|
|
dddd59 |
elif a.get_description:
|
|
|
34791e |
- settings = fw.config().getZoneByName(zone)
|
|
|
34791e |
+ settings = fw.config().getZoneByName(zone).getSettings()
|
|
|
dddd59 |
cmd.print_and_exit(settings.getDescription())
|
|
|
dddd59 |
|
|
|
dddd59 |
# set zone short description
|
|
|
dddd59 |
elif a.set_short:
|
|
|
34791e |
- settings = fw.config().getZoneByName(zone)
|
|
|
34791e |
+ settings = fw.config().getZoneByName(zone).getSettings()
|
|
|
dddd59 |
settings.setShort(a.set_short)
|
|
|
dddd59 |
fw_zone.update(settings)
|
|
|
dddd59 |
|
|
|
dddd59 |
# get zone short description
|
|
|
dddd59 |
elif a.get_short:
|
|
|
34791e |
- settings = fw.config().getZoneByName(zone)
|
|
|
34791e |
+ settings = fw.config().getZoneByName(zone).getSettings()
|
|
|
dddd59 |
cmd.print_and_exit(settings.getShort())
|
|
|
dddd59 |
|
|
|
dddd59 |
elif a.version:
|