PR/46757: Edgar Fuß: Change default to pkg_vulnerabilities from NO to unset,

and make unset insted of NO to produce warnings, so that setting it to NO does
produce warnings (if it is inappropriate for the machine to warn about this).
This commit is contained in:
christos 2012-07-30 17:09:33 +00:00
parent e763a079db
commit da43ca12af
2 changed files with 7 additions and 6 deletions

View File

@ -1,6 +1,6 @@
#!/bin/sh -
#
# $NetBSD: daily,v 1.82 2012/07/30 17:06:51 christos Exp $
# $NetBSD: daily,v 1.83 2012/07/30 17:09:33 christos Exp $
# @(#)daily 8.2 (Berkeley) 1/25/94
#
@ -263,9 +263,10 @@ if pkg_info ${_compat_K_flag} -q -E '*'; then
if checkyesno fetch_pkg_vulnerabilities; then
( umask 022 && pkg_admin ${_compat_K_flag} \
fetch-pkg-vulnerabilities -u )
else
echo "fetch_pkg_vulnerabilities is set to NO in daily.conf(5)."
echo "You should set it to YES to enable vulnerability checks."
elif [ -z "$fetch_pkg_vulnerabilities" ]; then
echo "fetch_pkg_vulnerabilities is not set in daily.conf(5)."
echo "You should set it to YES to enable vulnerability checks"
echo "or set it to NO to get rid of this warning."
fi
fi

View File

@ -1,4 +1,4 @@
# $NetBSD: daily.conf,v 1.17 2012/07/30 17:06:51 christos Exp $
# $NetBSD: daily.conf,v 1.18 2012/07/30 17:09:34 christos Exp $
#
# /etc/defaults/daily.conf --
# default configuration of /etc/daily.conf
@ -31,6 +31,6 @@ run_rdist=YES
run_security=YES
separate_security_email=YES
run_skeyaudit=YES
fetch_pkg_vulnerabilities=NO
fetch_pkg_vulnerabilities="" # set to NO to disable and not be warned about
send_empty_security=NO