From 37abb2707b7fc6ce2d6b2cbcf32c746e336ee008 Mon Sep 17 00:00:00 2001
From: Jamie Cameron <jcameron@webmin.com>
Date: Mon, 10 Apr 2023 21:23:25 -0700
Subject: [PATCH] No need for separate SSL option when using a list of URIs
 https://github.com/webmin/webmin/issues/1883

---
 ldap-client/edit_server.cgi | 16 +++++++++-------
 ldap-client/save_server.cgi |  4 +++-
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/ldap-client/edit_server.cgi b/ldap-client/edit_server.cgi
index ae16ac795..2f4c14352 100755
--- a/ldap-client/edit_server.cgi
+++ b/ldap-client/edit_server.cgi
@@ -78,13 +78,15 @@ print &ui_table_row($text{'server_rootbindpw'},
 # SSL options
 print &ui_table_hr();
 
-$ssl = &find_svalue("ssl", $conf);
-$ssl = "" if ($ssl eq "no");
-print &ui_table_row($text{'server_ssl'},
-	&ui_radio("ssl", &find_svalue("ssl", $conf),
-		  [ [ "yes", $text{'yes'} ],
-		    [ "start_tls", $text{'server_tls'} ],
-		    [ "", $text{'no'} ] ]));
+if (!$uri) {
+	$ssl = &find_svalue("ssl", $conf);
+	$ssl = "" if ($ssl eq "no");
+	print &ui_table_row($text{'server_ssl'},
+		&ui_radio("ssl", &find_svalue("ssl", $conf),
+			  [ [ "yes", $text{'yes'} ],
+			    [ "start_tls", $text{'server_tls'} ],
+			    [ "", $text{'no'} ] ]));
+	}
 
 print &ui_table_row($text{'server_peer'},
 	&ui_radio("peer", &find_svalue("tls_checkpeer", $conf),
diff --git a/ldap-client/save_server.cgi b/ldap-client/save_server.cgi
index 07b6bd2a1..ac69b79ec 100755
--- a/ldap-client/save_server.cgi
+++ b/ldap-client/save_server.cgi
@@ -112,7 +112,9 @@ else {
 	}
 
 # SSL mode
-&save_directive($conf, "ssl", $in{'ssl'} || undef);
+if (defined($in{'ssl'})) {
+	&save_directive($conf, "ssl", $in{'ssl'} || undef);
+	}
 
 # Check server SSL cert
 &save_directive($conf, "tls_checkpeer", $in{'peer'} || undef);