From: Martin F. Krafft <madduck@debian.org>
Date: Tue, 22 Sep 2009 19:07:13 +0000 (+0200)
Subject: iptables-apply: select default rule file depending on call name
X-Git-Tag: v1.4.12~3^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=358650c0e280dad8c1292efbf856ac310004a52b;p=thirdparty%2Fiptables.git

iptables-apply: select default rule file depending on call name

ip6tables-apply points to iptables-apply (which is good). Since
iptables/ip6tables rule files are different, the reporter suggests
that the DEFAULT_FILE variable should depend on whether iptables-apply
or ip6tables-apply is run.

References: http://bugs.debian.org/547734
Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
---

diff --git a/iptables/iptables-apply b/iptables/iptables-apply
index 5fec76b0..86b8d5a2 100755
--- a/iptables/iptables-apply
+++ b/iptables/iptables-apply
@@ -11,7 +11,6 @@ PROGNAME="${0##*/}";
 VERSION=1.0
 
 TIMEOUT=10
-DEFAULT_FILE=/etc/network/iptables
 
 function blurb()
 {
@@ -87,6 +86,19 @@ for opt in $OPTS; do
 	shift
 done
 
+case "$PROGNAME" in
+	(*6*)
+		SAVE=ip6tables-save
+		RESTORE=ip6tables-restore
+		DEFAULT_FILE=/etc/network/ip6tables
+		;;
+	(*)
+		SAVE=iptables-save
+		RESTORE=iptables-restore
+		DEFAULT_FILE=/etc/network/iptables
+		;;
+esac
+
 FILE="${1:-$DEFAULT_FILE}";
 
 if [[ -z "$FILE" ]]; then
@@ -99,17 +111,6 @@ if [[ ! -r "$FILE" ]]; then
 	exit 2
 fi
 
-case "${0##*/}" in
-	(*6*)
-		SAVE=ip6tables-save
-		RESTORE=ip6tables-restore
-		;;
-	(*)
-		SAVE=iptables-save
-		RESTORE=iptables-restore
-		;;
-esac
-
 COMMANDS=(tempfile "$SAVE" "$RESTORE")
 
 for cmd in "${COMMANDS[@]}"; do