From 94df5fbe6896b7aaf414ee8fb290af985fa9c94f Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Sat, 5 May 2018 09:43:06 +0000
Subject: [PATCH] dhcp: correctly "merge" arrays for #2336

Looks like this was introduced in 607d8eccd.
---
 src/etc/inc/services.inc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/etc/inc/services.inc b/src/etc/inc/services.inc
index 66a6f0cde..b6e2a87e0 100644
--- a/src/etc/inc/services.inc
+++ b/src/etc/inc/services.inc
@@ -238,13 +238,13 @@ function services_radvd_configure($blacklist = array())
         /* add DNS servers */
         $dnslist_tmp = array();
         if (isset($dhcpv6ifconf['rasamednsasdhcp6']) && !empty($dhcpv6ifconf['dnsserver'][0])) {
-            array_merge($dnslist_tmp, $dhcpv6ifconf['dnsserver']);
+            $dnslist_tmp = $dhcpv6ifconf['dnsserver'];
         } elseif (!isset($dhcpv6ifconf['rasamednsasdhcp6']) && !empty($dhcpv6ifconf['radnsserver'][0])) {
-            array_merge($dnslist_tmp, $dhcpv6ifconf['radnsserver']);
+            $dnslist_tmp = $dhcpv6ifconf['radnsserver'];
         } elseif (isset($config['dnsmasq']['enable']) || isset($config['unbound']['enable'])) {
             $dnslist_tmp[] = get_interface_ipv6($realif);
         } elseif (!empty($config['system']['dnsserver'][0])) {
-            array_merge($dnslist_tmp, $config['system']['dnsserver']);
+            $dnslist_tmp = $config['system']['dnsserver'];
         }
         $dnslist = array();
         foreach($dnslist_tmp as $server) {