git: 3aa71ea7c231 - main - periodic: Make security diff(1) output as small is possible
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sun, 31 Dec 2023 10:17:05 UTC
The branch main has been updated by michaelo:
URL: https://cgit.FreeBSD.org/src/commit/?id=3aa71ea7c231a4e60a7e1b9b677e379e17432fc8
commit 3aa71ea7c231a4e60a7e1b9b677e379e17432fc8
Author: Michael Osipov <michaelo@FreeBSD.org>
AuthorDate: 2023-11-24 09:26:41 +0000
Commit: Michael Osipov <michaelo@FreeBSD.org>
CommitDate: 2023-12-31 10:16:30 +0000
periodic: Make security diff(1) output as small is possible
Make, by default, security diff(1) produce a unified output with a context of
zero (0) lines. This reduces output of unrelated lines in e-mails delivered
to root.
PR: 270266
Approved by: jrm (mentor), karels
MFC after: 1 month
Relnotes: yes
Differential Revision: https://reviews.freebsd.org/D43071
---
share/man/man5/periodic.conf.5 | 5 +++--
usr.sbin/periodic/periodic.conf | 2 +-
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/share/man/man5/periodic.conf.5 b/share/man/man5/periodic.conf.5
index 3ad39070839f..f434069bc96e 100644
--- a/share/man/man5/periodic.conf.5
+++ b/share/man/man5/periodic.conf.5
@@ -23,7 +23,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.Dd March 9, 2022
+.Dd December 31, 2023
.Dt PERIODIC.CONF 5
.Os
.Sh NAME
@@ -807,7 +807,8 @@ Set to the arguments to pass to the
.Xr diff 1
utility when generating differences.
The default is
-.Fl b u .
+.Fl b
+.Fl U Cm 0 .
.It Va security_status_chksetuid_enable
.Pq Vt bool
Set to
diff --git a/usr.sbin/periodic/periodic.conf b/usr.sbin/periodic/periodic.conf
index 8a69a7e703aa..0c35d33b63aa 100644
--- a/usr.sbin/periodic/periodic.conf
+++ b/usr.sbin/periodic/periodic.conf
@@ -248,7 +248,7 @@ 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
-security_status_diff_flags="-b -u" # flags for diff output
+security_status_diff_flags="-b -U 0" # flags for diff output
# Each of the security_status_*_period options below can have one of the
# following values: