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

Fix to match cron job exactly when possible

Browse Source 
https://sourceforge.net/p/webadmin/bugs/5462
This commit is contained in:
Ilia Rostovtsev
2021-03-06 16:34:19 +03:00
parent e7deccae71
commit 8a8abf2ee5
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
cron/cron-lib.pl
View File

@@ -1394,10 +1394,19 @@ $cmd =~ s/^\s*\[.*\]\s+\|\|\s+//;
while($cmd =~ s/(\d*)(<|>)((\/\S+)|&\d+)\s*$//) { }
$cmd =~ s/^\((.*)\)\s*$/$1/;
$cmd =~ s/\s+$//;
my $eos;
if ($config{'match_mode'} == 1) {
$cmd =~ s/\s.*$//;
$eos = '$';
}
($proc) = grep { $_->{'args'} =~ /\Q$cmd\E/ &&
else {
my $cmd_ = $cmd;
$cmd_ =~ s/\s.*$//;
if ($cmd_ eq $cmd) {
$eos = '$';
}
}
($proc) = grep { $_->{'args'} =~ /\Q$cmd\E$eos/ &&
(!$config{'match_user'} || $_->{'user'} eq $_[0]->{'user'}) }
@procs;
if (!$proc && $cmd =~ /^$config_directory\/(.*\.pl)(.*)$/) {