This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree".

The branch, next has been updated via 60fcb2410e4db68625ef080bdf3d99d79e7b5abb (commit) from 843ca290e1be08ddf614cb087b7ddc24d1dada1c (commit)

Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.

- Log ----------------------------------------------------------------- commit 60fcb2410e4db68625ef080bdf3d99d79e7b5abb Author: Arne Fitzenreiter arne_f@ipfire.org Date: Sun Nov 1 11:20:56 2015 +0100

firewall: fix disable MASQERADE in green only mode.

using MASQERADE_GREEN="off" will not work because "NETWORK_GREEN" is not correctly defined in green only mode.

Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org

-----------------------------------------------------------------------

Summary of changes: src/initscripts/init.d/firewall | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

Difference in files: diff --git a/src/initscripts/init.d/firewall b/src/initscripts/init.d/firewall index 2d462d7..6622071 100644 --- a/src/initscripts/init.d/firewall +++ b/src/initscripts/init.d/firewall @@ -352,8 +352,8 @@ iptables_red_up() { # Outgoing masquerading (don't masqerade IPSEC (mark 50)) iptables -t nat -A REDNAT -m mark --mark 50 -o $IFACE -j RETURN

- if [ "$IFACE" = "$GREEN_DEV" ]; then - MASQUERADE_GREEN="off" + if [ "${IFACE}" = "${GREEN_DEV}" ]; then + iptables -t nat -A REDNAT -i "${GREEN_DEV}" -o "${IFACE}" -j RETURN fi

local NO_MASQ_NETWORKS

hooks/post-receive -- IPFire 2.x development tree