Attachment 189431 Details for Bug 224924 – /etc/periodic/daily/460.status-mail-rejects

[patch] /etc/periodic/daily/460.status-mail-rejects

status-mail-rejects.patch (text/plain), 1.71 KB, created by takefu on 2018-01-05 07:38:11 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: takefu

Created: 2018-01-05 07:38:11 UTC

Size: 1.71 KB

patch

obsolete

>--- /etc/periodic/daily/460.status-mail-rejects.orig	2017-08-15 08:04:52.184289000 +0000
>+++ /etc/periodic/daily/460.status-mail-rejects	2018-01-05 07:20:02.728535000 +0000
>@@ -11,6 +11,10 @@ then
>     source_periodic_confs
> fi
> 
>+security_daily_compat_var security_status_logdir
>+
>+LOG="${security_status_logdir}"
>+
> case "$daily_status_mail_rejects_shorten" in
> [Yy][Ee][Ss])	shorten='cut -d" " -f2,3';;
> *)		shorten=cat;;
>@@ -23,10 +27,10 @@ case "$daily_status_mail_rejects_enable"
> 	    echo '$daily_status_mail_rejects_enable is set but /etc/mail' \
> 		"doesn't exist"
> 	    rc=2
>-	elif [ ! -f /var/log/maillog ]
>+	elif [ ! -f ${LOG}/maillog ]
> 	then
> 	    echo '$daily_status_mail_rejects_enable is set but ' \
>-		"/var/log/maillog doesn't exist"
>+		${LOG}"/maillog doesn't exist"
> 	    rc=2
> 	elif [ "$daily_status_mail_rejects_logs" -le 0 ]
> 	then
>@@ -43,19 +47,22 @@ case "$daily_status_mail_rejects_enable"
> 	    rc=$({
> 		while [ $n -ge 0 ]
> 		do
>-		    if [ -f /var/log/maillog.$n ]
>+		    if [ -f ${LOG}/maillog.$n ]
> 		    then
>-			cat /var/log/maillog.$n
>-		    elif [ -f /var/log/maillog.$n.gz ]
>+			cat ${LOG}/maillog.$n
>+		    elif [ -f ${LOG}/maillog.$n.gz ]
> 		    then
>-			zcat -fc /var/log/maillog.$n.gz
>-		    elif [ -f /var/log/maillog.$n.bz2 ]
>+			zcat -fc ${LOG}/maillog.$n.gz
>+		    elif [ -f ${LOG}/maillog.$n.bz2 ]
> 		    then
>-			bzcat -fc /var/log/maillog.$n.bz2
>+			bzcat -fc ${LOG}/maillog.$n.bz2
>+		    elif [ -f ${LOG}/maillog.$n.xz ]
>+		    then
>+			xzcat -fc ${LOG}/maillog.$n.xz
> 		    fi
> 		    n=$(($n - 1))
> 		done
>-		cat /var/log/maillog
>+		cat ${LOG}/maillog
> 	    } | sed -Ene "/^$today/q" -e "/^$yesterday/{"'
> 		    s/.*ruleset=check_relay,.* relay=([^,]+), reject=([^ ]*).*/\2 check_relay \1/p
> 		    t end

Actions: View | Diff

Attachments on bug 224924: 189429 | 189430 | 189431 | 189432