[Pkg-libvirt-commits] [SCM] Libvirt Debian packaging branch, master, updated. debian/0.7.2-2

[Guido Günther]

The following commit has been merged in the master branch:
commit 43f106a36e6f88d32388a2ec28bac8558da9f589
Author: Guido Günther <agx at sigxcpu.org>
Date:   Thu Nov 5 20:43:33 2009 +0100

    Only remove masquerade roles for VIR_NETWORK_FORWARD_NAT
    
    Closes: #549949
    Thanks: Rob S. Wolfram for testing

diff --git a/debian/patches/0007-Only-remove-masquerade-roles-for-VIR_NETWORK_FORWARD.patch b/debian/patches/0007-Only-remove-masquerade-roles-for-VIR_NETWORK_FORWARD.patch
new file mode 100644
index 0000000..1d3e68b
--- /dev/null
+++ b/debian/patches/0007-Only-remove-masquerade-roles-for-VIR_NETWORK_FORWARD.patch
@@ -0,0 +1,36 @@
+From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx at sigxcpu.org>
+Date: Thu, 5 Nov 2009 20:28:11 +0100
+Subject: [PATCH] Only remove masquerade roles for VIR_NETWORK_FORWARD_NAT
+
+Closes: #549949
+---
+ src/network/bridge_driver.c |   11 +++++------
+ 1 files changed, 5 insertions(+), 6 deletions(-)
+
+diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c
+index 95bc810..86ec392 100644
+--- a/src/network/bridge_driver.c
++++ b/src/network/bridge_driver.c
+@@ -765,16 +765,15 @@ static void
+ networkRemoveIptablesRules(struct network_driver *driver,
+                          virNetworkObjPtr network) {
+     if (network->def->forwardType != VIR_NETWORK_FORWARD_NONE) {
+-        iptablesRemoveForwardMasquerade(driver->iptables,
+-                                        network->def->network,
+-                                        network->def->forwardDev);
+-
+-        if (network->def->forwardType == VIR_NETWORK_FORWARD_NAT)
++        if (network->def->forwardType == VIR_NETWORK_FORWARD_NAT) {
++            iptablesRemoveForwardMasquerade(driver->iptables,
++                                                network->def->network,
++                                                network->def->forwardDev);
+             iptablesRemoveForwardAllowRelatedIn(driver->iptables,
+                                                 network->def->network,
+                                                 network->def->bridge,
+                                                 network->def->forwardDev);
+-        else if (network->def->forwardType == VIR_NETWORK_FORWARD_ROUTE)
++        } else if (network->def->forwardType == VIR_NETWORK_FORWARD_ROUTE)
+             iptablesRemoveForwardAllowIn(driver->iptables,
+                                          network->def->network,
+                                          network->def->bridge,
+-- 
diff --git a/debian/patches/series b/debian/patches/series
index 77ea202..ced4d3d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@
 0004-fix-Debian-specific-path-to-hvm-loader.patch
 0005-Fix-SELinux-linking-issues.patch
 0006-Don-t-let-parent-of-daemon-exit-until-basic-initiali.patch
+0007-Only-remove-masquerade-roles-for-VIR_NETWORK_FORWARD.patch

-- 
Libvirt Debian packaging