Page MenuHomeFreeBSD

D10267.diff
No OneTemporary

D10267.diff

Index: head/etc/periodic/daily/450.status-security
===================================================================
--- head/etc/periodic/daily/450.status-security
+++ head/etc/periodic/daily/450.status-security
@@ -22,19 +22,25 @@
esac
export security_output="${daily_status_security_output}"
+ rc=0
case "${daily_status_security_output}" in
"")
- rc=3;;
+ if tempfile=`mktemp ${TMPDIR:-/tmp}/450.status-security.XXXXXX`
+ then
+ periodic security > $tempfile || rc=3
+ if [ -s "$tempfile" ]; then
+ cat "$tempfile"
+ rc=3
+ fi
+ rm -f "$tempfile"
+ fi;;
/*)
echo " (output logged separately)"
- rc=0;;
+ periodic security || rc=3;;
*)
echo " (output mailed separately)"
- rc=0;;
- esac
-
- periodic security || rc=3;;
-
+ periodic security || rc=3;;
+ esac;;
*) rc=0;;
esac
Index: head/etc/periodic/monthly/450.status-security
===================================================================
--- head/etc/periodic/monthly/450.status-security
+++ head/etc/periodic/monthly/450.status-security
@@ -22,19 +22,25 @@
esac
export security_output="${monthly_status_security_output}"
+ rc=0
case "${monthly_status_security_output}" in
"")
- rc=3;;
+ if tempfile=`mktemp ${TMPDIR:-/tmp}/450.status-security.XXXXXX`
+ then
+ periodic security > $tempfile || rc=3
+ if [ -s "$tempfile" ]; then
+ cat "$tempfile"
+ rc=3
+ fi
+ rm -f "$tempfile"
+ fi;;
/*)
echo " (output logged separately)"
- rc=0;;
+ periodic security || rc=3;;
*)
echo " (output mailed separately)"
- rc=0;;
- esac
-
- periodic security || rc=3;;
-
+ periodic security || rc=3;;
+ esac;;
*) rc=0;;
esac
Index: head/etc/periodic/weekly/450.status-security
===================================================================
--- head/etc/periodic/weekly/450.status-security
+++ head/etc/periodic/weekly/450.status-security
@@ -22,19 +22,25 @@
esac
export security_output="${weekly_status_security_output}"
+ rc=0
case "${weekly_status_security_output}" in
"")
- rc=3;;
+ if tempfile=`mktemp ${TMPDIR:-/tmp}/450.status-security.XXXXXX`
+ then
+ periodic security > $tempfile || rc=3
+ if [ -s "$tempfile" ]; then
+ cat "$tempfile"
+ rc=3
+ fi
+ rm -f "$tempfile"
+ fi;;
/*)
echo " (output logged separately)"
- rc=0;;
+ periodic security || rc=3;;
*)
echo " (output mailed separately)"
- rc=0;;
- esac
-
- periodic security || rc=3;;
-
+ periodic security || rc=3;;
+ esac;;
*) rc=0;;
esac

File Metadata

Mime Type
text/plain
Expires
Sat, Sep 12, 5:42 AM (12 h, 49 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
38771051
Default Alt Text
D10267.diff (2 KB)

Event Timeline