[src/trunk]: src/etc Add option to include daily insecurity output in daily o...

[darcy <darcy%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/36f76bea7433
branches:  trunk
changeset: 772074:36f76bea7433
user:      darcy <darcy%NetBSD.org@localhost>
date:      Sat Dec 17 12:27:42 2011 +0000

description:
Add option to include daily insecurity output in daily output.
PR bin/17029

diffstat:

 etc/daily               |  11 ++++++++---
 etc/defaults/daily.conf |   3 ++-
 2 files changed, 10 insertions(+), 4 deletions(-)

diffs (44 lines):

diff -r 51933609cc88 -r 36f76bea7433 etc/daily
--- a/etc/daily Sat Dec 17 04:43:45 2011 +0000
+++ b/etc/daily Sat Dec 17 12:27:42 2011 +0000
@@ -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 @@
                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
 
diff -r 51933609cc88 -r 36f76bea7433 etc/defaults/daily.conf
--- a/etc/defaults/daily.conf   Sat Dec 17 04:43:45 2011 +0000
+++ b/etc/defaults/daily.conf   Sat Dec 17 12:27:42 2011 +0000
@@ -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_flags=""
 run_rdist=YES
 run_security=YES
+separate_security_email=YES
 run_skeyaudit=YES
 fetch_pkg_vulnerabilities=NO