Attachment 575187 Details for Bug 804814 – update interfaces in default zone after reload

[patch] update interfaces in default zone after reload

0001-update-interfaces-in-default-zone-after-reload-rhbz-.patch (text/plain), 1.52 KB, created by Jiri Popelka on 2012-04-04 17:32:14 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jiri Popelka

Created: 2012-04-04 17:32:14 UTC

Size: 1.52 KB

patch

obsolete

>From dcc86382ca64606baf567af17362b7759eac932e Mon Sep 17 00:00:00 2001
>From: Jiri Popelka <jpopelka@redhat.com>
>Date: Wed, 4 Apr 2012 19:15:08 +0200
>Subject: [PATCH] update interfaces in default zone after reload (rhbz#804814)
>
>---
> src/firewall/core/fw.py |   10 ++++++++++
> 1 file changed, 10 insertions(+)
>
>diff --git a/src/firewall/core/fw.py b/src/firewall/core/fw.py
>index 0b73c62..290cc4f 100644
>--- a/src/firewall/core/fw.py
>+++ b/src/firewall/core/fw.py
>@@ -427,6 +427,7 @@ class Firewall:
>         for zone in self.zone.get_zones():
>             _zone_settings[zone] = self.zone.get_settings(zone)
>         # save direct config
>+        old_dz = self.get_default_zone()
>         _direct_config = self.direct.get_config()
> 
>         if stop:
>@@ -441,6 +442,15 @@ class Firewall:
>         if _panic:
>             self.enable_panic_mode()
> 
>+        new_dz = self.get_default_zone()
>+        if new_dz != old_dz:
>+            # default zone changed. Move interfaces from old default zone to the new one.
>+            # FIXME: This moves all interfaces from old default zone, because we
>+            # can't distinguish which were there as in a default zone and which
>+            # had been added there namely (i.e. to a specific zone, same with the default one)
>+            _zone_settings[new_dz]['interfaces'].update(_zone_settings[old_dz]['interfaces'])
>+            _zone_settings[old_dz]['interfaces'].clear()
>+
>         # restore zone settings
>         for zone in self.zone.get_zones():
>             if zone in _zone_settings:
>-- 
>1.7.9.3
>

Actions: View | Diff

Attachments on bug 804814: 575187 | 576536