From efe7114dafaae2a1daa228a53557ac27df61c5fb Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Fri, 2 Jul 2021 15:59:26 +0200
Subject: [PATCH] dhcpd: do not merge non-explicit suffix addresses #5078

As a rule of thumb only react on ^:: addresses to avoid
merging them with the globally unqiue prefix of the
interface.
---
 src/etc/inc/plugins.inc.d/dhcpd.inc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/etc/inc/plugins.inc.d/dhcpd.inc b/src/etc/inc/plugins.inc.d/dhcpd.inc
index 1c62c14d7..c207ccabc 100644
--- a/src/etc/inc/plugins.inc.d/dhcpd.inc
+++ b/src/etc/inc/plugins.inc.d/dhcpd.inc
@@ -1910,8 +1910,8 @@ function dhcpd_staticmap($domain_fallback = 'not.found', $ifconfig_details = nul
                     continue;
                 }
 
-                if (!empty($ipaddrv6)) {
-                    /* expand IPv6 suffix address */
+                if (!empty($ipaddrv6) && strpos($host['ipaddrv6'], '::') === 0) {
+                    /* expand IPv6 suffix address, but only allow user-given compressed suffix */
                     $host['ipaddrv6'] = make_ipv6_64_address($ipaddrv6, $host['ipaddrv6']);
                 }