From a224ff4a2be2f9522d746e017a214c66a71c8c1a Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Tue, 17 Oct 2023 08:15:15 +0200
Subject: [PATCH] dhcp: sort this a little better, loosely refs #6942

---
 src/etc/inc/plugins.inc.d/dhcpd.inc | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/etc/inc/plugins.inc.d/dhcpd.inc b/src/etc/inc/plugins.inc.d/dhcpd.inc
index eb93dd4c3..884f10649 100644
--- a/src/etc/inc/plugins.inc.d/dhcpd.inc
+++ b/src/etc/inc/plugins.inc.d/dhcpd.inc
@@ -247,8 +247,8 @@ function dhcpd_radvd_configure($verbose = false, $blacklist = [])
         }
 
         switch ($dhcpv6ifconf['ramode']) {
-            case 'managed':
             case 'assist':
+            case 'managed':
                 $radvdconf .= "\tAdvManagedFlag on;\n";
                 $radvdconf .= "\tAdvOtherConfigFlag on;\n";
                 break;
@@ -312,6 +312,12 @@ function dhcpd_radvd_configure($verbose = false, $blacklist = [])
             $radvdconf .= "\tprefix {$stanza} {\n";
             $radvdconf .= "\t\tDeprecatePrefix " . (!empty($dhcpv6ifconf['AdvDeprecatePrefix']) ? $dhcpv6ifconf['AdvDeprecatePrefix'] : ($carp_mode ? 'off' : 'on')) . ";\n";
             switch ($dhcpv6ifconf['ramode']) {
+                case 'assist':
+                case 'stateless':
+                case 'unmanaged':
+                    $radvdconf .= "\t\tAdvOnLink on;\n";
+                    $radvdconf .= "\t\tAdvAutonomous on;\n";
+                    break;
                 case 'managed':
                     $radvdconf .= "\t\tAdvOnLink on;\n";
                     $radvdconf .= "\t\tAdvAutonomous off;\n";
@@ -320,12 +326,6 @@ function dhcpd_radvd_configure($verbose = false, $blacklist = [])
                     $radvdconf .= "\t\tAdvOnLink off;\n";
                     $radvdconf .= "\t\tAdvAutonomous off;\n";
                     break;
-                case 'assist':
-                case 'unmanaged':
-                case 'stateless':
-                    $radvdconf .= "\t\tAdvOnLink on;\n";
-                    $radvdconf .= "\t\tAdvAutonomous on;\n";
-                    break;
                 default:
                     break;
             }