From 8d48a51e2b2fd64a4dd76a98a86fe2977104114e Mon Sep 17 00:00:00 2001
From: Jamie Cameron <jcameron@webmin.com>
Date: Sat, 19 Nov 2011 10:02:48 -0800
Subject: [PATCH] https://www.virtualmin.com/node/19600 Hide SSL protocol
 version field, as it causes problems

---
 usermin/change_ssl.cgi | 14 ++++++++------
 usermin/edit_ssl.cgi   |  8 +++++---
 webmin/change_ssl.cgi  | 14 ++++++++------
 webmin/edit_ssl.cgi    |  8 +++++---
 4 files changed, 26 insertions(+), 18 deletions(-)

diff --git a/usermin/change_ssl.cgi b/usermin/change_ssl.cgi
index e91fba6f5..5a6808a03 100755
--- a/usermin/change_ssl.cgi
+++ b/usermin/change_ssl.cgi
@@ -13,12 +13,14 @@ $miniserv{'ssl'} = $in{'ssl'};
 $miniserv{'keyfile'} = $in{'key'};
 $miniserv{'certfile'} = $in{'cert_def'} ? undef : $in{'cert'};
 $miniserv{'ssl_redirect'} = $in{'ssl_redirect'};
-if ($in{'version_def'}) {
-	delete($miniserv{'ssl_version'});
-	}
-else {
-	$in{'version'} =~ /^\d+$/ || &error($text{'ssl_eversion'});
-	$miniserv{'ssl_version'} = $in{'version'};
+if (defined($in{'version_def'})) {
+	if ($in{'version_def'}) {
+		delete($miniserv{'ssl_version'});
+		}
+	else {
+		$in{'version'} =~ /^\d+$/ || &error($text{'ssl_eversion'});
+		$miniserv{'ssl_version'} = $in{'version'};
+		}
 	}
 if ($in{'cipher_list_def'} == 1) {
 	delete($miniserv{'ssl_cipher_list'});
diff --git a/usermin/edit_ssl.cgi b/usermin/edit_ssl.cgi
index 5e7364509..6f6000f25 100755
--- a/usermin/edit_ssl.cgi
+++ b/usermin/edit_ssl.cgi
@@ -35,9 +35,11 @@ print &ui_table_row($text{'ssl_cert'},
 print &ui_table_row($text{'ssl_redirect'},
 	&ui_yesno_radio("ssl_redirect", $miniserv{'ssl_redirect'}));
 
-print &ui_table_row($text{'ssl_version'},
-	&ui_opt_textbox("version", $miniserv{'ssl_version'}, 4,
-			$text{'ssl_auto'}));
+if ($miniserv{'ssl_version'}) {
+	print &ui_table_row($text{'ssl_version'},
+		&ui_opt_textbox("version", $miniserv{'ssl_version'}, 4,
+				$text{'ssl_auto'}));
+	}
 
 $clist = $miniserv{'ssl_cipher_list'};
 $cmode = !$clist ? 1 :
diff --git a/webmin/change_ssl.cgi b/webmin/change_ssl.cgi
index 4ec065440..0c8253d28 100755
--- a/webmin/change_ssl.cgi
+++ b/webmin/change_ssl.cgi
@@ -13,12 +13,14 @@ $miniserv{'ssl'} = $in{'ssl'};
 $miniserv{'keyfile'} = $in{'key'};
 $miniserv{'certfile'} = $in{'cert_def'} ? undef : $in{'cert'};
 $miniserv{'ssl_redirect'} = $in{'ssl_redirect'};
-if ($in{'version_def'}) {
-	delete($miniserv{'ssl_version'});
-	}
-else {
-	$in{'version'} =~ /^\d+$/ || &error($text{'ssl_eversion'});
-	$miniserv{'ssl_version'} = $in{'version'};
+if (defined($in{'version_def'})) {
+	if ($in{'version_def'}) {
+		delete($miniserv{'ssl_version'});
+		}
+	else {
+		$in{'version'} =~ /^\d+$/ || &error($text{'ssl_eversion'});
+		$miniserv{'ssl_version'} = $in{'version'};
+		}
 	}
 if ($in{'cipher_list_def'} == 1) {
 	delete($miniserv{'ssl_cipher_list'});
diff --git a/webmin/edit_ssl.cgi b/webmin/edit_ssl.cgi
index 52dbab568..940a3bbde 100755
--- a/webmin/edit_ssl.cgi
+++ b/webmin/edit_ssl.cgi
@@ -50,9 +50,11 @@ print &ui_table_row($text{'ssl_cert'},
 print &ui_table_row($text{'ssl_redirect'},
 	&ui_yesno_radio("ssl_redirect", $miniserv{'ssl_redirect'}));
 
-print &ui_table_row($text{'ssl_version'},
-	&ui_opt_textbox("version", $miniserv{'ssl_version'}, 4,
-			$text{'ssl_auto'}));
+if ($miniserv{'ssl_version'}) {
+	print &ui_table_row($text{'ssl_version'},
+		&ui_opt_textbox("version", $miniserv{'ssl_version'}, 4,
+				$text{'ssl_auto'}));
+	}
 
 $clist = $miniserv{'ssl_cipher_list'};
 $cmode = !$clist ? 1 :