From fc546e1e6539cabdb85e2737886d8568ea95d12b Mon Sep 17 00:00:00 2001
From: Jamie Cameron <jcameron@webmin.com>
Date: Fri, 19 Jun 2026 15:42:13 -0700
Subject: [PATCH] Fix key field in new slave zones

https://github.com/webmin/webmin/issues/2767
---
 bind8/create_slave.cgi | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/bind8/create_slave.cgi b/bind8/create_slave.cgi
index a63d6225b..8f7937131 100755
--- a/bind8/create_slave.cgi
+++ b/bind8/create_slave.cgi
@@ -100,16 +100,21 @@ if ($file) {
 	}
 
 # Create the structure
-my @mdirs = map { { 'name' => $_ } } @masters;
+my @mdirs;
+foreach my $m (@masters) {
+	my $mdir = { 'name' => $m,
+		     'values' => [ ] };
+	if ($masterkey) {
+		push(@{$mdir->{'values'}}, 'key', $masterkey);
+		}
+	push(@mdirs, $mdir);
+	}
 my $masters = { 'name' => 'masters',
-	     'type' => 1,
-	     'members' => \@mdirs };
+	        'type' => 1,
+	        'members' => \@mdirs };
 if (defined($masterport)) {
 	$masters->{'values'} = [ 'port', $masterport ];
 	}
-if ($masterkey) {
-	$masters->{'values'} = [ 'key', $masterkey ];
-	}
 my $dir = { 'name' => 'zone',
 	 'values' => [ $in{'zone'} ],
 	 'type' => 1,