michael/webmin
1
0
Fork 0
mirror of https://github.com/webmin/webmin.git synced 2026-03-20 08:40:24 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:webmin/webmin into master

Browse Source
This commit is contained in:
Ilia Rostovtsev
2020-11-30 12:58:41 +03:00
parent 62c0569525 1f9e4795ca
commit 84b8d2179c
3 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mailboxes/boxes-lib.pl
View File

@@ -2907,7 +2907,7 @@ local $mail = { 'headers' =>
[ [ 'From', $from ],
[ 'To', $to ],
[ 'Cc', $cc ],
[ 'Subject', $subject ] ],
[ 'Subject', &encode_mimewords($subject) ] ],
'attach' => [ $attach ] };
return &send_mail($mail, undef, 1, 0, $smtp);
}

3
sshd/edit_users.cgi
View File

@@ -76,7 +76,8 @@ print &ui_table_row($text{'users_root'},
&ui_select("root", lc($root), \@opts));
# SSH 1 RSA authentication
if ($version{'type'} ne 'ssh' || $version{'number'} < 3) {
if (($version{'type'} eq 'ssh' && $version{'number'} < 3) ||
($version{'type'} eq 'openssh' && $version{'number'} < 7.3)) {
$rsa = &find_value("RSAAuthentication", $conf);
print &ui_table_row($text{'users_rsa'},
&ui_yesno_radio('rsa', lc($rsa) ne 'no'));

3
sshd/save_users.cgi
View File

@@ -47,7 +47,8 @@ if ($version{'type'} ne 'ssh' || $version{'number'} < 3) {
&save_directive("PermitRootLogin", $conf, $in{'root'});
if ($version{'type'} ne 'ssh' || $version{'number'} < 3) {
if (($version{'type'} eq 'ssh' && $version{'number'} < 3) ||
($version{'type'} eq 'openssh' && $version{'number'} < 7.3)) {
&save_directive("RSAAuthentication", $conf, $in{'rsa'} ? 'yes' : 'no');
}
if ($version{'type'} eq 'openssh' && $version{'number'} >= 3) {