michael/webmin
1
0
Fork 0
mirror of https://github.com/webmin/webmin.git synced 2026-09-21 13:00:38 +01:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

No need for separate SSL option when using a list of URIs https://github.com/webmin/webmin/issues/1883

Browse Source
This commit is contained in:
Jamie Cameron
2023-04-10 21:23:25 -07:00
parent 850030ed17
commit 37abb2707b
2 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
ldap-client/edit_server.cgi
View File

@@ -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),

4
ldap-client/save_server.cgi
View File

@@ -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);