diff options
| author | Luiz Otavio O Souza <luiz@netgate.com> | 2016-05-23 13:39:56 -0500 |
|---|---|---|
| committer | Luiz Otavio O Souza <luiz@netgate.com> | 2016-05-23 13:39:56 -0500 |
| commit | f448388bb29525075f374464ec8c4c04e9bf03f6 (patch) | |
| tree | b51e7d59eebc90d5c3d9578d1a98bb2e58265dfd /etc | |
| parent | 57a447a9c3cb69fb2e4f874104327cdc3203313a (diff) | |
| parent | 62dc16af9990c7ed2d0ad80da282ec71427e8556 (diff) | |
| download | FreeBSD-src-f448388bb29525075f374464ec8c4c04e9bf03f6.zip FreeBSD-src-f448388bb29525075f374464ec8c4c04e9bf03f6.tar.gz | |
Merge remote-tracking branch 'origin/master' into devel-11
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/defaults/periodic.conf | 4 | ||||
| -rw-r--r-- | etc/mtree/BSD.usr.dist | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/etc/defaults/periodic.conf b/etc/defaults/periodic.conf index 2364d7f..eeadae5 100644 --- a/etc/defaults/periodic.conf +++ b/etc/defaults/periodic.conf @@ -222,6 +222,10 @@ monthly_local="/etc/monthly.local" # Local scripts # Security options +security_show_success="YES" # scripts returning 0 +security_show_info="YES" # scripts returning 1 +security_show_badconfig="NO" # scripts returning 2 + # These options are used by the security periodic(8) scripts spawned in # daily and weekly 450.status-security. security_status_logdir="/var/log" # Directory for logs diff --git a/etc/mtree/BSD.usr.dist b/etc/mtree/BSD.usr.dist index c74a70c..2a9282c 100644 --- a/etc/mtree/BSD.usr.dist +++ b/etc/mtree/BSD.usr.dist @@ -309,8 +309,6 @@ .. .. dtrace - toolkit - .. .. examples BSD_daemon |
