michael/webmin
1
0
Fork 0
mirror of https://github.com/webmin/webmin.git synced 2026-02-03 14:13:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix to properly handle macOS mode #1877

Browse Source
This commit is contained in:
iliajie
2023-04-04 18:31:55 +03:00
parent eaaa470818
commit 36f2e5d077
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
htpasswd-file/htpasswd-file-lib.pl
View File

@@ -161,7 +161,7 @@ else {
# Use built-in encryption code and use system default
my $salt = $old;
&foreign_require('useradmin');
return &useradmin::encrypt_password($str, $salt, 1);
return &useradmin::encrypt_password($str, $salt, 0, 1);
}
}
}

6
useradmin/user-lib.pl
View File

@@ -1767,7 +1767,7 @@ foreach $e (keys %ENV) {
}
}
=head2 encrypt_password(password, [salt], [ignore-config-force-system-default])
=head2 encrypt_password(password, [salt], [ignore-config-force-system-default], [no-sha1])
Encrypts a password using the encryption format configured for this system.
If the salt parameter is given, it will be used for hashing the password -
@@ -1778,7 +1778,7 @@ will be randomly generated.
=cut
sub encrypt_password
{
local ($pass, $salt, $force_system_default) = @_;
local ($pass, $salt, $force_system_default, $nosha1) = @_;
local $format = 0;
my $format_error = sub {
my ($type, $format, $err) = @_;
@@ -1786,7 +1786,7 @@ my $format_error = sub {
"@{[&get_webprefix()]}/config.cgi?module=$module_name&section=line2",
"@{[&get_webprefix()]}/cpan/download.cgi?source=3&cpan=$err", $err, $format));
};
if ($gconfig{'os_type'} eq 'macos' && &passfiles_type() == 7) {
if (!$nosha1 && $gconfig{'os_type'} eq 'macos' && &passfiles_type() == 7) {
# New OSX directory service uses SHA1 for passwords!
$salt ||= chr(int(rand(26))+65).chr(int(rand(26))+65).
chr(int(rand(26))+65).chr(int(rand(26))+65);