diff options
| author | marius <marius@FreeBSD.org> | 2017-08-24 20:51:16 +0000 |
|---|---|---|
| committer | marius <marius@FreeBSD.org> | 2017-08-24 20:51:16 +0000 |
| commit | 492f62d3c612bfb8f255d571cf30279fdaf27320 (patch) | |
| tree | 2d439ef285bc168eb4f1ec106a2e4ce088d48ebc /etc | |
| parent | 67df6e720861a98ec200c8c72b8b80463bfe2617 (diff) | |
| download | FreeBSD-src-492f62d3c612bfb8f255d571cf30279fdaf27320.zip FreeBSD-src-492f62d3c612bfb8f255d571cf30279fdaf27320.tar.gz | |
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.
Diffstat (limited to 'etc')
| -rwxr-xr-x | etc/periodic/daily/200.backup-passwd | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/etc/periodic/daily/200.backup-passwd b/etc/periodic/daily/200.backup-passwd index 5c585af..aef20c5 100755 --- a/etc/periodic/daily/200.backup-passwd +++ b/etc/periodic/daily/200.backup-passwd @@ -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 |
