From 31d3aa2782bf18f922bcbf25e0e3e49c3b7afbde Mon Sep 17 00:00:00 2001
From: Jamie Cameron <jcameron@webmin.com>
Date: Tue, 1 Sep 2015 22:58:58 -0700
Subject: [PATCH] Option for SSL cert enforcement

---
 servers/CHANGELOG     | 2 ++
 servers/edit_serv.cgi | 4 +++-
 servers/lang/en       | 1 +
 servers/save_serv.cgi | 1 +
 4 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/servers/CHANGELOG b/servers/CHANGELOG
index f1604031a..b27b8cd4f 100644
--- a/servers/CHANGELOG
+++ b/servers/CHANGELOG
@@ -17,3 +17,5 @@ Added several new operating systems and distributions to the server type list.
 Allow the Backup Configuration Files module to save and restore Webmin server details.
 ---- Changes since 1.440 ----
 Converted commands in the module's API file to POD format, and added more details about each function.
+---- Changes since 1.760 ----
+Added an option to have Webmin validate the SSL certificate on remote systems when making RPC calls, to ensure that the connection to them has not been MITM'd.
diff --git a/servers/edit_serv.cgi b/servers/edit_serv.cgi
index b992bc9ac..6b876c7f5 100755
--- a/servers/edit_serv.cgi
+++ b/servers/edit_serv.cgi
@@ -58,7 +58,9 @@ else {
 	}
 
 print &ui_table_row($text{'edit_ssl'},
-		    &ui_yesno_radio("ssl", int($s->{'ssl'})));
+		    &ui_yesno_radio("ssl", int($s->{'ssl'}))."<br>\n".
+		    &ui_checkbox("checkssl", 1, $text{'edit_checkssl'},
+				 $s->{'checkssl'}));
 
 print &ui_table_row($text{'edit_desc'},
     $config{'show_ip'} ?
diff --git a/servers/lang/en b/servers/lang/en
index f5c9d2977..28c61345e 100644
--- a/servers/lang/en
+++ b/servers/lang/en
@@ -32,6 +32,7 @@ edit_port=Port
 edit_portnone=None set
 edit_type=Server type
 edit_ssl=SSL server?
+edit_checkssl=Check remote SSL certificate?
 edit_link=Link type
 edit_mode0=Normal link to server
 edit_mode1=Login via Webmin with
diff --git a/servers/save_serv.cgi b/servers/save_serv.cgi
index b5b3d42f5..920c1558d 100755
--- a/servers/save_serv.cgi
+++ b/servers/save_serv.cgi
@@ -93,6 +93,7 @@ else {
 	$serv->{'port'} = $in{'port_def'} ? undef : $in{'port'};
 	$serv->{'type'} = $in{'type'};
 	$serv->{'ssl'} = $in{'ssl'};
+	$serv->{'checkssl'} = $in{'checkssl'};
 	$serv->{'desc'} = $in{'desc_def'} ? undef : $in{'desc'};
 	$serv->{'group'} = join("\t", @groups);
 	$serv->{'fast'} = $in{'fast'};