From cc0b1b3be9b01acb8b8fd669145ab774f13213d8 Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Sun, 28 Nov 2021 13:25:20 +0100
Subject: [PATCH] interfaces: move searchdomain files to /tmp #5367

---
 src/etc/inc/interfaces.inc                      | 4 ++--
 src/etc/inc/plugins.inc.d/openvpn/ovpn-linkdown | 4 ++--
 src/etc/inc/system.inc                          | 2 +-
 src/etc/rc.newwanipv6                           | 2 +-
 src/etc/rc.subr.d/var                           | 2 +-
 src/opnsense/scripts/interfaces/dhclient-script | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/etc/inc/interfaces.inc b/src/etc/inc/interfaces.inc
index 4fb9034e9..6a1fab310 100644
--- a/src/etc/inc/interfaces.inc
+++ b/src/etc/inc/interfaces.inc
@@ -1116,8 +1116,8 @@ function interface_bring_down($interface = "wan", $ifacecfg = false)
     /* clear stale state files associated with this interface */
     @unlink("/var/etc/nameserver_{$realif}");
     @unlink("/var/etc/nameserver_v6{$realifv6}");
-    @unlink("/var/etc/searchdomain_{$realif}");
-    @unlink("/var/etc/searchdomain_v6{$realifv6}");
+    @unlink("/tmp/searchdomain_{$realif}");
+    @unlink("/tmp/searchdomain_v6{$realifv6}");
     @unlink("/tmp/{$realif}_router");
     @unlink("/tmp/{$realifv6}_routerv6");
     @unlink("/tmp/{$realifv6}_pdinfo");
diff --git a/src/etc/inc/plugins.inc.d/openvpn/ovpn-linkdown b/src/etc/inc/plugins.inc.d/openvpn/ovpn-linkdown
index fff9bb590..cae11915e 100755
--- a/src/etc/inc/plugins.inc.d/openvpn/ovpn-linkdown
+++ b/src/etc/inc/plugins.inc.d/openvpn/ovpn-linkdown
@@ -6,5 +6,5 @@
 /bin/rm -f /tmp/${1}_routerv6
 /bin/rm -f /var/etc/nameserver_v6${1}
 /bin/rm -f /var/etc/nameserver_${1}
-/bin/rm -f /var/etc/searchdomain_${1}
-/bin/rm -f /var/etc/searchdomain_v6${1}
+/bin/rm -f /tmp/searchdomain_${1}
+/bin/rm -f /tmp/searchdomain_v6${1}
diff --git a/src/etc/inc/system.inc b/src/etc/inc/system.inc
index 5e5bdf5de..e6ce90483 100644
--- a/src/etc/inc/system.inc
+++ b/src/etc/inc/system.inc
@@ -311,7 +311,7 @@ function get_searchdomains()
 {
     $master_list = array();
 
-    $search_list = glob('/var/etc/searchdomain_*');
+    $search_list = glob('/tmp/searchdomain_*');
 
     if (is_array($search_list)) {
         foreach ($search_list as $fdns) {
diff --git a/src/etc/rc.newwanipv6 b/src/etc/rc.newwanipv6
index 421a262da..a5b2bede3 100755
--- a/src/etc/rc.newwanipv6
+++ b/src/etc/rc.newwanipv6
@@ -75,7 +75,7 @@ if (!is_ipaddr($ip) && substr($interface_real, 0, 4) != 'ovpn') {
     return;
 }
 
-$searchdomain_file = "/var/etc/searchdomain_v6{$interface_real}";
+$searchdomain_file = "/tmp/searchdomain_v6{$interface_real}";
 $nameserver_file = "/var/etc/nameserver_v6{$interface_real}";
 
 $new_domain_name_servers = getenv('new_domain_name_servers');
diff --git a/src/etc/rc.subr.d/var b/src/etc/rc.subr.d/var
index 4a7497273..a93cf8a68 100755
--- a/src/etc/rc.subr.d/var
+++ b/src/etc/rc.subr.d/var
@@ -154,7 +154,7 @@ fi
 mkdir -p /var/etc
 
 # clear nameserver, searchdomain and IP cache files
-rm -f /var/etc/nameserver_* /var/etc/searchdomain_*
+rm -f /var/etc/nameserver_*
 
 # Clear all files in this directory to prevent stale state of
 # services.  At one point this also helped to prevent shutdown(8)
diff --git a/src/opnsense/scripts/interfaces/dhclient-script b/src/opnsense/scripts/interfaces/dhclient-script
index 8842e41b8..b516ffbf2 100755
--- a/src/opnsense/scripts/interfaces/dhclient-script
+++ b/src/opnsense/scripts/interfaces/dhclient-script
@@ -234,7 +234,7 @@ add_new_resolv_conf() {
 				route add $nameserver -iface $interface
 			fi
 		done
-		echo $new_domain_name >/var/etc/searchdomain_$interface
+		echo $new_domain_name > /tmp/searchdomain_$interface
 	fi
 
 	return 0