From 6b3457e9fd2df727b0c590e6038e500d87929e7d Mon Sep 17 00:00:00 2001
From: Ilia Ross <ilia@ross.gdn>
Date: Fri, 17 Jan 2025 14:26:36 +0200
Subject: [PATCH] Fix to drop removed SSH options from 'Miscellaneous Options'
 page

---
 sshd/edit_misc.cgi | 6 ++++--
 sshd/save_misc.cgi | 6 ++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/sshd/edit_misc.cgi b/sshd/edit_misc.cgi
index 80a6f6f19..810161cb5 100755
--- a/sshd/edit_misc.cgi
+++ b/sshd/edit_misc.cgi
@@ -58,7 +58,8 @@ if ($version{'type'} eq 'openssh') {
 				$loglevel ? 1 : 0) ] ]));
 	}
 
-if ($version{'type'} ne 'ssh' || $version{'number'} < 2) {
+if (($version{'type'} ne 'ssh' && $version{'number'} < 7.6) ||
+    ($version{'type'} eq 'ssh' && $version{'number'} < 2)) {
 	# Bits in key
 	$bits = &find_value("ServerKeyBits", $conf);
 	print &ui_table_row($text{'misc_bits'},
@@ -73,7 +74,8 @@ if ($version{'type'} eq 'ssh') {
 		&ui_yesno_radio("quiet", lc($quiet) ne 'no'));
 	}
 
-if ($version{'type'} ne 'ssh' || $version{'number'} < 2) {
+if (($version{'type'} ne 'ssh' && $version{'number'} < 7.6) ||
+    ($version{'type'} eq 'ssh' && $version{'number'} < 2)) {
 	# Interval between key re-generation
 	$regen = &find_value("KeyRegenerationInterval", $conf);
 	print &ui_table_row($text{'misc_regen'},
diff --git a/sshd/save_misc.cgi b/sshd/save_misc.cgi
index a6daa4ba3..18396c98b 100755
--- a/sshd/save_misc.cgi
+++ b/sshd/save_misc.cgi
@@ -49,7 +49,8 @@ if ($version{'type'} eq 'openssh') {
 			$in{'loglevel_def'} ? undef : $in{'loglevel'});
 	}
 
-if ($version{'type'} ne 'ssh' || $version{'number'} < 2) {
+if (($version{'type'} ne 'ssh' && $version{'number'} < 7.6) ||
+    ($version{'type'} eq 'ssh' && $version{'number'} < 2)) {
 	if ($in{'bits_def'}) {
 		&save_directive("ServerKeyBits", $conf);
 		}
@@ -63,7 +64,8 @@ if ($version{'type'} eq 'ssh') {
 	&save_directive("QuietMode", $conf, $in{'quite'} ? 'yes' : 'no');
 	}
 
-if ($version{'type'} ne 'ssh' || $version{'number'} < 2) {
+if (($version{'type'} ne 'ssh' && $version{'number'} < 7.6) ||
+    ($version{'type'} eq 'ssh' && $version{'number'} < 2)) {
 	if ($in{'regen_def'}) {
 		&save_directive("KeyRegenerationInterval", $conf);
 		}