From: Michael Tremer <michael.tremer@ipfire.org>
Date: Tue, 22 Jan 2019 11:26:32 +0000 (+0000)
Subject: ipsec-interfaces: Move conditional block into the loop
X-Git-Tag: v2.23-core131~197^2~5
X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=commitdiff_plain;h=d985ce5ae91b5749b629ad24a028249bfbd76372

ipsec-interfaces: Move conditional block into the loop

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/src/scripts/ipsec-interfaces b/src/scripts/ipsec-interfaces
index d73eef9b08..c137a77b99 100644
--- a/src/scripts/ipsec-interfaces
+++ b/src/scripts/ipsec-interfaces
@@ -44,25 +44,6 @@ main() {
 
 	local interfaces=()
 
-	# Compat for older connections
-	if [ "${local}" = "off" ]; then
-		if [ "${VPN_IP}" = "%defaultroute" ]; then
-			local=""
-		else
-			local="${VPN_IP}"
-		fi
-	fi
-
-	# Handle %defaultroute
-	if [ -z "${local}" ]; then
-		if [ -r "/var/ipfire/red/local-ipaddress" ]; then
-			local="$(</var/ipfire/red/local-ipaddress)"
-
-		elif [ "${RED_TYPE}" = "STATIC" -a -n "${RED_ADDRESS}" ]; then
-			local="${RED_ADDRESS}"
-		fi
-	fi
-
 	# We are done when IPsec is not enabled
 	if [ "${ENABLED}" = "on" ]; then
 		while IFS="," read -r "${VARS[@]}"; do
@@ -85,6 +66,25 @@ main() {
 			# Add the interface to the list of all interfaces
 			interfaces+=( "${intf}" )
 
+			# Compat for older connections
+			if [ "${local}" = "off" ]; then
+				if [ "${VPN_IP}" = "%defaultroute" ]; then
+					local=""
+				else
+					local="${VPN_IP}"
+				fi
+			fi
+
+			# Handle %defaultroute
+			if [ -z "${local}" ]; then
+				if [ -r "/var/ipfire/red/local-ipaddress" ]; then
+					local="$(</var/ipfire/red/local-ipaddress)"
+
+				elif [ "${RED_TYPE}" = "STATIC" -a -n "${RED_ADDRESS}" ]; then
+					local="${RED_ADDRESS}"
+				fi
+			fi
+
 			local args=(
 				"local" "${local}"
 				"remote" "${remote}"