Change name of IPSECPOSTROUTING to IPSECNAT.

diff --git a/src/initscripts/init.d/firewall b/src/initscripts/init.d/firewall
index 1f400ad47837ae2048c54ba87c3ae7b90dbcf548..1cd2009399485586d01a89aad4744fede71086f2 100644 (file)
--- a/src/initscripts/init.d/firewall
+++ b/src/initscripts/init.d/firewall
@@ -167,8 +167,8 @@ case "$1" in
        /sbin/iptables -A INPUT -j OPENSSLVIRTUAL -m comment --comment "OPENSSLVIRTUAL INPUT"
        /sbin/iptables -A FORWARD -j IPSECVIRTUAL -m comment --comment "IPSECVIRTUAL FORWARD"
        /sbin/iptables -A FORWARD -j OPENSSLVIRTUAL -m comment --comment "OPENSSLVIRTUAL FORWARD"
        /sbin/iptables -A INPUT -j OPENSSLVIRTUAL -m comment --comment "OPENSSLVIRTUAL INPUT"
        /sbin/iptables -A FORWARD -j IPSECVIRTUAL -m comment --comment "IPSECVIRTUAL FORWARD"
        /sbin/iptables -A FORWARD -j OPENSSLVIRTUAL -m comment --comment "OPENSSLVIRTUAL FORWARD"

-       /sbin/iptables -t nat -N IPSECPOSTROUTING
-       /sbin/iptables -t nat -A POSTROUTING -j IPSECPOSTROUTING
+       /sbin/iptables -t nat -N IPSECNAT
+       /sbin/iptables -t nat -A POSTROUTING -j IPSECNAT

 
        # Outgoing Firewall
        /sbin/iptables -A FORWARD -j OUTGOINGFW
 
        # Outgoing Firewall
        /sbin/iptables -A FORWARD -j OUTGOINGFW

diff --git a/src/patches/openswan-2.6.23-updown-add_ipfire-snat.patch b/src/patches/openswan-2.6.23-updown-add_ipfire-snat.patch
index 20f85605c5d2d3a618bac11e8876cb8f474e9cf0..1663bbe70932926e6cd58283f64258c2fccd3d1d 100644 (file)
--- a/src/patches/openswan-2.6.23-updown-add_ipfire-snat.patch
+++ b/src/patches/openswan-2.6.23-updown-add_ipfire-snat.patch
@@ -9,13 +9,13 @@
 +
 +case "$PLUTO_VERB" in
 +"route-client")
 +
 +case "$PLUTO_VERB" in
 +"route-client")

-+   logger -t "ipsec_updown" "iptables -t nat -A IPSECPOSTROUTING -o $PLUTO_INTERFACE -s $PLUTO_ME -d $PLUTO_PEER_CLIENT -j SNAT --to $src"
-+   /sbin/iptables -t nat -A IPSECPOSTROUTING -o $PLUTO_INTERFACE -s $PLUTO_ME -d $PLUTO_PEER_CLIENT -j SNAT --to $src
++   logger -t "ipsec_updown" "iptables -t nat -A IPSECNAT -o $PLUTO_INTERFACE -s $PLUTO_ME -d $PLUTO_PEER_CLIENT -j SNAT --to $src"
++   /sbin/iptables -t nat -A IPSECNAT -o $PLUTO_INTERFACE -s $PLUTO_ME -d $PLUTO_PEER_CLIENT -j SNAT --to $src

 +   ;;
 +
 +"unroute-client")
 +   ;;
 +
 +"unroute-client")

-+   logger -t "ipsec_updown" "iptables -t nat -D IPSECPOSTROUTING -o $PLUTO_INTERFACE -s $PLUTO_ME -d $PLUTO_PEER_CLIENT -j SNAT --to $src"
-+   /sbin/iptables -t nat -D IPSECPOSTROUTING -o $PLUTO_INTERFACE -s $PLUTO_ME -d $PLUTO_PEER_CLIENT -j SNAT --to $src
++   logger -t "ipsec_updown" "iptables -t nat -D IPSECNAT -o $PLUTO_INTERFACE -s $PLUTO_ME -d $PLUTO_PEER_CLIENT -j SNAT --to $src"
++   /sbin/iptables -t nat -D IPSECNAT -o $PLUTO_INTERFACE -s $PLUTO_ME -d $PLUTO_PEER_CLIENT -j SNAT --to $src

 +   ;;
 +esac
 +
 +   ;;
 +esac
 +