Module Name: src
Committed By: darcy
Date: Sat Dec 17 12:27:42 UTC 2011
Modified Files:
src/etc: daily
src/etc/defaults: daily.conf
Log Message:
Add option to include daily insecurity output in daily output.
PR bin/17029
To generate a diff of this commit:
cvs rdiff -u -r1.77 -r1.78 src/etc/daily
cvs rdiff -u -r1.14 -r1.15 src/etc/defaults/daily.conf
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/etc/daily
diff -u src/etc/daily:1.77 src/etc/daily:1.78
--- src/etc/daily:1.77 Mon Dec 27 03:38:52 2010
+++ src/etc/daily Sat Dec 17 12:27:42 2011
@@ -1,6 +1,6 @@
#!/bin/sh -
#
-# $NetBSD: daily,v 1.77 2010/12/27 03:38:52 christos Exp $
+# $NetBSD: daily,v 1.78 2011/12/17 12:27:42 darcy Exp $
# @(#)daily 8.2 (Berkeley) 1/25/94
#
@@ -272,8 +272,13 @@ if checkyesno run_security; then
fi
fi
if [ -s "$SECOUT" ]; then
- mail -s "$host daily insecurity output for $date" \
- "$MAILTO" < "$SECOUT"
+ if checkyesno separate_security_email; then
+ mail -s "$host daily insecurity output for $date" $MAILTO < $SECOUT
+ else
+ echo ""
+ echo "$host daily insecurity output for $date:"
+ cat $SECOUT
+ fi
fi
fi
Index: src/etc/defaults/daily.conf
diff -u src/etc/defaults/daily.conf:1.14 src/etc/defaults/daily.conf:1.15
--- src/etc/defaults/daily.conf:1.14 Fri Feb 5 16:29:02 2010
+++ src/etc/defaults/daily.conf Sat Dec 17 12:27:42 2011
@@ -1,4 +1,4 @@
-# $NetBSD: daily.conf,v 1.14 2010/02/05 16:29:02 jmmv Exp $
+# $NetBSD: daily.conf,v 1.15 2011/12/17 12:27:42 darcy Exp $
#
# /etc/defaults/daily.conf --
# default configuration of /etc/daily.conf
@@ -27,6 +27,7 @@ run_fsck=NO
run_fsck_flags=""
run_rdist=YES
run_security=YES
+separate_security_email=YES
run_skeyaudit=YES
fetch_pkg_vulnerabilities=NO
