Page MenuHomeFreeBSD
Files F142023178

D54606.id169497.diff
No OneTemporary
Actions

D54606.id169497.diff
View Options

diff --git a/usr.sbin/periodic/etc/daily/460.status-mail-rejects b/usr.sbin/periodic/etc/daily/460.status-mail-rejects
--- a/usr.sbin/periodic/etc/daily/460.status-mail-rejects
+++ b/usr.sbin/periodic/etc/daily/460.status-mail-rejects
@@ -36,8 +36,15 @@
echo
echo Checking for rejected mail hosts:
- yesterday=$(date -v-1d '+%b %e')
- today=$(date '+%b %e')
+ # Support both RFC 3164 (traditional) and RFC 5424 syslog timestamps.
+ today_3164="$(date '+%b %e ')"
+ today_5424="$(date -I)"
+ prefix_today="(^${today_3164}|^<[0-9]{1,3}>1 ${today_5424}T)"
+
+ yesterday_3164="$(date -v-1d '+%b %e ')"
+ yesterday_5424="$(date -v-1d -I)"
+ prefix_yesterday="(^${yesterday_3164}|^<[0-9]{1,3}>1 ${yesterday_5424}T)"
+
n=$(($daily_status_mail_rejects_logs - 2))
rc=$({
while [ $n -ge 0 ]
@@ -61,7 +68,7 @@
n=$(($n - 1))
done
cat /var/log/maillog
- } | sed -Ene "/^$today/q" -e "/^$yesterday/{"'
+ } | sed -En -e "/$prefix_today/q" -e "/$prefix_yesterday/{"'
s/.*ruleset=check_relay,.* relay=([^,]+), reject=([^ ]*).*/\2 check_relay \1/p
t end
s/.*ruleset=check_rcpt,.* arg1=<?([^>,]+).* reject=([^ ]+) .* ([^ ]+)/\2 check_rcpt \1 \3/p
diff --git a/usr.sbin/periodic/etc/security/800.loginfail b/usr.sbin/periodic/etc/security/800.loginfail
--- a/usr.sbin/periodic/etc/security/800.loginfail
+++ b/usr.sbin/periodic/etc/security/800.loginfail
@@ -39,7 +39,14 @@
LOG="${security_status_logdir}"
-yesterday=`date -v-1d "+%b %e "`
+# Support both RFC 3164 (traditional) and RFC 5424 syslog timestamps
+yesterday_3164="$(date -v-1d '+%b %e ')"
+prefix_3164="^${yesterday_3164}"
+
+yesterday_5424="$(date -v-1d -I)"
+prefix_5424="^<[0-9]{1,3}>1 ${yesterday_5424}T"
+
+prefix="(${prefix_3164}|${prefix_5424})"
catmsgs() {
find ${LOG} -name 'auth.log.*' -mtime -2 |
@@ -57,7 +64,7 @@
then
echo ""
echo "${host} login failures:"
- n=$(catmsgs | egrep -ia "^$yesterday.*: .*\b(fail(ures?|ed)?|invalid|bad|illegal|auth.*error)\b" |
+ n=$(catmsgs | egrep -ia "${prefix}.*: .*\b(fail(ures?|ed)?|invalid|bad|illegal|auth.*error)\b" |
tee /dev/stderr | wc -l)
[ $n -gt 0 ] && rc=1 || rc=0
fi
diff --git a/usr.sbin/periodic/etc/security/900.tcpwrap b/usr.sbin/periodic/etc/security/900.tcpwrap
--- a/usr.sbin/periodic/etc/security/900.tcpwrap
+++ b/usr.sbin/periodic/etc/security/900.tcpwrap
@@ -39,7 +39,14 @@
LOG="${security_status_logdir}"
-yesterday=`date -v-1d "+%b %e "`
+# Support both RFC 3164 (traditional) and RFC 5424 syslog timestamps
+yesterday_3164="$(date -v-1d '+%b %e ')"
+prefix_3164="^${yesterday_3164}"
+
+yesterday_5424="$(date -v-1d -I)"
+prefix_5424="^<[0-9]{1,3}>1 ${yesterday_5424}T"
+
+prefix="(${prefix_3164}|${prefix_5424})"
catmsgs() {
find ${LOG} -name 'messages.*' -mtime -2 |
@@ -57,7 +64,7 @@
then
echo ""
echo "${host} refused connections:"
- n=$(catmsgs | grep -i "^$yesterday.*refused connect" |
+ n=$(catmsgs | egrep -ia "${prefix}.*refused connect" |
tee /dev/stderr | wc -l)
[ $n -gt 0 ] && rc=1 || rc=0
fi

File Metadata

Mime Type
text/plain
Expires
Fri, Jan 16, 1:58 AM (16 h, 2 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
27644883
Default Alt Text
D54606.id169497.diff (3 KB)

Event Timeline