From aa6ffc501d163b92fdd31157e78ac112fdbf3dbc Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Sat, 27 Nov 2021 13:21:57 +0100
Subject: [PATCH] interfaces: these ip files under /tmp are not being used
 #5367

---
 src/opnsense/scripts/interfaces/ppp-linkdown.sh | 8 +++-----
 src/opnsense/scripts/interfaces/ppp-linkup.sh   | 2 --
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/src/opnsense/scripts/interfaces/ppp-linkdown.sh b/src/opnsense/scripts/interfaces/ppp-linkdown.sh
index 3c9c2e16b..9c1a34d3d 100755
--- a/src/opnsense/scripts/interfaces/ppp-linkdown.sh
+++ b/src/opnsense/scripts/interfaces/ppp-linkdown.sh
@@ -28,27 +28,25 @@ if [ "${AF}" = "inet" ]; then
 		rm -f /var/etc/nameserver_${IF}
 	fi
 
-	# Do not remove gateway used during filter reload.
-	rm -f /tmp/${IF}_router /tmp/${IF}_ip
+	rm -f /tmp/${IF}_router
 elif [ "${AF}" = "inet6" ]; then
 	if [ -s "/tmp/${IF}_defaultgwv6" ]; then
 		GW=$(head -n 1 /tmp/${IF}_defaultgwv6)
 	fi
+
 	if [ -n "${GW}" -a "${DEFAULTGW}" = "${GW}" ]; then
 		echo "Removing stale PPPoE gateway ${GW} on ${AF}" | logger -t ppp-linkdown
 		route delete -${AF} default "${GW}"
 	fi
 
 	if [ -f "/var/etc/nameserver_v6${IF}" ]; then
-		# Remove old entries
 		for nameserver in $(cat /var/etc/nameserver_v6${IF}); do
 			route delete ${nameserver}
 		done
 		rm -f /var/etc/nameserver_v6${IF}
 	fi
 
-	# Do not remove gateway used during filter reload.
-	rm -f /tmp/${IF}_routerv6 /tmp/${IF}_ipv6
+	rm -f /tmp/${IF}_routerv6
 
 	# remove previous SLAAC addresses as the ISP may
 	# not respond to these in the upcoming session
diff --git a/src/opnsense/scripts/interfaces/ppp-linkup.sh b/src/opnsense/scripts/interfaces/ppp-linkup.sh
index d2165b7ec..b1ffd54a9 100755
--- a/src/opnsense/scripts/interfaces/ppp-linkup.sh
+++ b/src/opnsense/scripts/interfaces/ppp-linkup.sh
@@ -4,7 +4,6 @@ export PATH=/bin:/usr/bin:/usr/local/bin:/sbin:/usr/sbin:/usr/local/sbin
 
 if [ "${2}" = "inet" ]; then
 	echo ${4} > /tmp/${1}_router
-	echo ${3} > /tmp/${1}_ip
 
 	if grep -q dnsallowoverride /conf/config.xml; then
 		# write nameservers to file
@@ -26,7 +25,6 @@ if [ "${2}" = "inet" ]; then
 	/usr/local/sbin/configctl -d interface newip ${1}
 elif [ "${2}" = "inet6" ]; then
 	echo ${4} | cut -d% -f1 > /tmp/${1}_routerv6
-	echo ${3} | cut -d% -f1 > /tmp/${1}_ipv6
 
 	if grep -q dnsallowoverride /conf/config.xml; then
 		# write nameservers to file