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

Move dictionary func into a common library

Browse Source
This commit is contained in:
Jamie Cameron
2013-02-09 18:03:36 -08:00
parent a196b523d7
commit ebadc8100a
2 changed files with 34 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
useradmin/md5-lib.pl
View File

@@ -249,5 +249,39 @@ return 1 if ($ohash eq $hash);
return 0;
}
=head2 is_dictionary_word(word)
Returns 1 if some file can be found in a dictionary words file
=cut
sub is_dictionary_word
{
my ($word) = @_;
$word = lc($word);
my @files;
if ($config{'dict_file'}) {
@files = split(/\s+/, $config{'dict_file'});
}
else {
@files = ( "/usr/share/dict/words",
"/usr/dict/words" );
}
foreach my $f (@files) {
my $found = 0;
&open_readfile(WORDS, $f);
while(<WORDS>) {
s/#.*//;
s/\s//;
if (lc($_) eq $word) {
$found = 1;
last;
}
}
close(WORDS);
return 1 if ($found);
}
return 0;
}
1;

34
useradmin/user-lib.pl
View File

@@ -1593,40 +1593,6 @@ if ($config{'passwd_mindays'} && $uinfo ne "none") {
return undef;
}
=head2 is_dictionary_word(word)
Returns 1 if some file can be found in a dictionary words file
=cut
sub is_dictionary_word
{
my ($word) = @_;
$word = lc($word);
my @files;
if ($config{'dict_file'}) {
@files = split(/\s+/, $config{'dict_file'});
}
else {
@files = ( "/usr/share/dict/words",
"/usr/dict/words" );
}
foreach my $f (@files) {
my $found = 0;
&open_readfile(WORDS, $f);
while(<WORDS>) {
s/#.*//;
s/\s//;
if (lc($_) eq $word) {
$found = 1;
last;
}
}
close(WORDS);
return 1 if ($found);
}
return 0;
}
=head2 check_username_restrictions(username)
Returns an error message if a username fails some restriction, or undef if