Author: marius
Date: Thu Aug 24 20:52:28 2017
New Revision: 322859
URL: https://svnweb.freebsd.org/changeset/base/322859
Log:
MFC: r322726
Bring back the much more readable unified format for differences in
/etc/{group,master.passwd}. This was originally turned on for all of
/etc/{aliases,group,master.passwd} in r55196, but then backed out
only for the latter two in r56697, as the adaption of the sed(1)ing
done in r56308 was incorrect. This left us with inconsistent diff(1)
formats in the daily output of periodic(8) ever since, despite in
r56697 having been promised to be revisited. So properly adapt the
password hash filtering to the unified format and turn the later on
again for /etc/{group,master.passwd}, too.
Approved by: re (kib)
Modified:
stable/10/etc/periodic/daily/200.backup-passwd
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/etc/periodic/daily/200.backup-passwd
==============================================================================
--- stable/10/etc/periodic/daily/200.backup-passwd Thu Aug 24 20:52:02
2017 (r322858)
+++ stable/10/etc/periodic/daily/200.backup-passwd Thu Aug 24 20:52:28
2017 (r322859)
@@ -41,8 +41,8 @@ case "$daily_backup_passwd_enable" in
then
[ $rc -lt 1 ] && rc=1
echo "$host passwd diffs:"
- diff -I '^#' $bak/master.passwd.bak /etc/master.passwd |\
- sed 's/^\([<>] [^:]*\):[^:]*:/\1:(password):/'
+ diff -uI '^#' $bak/master.passwd.bak /etc/master.passwd |\
+ sed 's/^\([-+][^-+:]*\):[^:]*:/\1:(password):/'
mv $bak/master.passwd.bak $bak/master.passwd.bak2
cp -p /etc/master.passwd $bak/master.passwd.bak || rc=3
fi
@@ -58,7 +58,7 @@ case "$daily_backup_passwd_enable" in
then
[ $rc -lt 1 ] && rc=1
echo "$host group diffs:"
- diff $bak/group.bak /etc/group
+ diff -u $bak/group.bak /etc/group
mv $bak/group.bak $bak/group.bak2
cp -p /etc/group $bak/group.bak || rc=3
fi
_______________________________________________
svn-src-stable-10@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to "svn-src-stable-10-unsubscr...@freebsd.org"
