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 use_md5 on linux

Browse Source
This commit is contained in:
Jamie Cameron
2009-01-15 05:19:04 +00:00
parent bbff1748de
commit 29c7d03fe2
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
useradmin/freebsd-lib.pl
View File

@@ -53,14 +53,14 @@ local $md5 = 0;
while(<CONF>) {
s/\r|\n//g;
s/#.*$//;
$md5++ if (/passwd_format\s*=\s*md5/);
$md5 = 1 if (/passwd_format\s*=\s*md5/);
}
close(CONF);
&open_readfile(CONF, "/etc/auth.conf");
while(<CONF>) {
s/\r|\n//g;
s/#.*$//;
$md5++ if (/crypt_default\s*=\s*md5/);
$md5 = 1 if (/crypt_default\s*=\s*md5/);
}
close(CONF);
return $md5;

8
useradmin/linux-lib.pl
View File

@@ -72,7 +72,9 @@ if (&foreign_check("pam")) {
LOOP:
foreach my $m (@{$svc->{'mods'}}) {
if ($m->{'type'} eq 'password') {
if ($m->{'args'} =~ /md5/) { $md5++; }
if ($m->{'args'} =~ /md5/) {
$md5 = 1;
}
elsif ($m->{'module'} =~ /pam_stack\.so/ &&
$m->{'args'} =~ /service=(\S+)/) {
# Referred to another service!
@@ -100,7 +102,7 @@ elsif (&open_readfile(PAM, "/etc/pam.d/passwd")) {
# Otherwise try to check the PAM file directly
while(<PAM>) {
s/#.*$//g;
$md5++ if (/^password.*md5/);
$md5 = 1 if (/^password.*md5/);
}
close(PAM);
}
@@ -108,7 +110,7 @@ if (&open_readfile(DEFS, "/etc/login.defs")) {
# The login.defs file is used on debian sometimes
while(<DEFS>) {
s/#.*$//g;
$md5++ if (/MD5_CRYPT_ENAB\s+yes/i);
$md5 = 1 if (/MD5_CRYPT_ENAB\s+yes/i);
}
close(DEFS);
}