From e287db604db7f3924c3e29797cd3beec9293070e Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Thu, 23 Jun 2016 11:40:53 +0200
Subject: [PATCH] services: flush domain key only once but keep zone key
 assignment #1023

---
 src/etc/inc/services.inc | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/etc/inc/services.inc b/src/etc/inc/services.inc
index 4007188fe..bd9bb53fb 100644
--- a/src/etc/inc/services.inc
+++ b/src/etc/inc/services.inc
@@ -1029,14 +1029,15 @@ function services_dhcpd_zones($ddns_zones)
                     if (is_ipaddrv4($secondary)) {
                         $dhcpdconf2 .= "  secondary {$secondary};\n";
                     }
-                    if (!empty($zone['ddnsdomainkeyname']) && !empty($zone['ddnsdomainkey']) &&
-                        !in_array($zone['ddnsdomainkeyname'], $added_keys)) {
+                    if (!empty($zone['ddnsdomainkeyname']) && !empty($zone['ddnsdomainkey'])) {
+                        if (!in_array($zone['ddnsdomainkeyname'], $added_keys)) {
+                            $dhcpdconf .= "key {$zone['ddnsdomainkeyname']} {\n";
+                            $dhcpdconf .= "  algorithm hmac-md5;\n";
+                            $dhcpdconf .= "  secret {$zone['ddnsdomainkey']};\n";
+                            $dhcpdconf .= "}\n";
+                            $added_keys[] = $zone['ddnsdomainkeyname'];
+                        }
                         $dhcpdconf2 .= "  key {$zone['ddnsdomainkeyname']};\n";
-                        $dhcpdconf .= "key {$zone['ddnsdomainkeyname']} {\n";
-                        $dhcpdconf .= "  algorithm hmac-md5;\n";
-                        $dhcpdconf .= "  secret {$zone['ddnsdomainkey']};\n";
-                        $dhcpdconf .= "}\n";
-                        $added_keys[] = $zone['ddnsdomainkeyname'];
                     }
                     $dhcpdconf2 .= "}\n";
                     $dhcpdconf .= $dhcpdconf2;