From 0b29f71cb12b250461bad0075b788a016fa643cf Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Mon, 8 Aug 2022 14:43:28 +0200
Subject: [PATCH] interfaces: merge INFOREQ|REQUEST handling #5862

PDINFO should not be set and therefore only gets cleared.
---
 src/etc/inc/interfaces.inc | 16 +---------------
 1 file changed, 1 insertion(+), 15 deletions(-)

diff --git a/src/etc/inc/interfaces.inc b/src/etc/inc/interfaces.inc
index 6bdb58cf3..f124a92e5 100644
--- a/src/etc/inc/interfaces.inc
+++ b/src/etc/inc/interfaces.inc
@@ -2779,7 +2779,7 @@ if [ -n "{$dhcp6_debug}" ]; then
     /usr/bin/logger -t dhcp6c "dhcp6c \$REASON on {$wanif}"
 fi
 case \$REASON in
-REQUEST)
+INFOREQ|REQUEST)
     /usr/bin/logger -t dhcp6c "dhcp6c \$REASON on {$wanif} - running newipv6"
     ARGS=
     for NAMESERVER in \${new_domain_name_servers}; do
@@ -2794,20 +2794,6 @@ REQUEST)
     /usr/local/sbin/ifctl -i ${wanif} -6pd \${PDINFO:+"-a \${PDINFO}"}
     /usr/local/sbin/configctl -d interface newipv6 {$wanif}
     ;;
-INFOREQ)
-    /usr/bin/logger -t dhcp6c "dhcp6c \$REASON on {$wanif} - running newipv6"
-    ARGS=
-    for NAMESERVER in \${new_domain_name_servers}; do
-        ARGS="\${ARGS} -a \${NAMESERVER}"
-    done
-    /usr/local/sbin/ifctl -i ${wanif} -6nd \${ARGS}
-    ARGS=
-    for DOMAIN in \${new_domain_name}; do
-        ARGS="\${ARGS} -a \${DOMAIN}"
-    done
-    /usr/local/sbin/ifctl -i ${wanif} -6sd \${ARGS}
-    /usr/local/sbin/configctl -d interface newipv6 {$wanif}
-    ;;
 EXIT|RELEASE)
     /usr/bin/logger -t dhcp6c "dhcp6c \$REASON on {$wanif} - running dns reload"
     /usr/local/sbin/ifctl -i ${wanif} -6nd