ubuntu 7 run-parts format

diff --git a/cron/CHANGELOG b/cron/CHANGELOG
index 2a40769..15065b6 100644 (file)
--- a/cron/CHANGELOG
+++ b/cron/CHANGELOG
@@ -24,3 +24,4 @@ Added a Module Config option to limit Cron jobs to hourly at most, thanks to Fil
 ---- Changes since 1.390 ----
 If there are more than 100 jobs (by default), a search form is shown on the main page instead of a list of all jobs.
 Re-wrote all user interface code to use the new Webmin UI library.
+Handle the daily / monthly / weekly Cron specification used on Ubuntu 7.

diff --git a/cron/config-debian-linux-2.1-* b/cron/config-debian-linux-2.1-*
index 90e8f7c..3093c75 100644 (file)
--- a/cron/config-debian-linux-2.1-*
+++ b/cron/config-debian-linux-2.1-*
@@ -14,7 +14,6 @@ system_crontab=/etc/crontab
 cronfiles_dir=/etc/cron.d
 run_parts=run-parts
 max_len=80
-run_parts=run-parts
 show_run=0
 show_time=0
 match_mode=0

diff --git a/cron/cron-lib.pl b/cron/cron-lib.pl
index d5f5de6..01a7e32 100644 (file)
--- a/cron/cron-lib.pl
+++ b/cron/cron-lib.pl
@@ -594,7 +594,7 @@ return @rv;
 sub is_run_parts
 {
 local $rp = $config{'run_parts'};
-return $rp && $_[0] =~ /$rp(.*)\s+(\S+)$/ ? $2 : undef;
+return $rp && $_[0] =~ /$rp(.*)\s+([a-z0-9\.\-\/_]+)(\s*\))?$/i ? $2 : undef;
 }
 
 # can_edit_user(&access, user)