From e6ef454fa8ecc8c84b2e52861b9f5dd4527aba14 Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Mon, 15 Aug 2022 12:14:48 +0200
Subject: [PATCH] interfaces: signal address flush through rc.newwanip #5933

---
 plist                                         |  1 -
 src/etc/rc.resolv_conf_generate               | 36 -------------------
 .../scripts/interfaces/dhclient-script        |  1 +
 .../scripts/interfaces/ppp-linkdown.sh        |  2 +-
 .../service/conf/actions.d/actions_dns.conf   |  6 ----
 5 files changed, 2 insertions(+), 44 deletions(-)
 delete mode 100755 src/etc/rc.resolv_conf_generate

diff --git a/plist b/plist
index 4de82b736..f1ecabf68 100644
--- a/plist
+++ b/plist
@@ -112,7 +112,6 @@
 /usr/local/etc/rc.newwanipv6
 /usr/local/etc/rc.reboot
 /usr/local/etc/rc.reload_all
-/usr/local/etc/rc.resolv_conf_generate
 /usr/local/etc/rc.restart_webgui
 /usr/local/etc/rc.routing_configure
 /usr/local/etc/rc.shutdown
diff --git a/src/etc/rc.resolv_conf_generate b/src/etc/rc.resolv_conf_generate
deleted file mode 100755
index 56f55e006..000000000
--- a/src/etc/rc.resolv_conf_generate
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/usr/local/bin/php
-<?php
-
-/*
- * Copyright (C) 2010 Ermal Luçi
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice,
- *    this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
- * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- * AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
- * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-require_once("util.inc");
-require_once("config.inc");
-require_once("system.inc");
-require_once("interfaces.inc");
-
-system_resolvconf_generate(true);
-system_hosts_generate(true);
diff --git a/src/opnsense/scripts/interfaces/dhclient-script b/src/opnsense/scripts/interfaces/dhclient-script
index 6fd5c5b21..629dc5eb2 100755
--- a/src/opnsense/scripts/interfaces/dhclient-script
+++ b/src/opnsense/scripts/interfaces/dhclient-script
@@ -354,6 +354,7 @@ EXPIRE|FAIL)
 			;;
 		esac
 	fi
+	/usr/local/sbin/configctl -d interface newip $interface
 	;;
 
 TIMEOUT)
diff --git a/src/opnsense/scripts/interfaces/ppp-linkdown.sh b/src/opnsense/scripts/interfaces/ppp-linkdown.sh
index bc85daf07..353f41012 100755
--- a/src/opnsense/scripts/interfaces/ppp-linkdown.sh
+++ b/src/opnsense/scripts/interfaces/ppp-linkdown.sh
@@ -23,7 +23,7 @@ if [ "${AF}" = "inet" ]; then
 	/usr/local/sbin/ifctl -i ${IF} -4nd
 	/usr/local/sbin/ifctl -i ${IF} -4rd
 
-	/usr/local/sbin/configctl -d dns reload # XXX last caller, remove action and rc.resolv_conf_generate
+	/usr/local/sbin/configctl -d interface newip ${IF}
 elif [ "${AF}" = "inet6" ]; then
 	if [ -s "/tmp/${IF}_defaultgwv6" ]; then
 		GW=$(head -n 1 /tmp/${IF}_defaultgwv6)
diff --git a/src/opnsense/service/conf/actions.d/actions_dns.conf b/src/opnsense/service/conf/actions.d/actions_dns.conf
index 5391b26bc..b90026541 100644
--- a/src/opnsense/service/conf/actions.d/actions_dns.conf
+++ b/src/opnsense/service/conf/actions.d/actions_dns.conf
@@ -1,9 +1,3 @@
-[reload]
-command:/usr/local/etc/rc.resolv_conf_generate
-parameters:
-type:script
-message:Rewriting resolv.conf
-
 [query]
 command:/usr/local/opnsense/scripts/dns/query_dns.py
 parameters: --server %s %s