From f879fcd97cf73fb74611e66833f72433d4ff76e6 Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Thu, 8 Aug 2024 14:29:38 +0200
Subject: [PATCH] interafaces: minor sync/cleanup

---
 src/etc/rc.newwanip   | 2 +-
 src/etc/rc.newwanipv6 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/etc/rc.newwanip b/src/etc/rc.newwanip
index 88fc123dd..27490c431 100755
--- a/src/etc/rc.newwanip
+++ b/src/etc/rc.newwanip
@@ -98,7 +98,7 @@ switch (isset($config['system']['ipv6allow']) ? ($config['interfaces'][$interfac
             interface_dhcpv6_configure($interface, $config['interfaces'][$interface]);
         }
         break;
-   default:
+    default:
         if (isset($config['interfaces'][$interface]['dhcp6usev4iface'])) {
             interface_static6_configure($interface, $config['interfaces'][$interface]);
             system_routing_configure(false, $interface, true, 'inet6');
diff --git a/src/etc/rc.newwanipv6 b/src/etc/rc.newwanipv6
index 02db5dbad..4086be2ad 100755
--- a/src/etc/rc.newwanipv6
+++ b/src/etc/rc.newwanipv6
@@ -99,7 +99,7 @@ interfaces_vips_configure($interface, 6);
 $greifs = link_interface_to_gre($interface, true, 6);
 $gififs = link_interface_to_gif($interface, true, 6);
 
-switch ($config['interfaces'][$interface]['ipaddrv6'] ?? 'none') {
+switch (isset($config['system']['ipv6allow']) ? ($config['interfaces'][$interface]['ipaddrv6'] ?? 'none') : 'none') {
     case 'slaac':
         /* require immediate reconfiguration before reconfiguring clients */
         plugins_configure('dhcp', false, ['inet6']);