[Logcheck-commits] Hannes von Haugwitz: ignore.d.paranoid/cron: make /usr/sbin/ optional in pathnames of cron (closes: #566198)

[Gerfried Fuchs]

Module: logcheck
Branch: lenny-backports
Commit: b150e30e5481a08a772a73af80c56d5b02fff3dd
URL:    http://git.debian.org/?p=logcheck/logcheck.git;a=commit;h=b150e30e5481a08a772a73af80c56d5b02fff3dd

Author: Hannes von Haugwitz <hannes at vonhaugwitz.com>
Date:   Tue Jan 26 21:42:15 2010 +0100

ignore.d.paranoid/cron: make /usr/sbin/ optional in pathnames of cron (closes: #566198)

---

 debian/changelog                       |    3 +++
 rulefiles/linux/ignore.d.paranoid/cron |   12 ++++++------
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index bcd27f9..590232c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,9 @@
 logcheck (1.3.6) UNRELEASED; urgency=low
 
   [ Hannes von Haugwitz ]
+  * ignore.d.paranoid/cron:
+    - make /usr/sbin/ optional in pathnames of cron,
+      thanks to Matthias Andree (closes: #566198)
   * ignore.d.server/dhclient:
     - adjusted rules to match optional ip address,
       thanks to David Pashley (closes: #552222)
diff --git a/rulefiles/linux/ignore.d.paranoid/cron b/rulefiles/linux/ignore.d.paranoid/cron
index bcfbf71..9a8d3d0 100644
--- a/rulefiles/linux/ignore.d.paranoid/cron
+++ b/rulefiles/linux/ignore.d.paranoid/cron
@@ -1,8 +1,8 @@
-^\w{3} [ :0-9]{11} [._[:alnum:]-]+ /USR/SBIN/CRON\[[0-9]+\]: \([_[:alnum:]-]+\) CMD \(.*\)$
-^\w{3} [ :0-9]{11} [._[:alnum:]-]+ /usr/sbin/cron\[[0-9]+\]: \(CRON\) STARTUP \(fork ok\)$
-^\w{3} [ :0-9]{11} [._[:alnum:]-]+ /usr/sbin/cron\[[0-9]+\]: \([^[:space:]]+\) RELOAD \([^[:space:]]+\)$
-^\w{3} [ :0-9]{11} [._[:alnum:]-]+ /usr/sbin/cron\[[0-9]+\]: \(CRON\) INFO \(pidfile fd = [0-9]+\)$
-^\w{3} [ :0-9]{11} [._[:alnum:]-]+ /usr/sbin/cron\[[0-9]+\]: \(CRON\) INFO \(Running @reboot jobs\)$
-^\w{3} [ :0-9]{11} [._[:alnum:]-]+ /usr/sbin/cron\[[0-9]+\]: \(CRON\) INFO \(Skipping @reboot jobs -- not system startup\)$
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ (/USR/SBIN/)?CRON\[[0-9]+\]: \([_[:alnum:]-]+\) CMD \(.*\)$
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ (/usr/sbin/)?cron\[[0-9]+\]: \(CRON\) STARTUP \(fork ok\)$
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ (/usr/sbin/)?cron\[[0-9]+\]: \([^[:space:]]+\) RELOAD \([^[:space:]]+\)$
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ (/usr/sbin/)?cron\[[0-9]+\]: \(CRON\) INFO \(pidfile fd = [0-9]+\)$
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ (/usr/sbin/)?cron\[[0-9]+\]: \(CRON\) INFO \(Running @reboot jobs\)$
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ (/usr/sbin/)?cron\[[0-9]+\]: \(CRON\) INFO \(Skipping @reboot jobs -- not system startup\)$
 ^\w{3} [ :0-9]{11} [._[:alnum:]-]+ CRON\[[0-9]+\]: \(pam_[[:alnum:]]+\) session (opened|closed) for user [[:alnum:]-]+( by \(uid=[0-9]+\))?$
 ^\w{3} [ :0-9]{11} [._[:alnum:]-]+ CRON\[[0-9]+\]: pam_[[:alnum:]]+\(cron:session\): session (opened|closed) for user [[:alnum:]-]+( by \(uid=[0-9]+\))?$