Blame SOURCES/firewalld-0.4.3.2-get_set_description_rhbz#1368949.patch

dddd59
commit b67a186b32f832656eefb604b9460f1df5c37a56
dddd59
Author: Thomas Woerner <twoerner@redhat.com>
dddd59
Date:   Mon Aug 22 10:24:19 2016 +0200
dddd59
dddd59
    firewall-cmd: Fixed --{get,set}-{description,short} for permanent zones
dddd59
    
dddd59
    The --{get,set}-{description,short} options for permanent zones have been
dddd59
    missing the settings initiation line, which resulted in a trace back later
dddd59
    while using the settings.
dddd59
    
dddd59
    This fixes RHBZ#1368625
dddd59
dddd59
diff --git a/src/firewall-cmd b/src/firewall-cmd
dddd59
index 81b4b73..e6bd2e1 100755
dddd59
--- a/src/firewall-cmd
dddd59
+++ b/src/firewall-cmd
dddd59
@@ -1775,20 +1775,24 @@ if a.permanent:
dddd59
 
dddd59
         # set zone description
dddd59
         elif a.set_description:
dddd59
+            settings = fw.config().getZoneByName(zone)
dddd59
             settings.setDescription(a.set_description)
dddd59
             fw_zone.update(settings)
dddd59
 
dddd59
         # get zone description
dddd59
         elif a.get_description:
dddd59
+            settings = fw.config().getZoneByName(zone)
dddd59
             cmd.print_and_exit(settings.getDescription())
dddd59
 
dddd59
         # set zone short description
dddd59
         elif a.set_short:
dddd59
+            settings = fw.config().getZoneByName(zone)
dddd59
             settings.setShort(a.set_short)
dddd59
             fw_zone.update(settings)
dddd59
 
dddd59
         # get zone short description
dddd59
         elif a.get_short:
dddd59
+            settings = fw.config().getZoneByName(zone)
dddd59
             cmd.print_and_exit(settings.getShort())
dddd59
 
dddd59
 elif a.version: