From 1f6697e05f7525a8d480436d23b6131c02409dee Mon Sep 17 00:00:00 2001
From: Jamie Cameron <jcameron@webmin.com>
Date: Fri, 6 Sep 2024 19:00:42 -0700
Subject: [PATCH] NSEC3PARAM salt can be -
 https://github.com/virtualmin/virtualmin-gpl/issues/895

---
 bind8/bind8-lib.pl    | 3 ++-
 bind8/edit_recs.cgi   | 4 ++++
 bind8/lang/en         | 1 +
 bind8/save_record.cgi | 6 +++---
 4 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/bind8/bind8-lib.pl b/bind8/bind8-lib.pl
index 496b46c88..a1a1c8fbf 100755
--- a/bind8/bind8-lib.pl
+++ b/bind8/bind8-lib.pl
@@ -1357,7 +1357,8 @@ elsif ($type eq "NSEC3PARAM") {
 		&ui_textbox("value2", $v[2], 4));
 
 	print &ui_table_row($text{'value_NSEC3PARAM4'},
-		&ui_textbox("value3", $v[3], 20));
+		&ui_opt_textbox("value3", $v[3] eq "-" ? "" : $v[3], 20,
+				$text{'value_NSEC3PARAM4_none'}));
 
 	}
 elsif ($type eq "CAA") {
diff --git a/bind8/edit_recs.cgi b/bind8/edit_recs.cgi
index 925780fe1..f0fd5f825 100755
--- a/bind8/edit_recs.cgi
+++ b/bind8/edit_recs.cgi
@@ -251,6 +251,10 @@ for(my $i=0; $i<@_; $i++) {
 					$v = $text{'value_caa_'.$v} || $v;
 					}
 				}
+			elsif ($in{'type'} eq "NSEC3PARAM" && $j == 3) {
+				$v = $text{'value_NSEC3PARAM4_none'}
+					if ($v eq "-");
+				}
 			}
 		if (length($v) > 80) {
 			$v = substr($v, 0, 80)." ...";
diff --git a/bind8/lang/en b/bind8/lang/en
index ee7315edb..676c7ca6c 100644
--- a/bind8/lang/en
+++ b/bind8/lang/en
@@ -496,6 +496,7 @@ value_NSEC3PARAM1=Hash algorithm
 value_NSEC3PARAM2=NSEC3 flags
 value_NSEC3PARAM3=Number of hash iterations
 value_NSEC3PARAM4=Salt string
+value_NSEC3PARAM4_none=None
 value_delegated=Delegated zone
 value_notdelegated=Other zone
 value_other=Values (one per line)
diff --git a/bind8/save_record.cgi b/bind8/save_record.cgi
index 202bb7efa..a4b924cbb 100755
--- a/bind8/save_record.cgi
+++ b/bind8/save_record.cgi
@@ -450,11 +450,11 @@ else {
 		# Save DNSSEC parameters
 		$in{'value2'} =~ /^\d+$/ ||
 			&error($text{'edit_ensec3value2'});
-		$in{'value3'} =~ /^[a-zA-Z0-9\+\/]+$/ ||
+		$in{'value3_def'} || $in{'value3'} =~ /^[a-zA-Z0-9\+\/]+$/ ||
 			&error($text{'edit_ensec3value3'});
 		$vals = join(" ", "(", $in{'value0'}, $in{'value1'},
-                                       $in{'value2'},
-				       $in{'value3'}, ")");
+			     $in{'value2'},
+			     ($in{'value3_def'} ? '-' : $in{'value3'}), ")");
 		}
 	elsif ($in{'type'} eq 'CAA') {
 		$in{'value2'} =~ /^\S+$/ ||