Merge commit 'origin'; branch 'master' into next

This commit is contained in:
Arne Fitzenreiter
2010-10-10 12:05:56 +02:00
5 changed files with 40 additions and 37 deletions

View File

@@ -140,8 +140,9 @@ case "$1" in
# CUSTOM chains, can be used by the users themselves
/sbin/iptables -N CUSTOMINPUT
/sbin/iptables -A INPUT -j CUSTOMINPUT
/sbin/iptables -N GUARDIANINPUT
/sbin/iptables -A INPUT -j GUARDIANINPUT
/sbin/iptables -N GUARDIAN
/sbin/iptables -A INPUT -j GUARDIAN
/sbin/iptables -A FORWARD -j GUARDIAN
/sbin/iptables -N CUSTOMFORWARD
/sbin/iptables -A FORWARD -j CUSTOMFORWARD
/sbin/iptables -N CUSTOMOUTPUT