svn commit: r357756 - head/usr.sbin/periodic/etc/daily

Kyle Evans kevans at FreeBSD.org
Tue Feb 11 06:12:02 UTC 2020


Author: kevans
Date: Tue Feb 11 06:12:02 2020
New Revision: 357756
URL: https://svnweb.freebsd.org/changeset/base/357756

Log:
  backup-passwd: mask out all passwords in the diff
  
  The previous expression borked if a username had a plus or hyphen in it.
  This is needlessly restrictive- at leSt a hyphen in the middle is valid.
  Instead of playing this game, let's just assume the username can't contain a
  colon and mask out the second field.
  
  Submitted by:	sigsys gmail com
  MFC after:	3 days
  Differential Revision:	https://reviews.freebsd.org/D23548

Modified:
  head/usr.sbin/periodic/etc/daily/200.backup-passwd

Modified: head/usr.sbin/periodic/etc/daily/200.backup-passwd
==============================================================================
--- head/usr.sbin/periodic/etc/daily/200.backup-passwd	Tue Feb 11 05:15:35 2020	(r357755)
+++ head/usr.sbin/periodic/etc/daily/200.backup-passwd	Tue Feb 11 06:12:02 2020	(r357756)
@@ -42,7 +42,7 @@ case "$daily_backup_passwd_enable" in
 		[ $rc -lt 1 ] && rc=1
 		echo "$host passwd diffs:"
 		diff -uI '^#' $bak/master.passwd.bak /etc/master.passwd |\
-			sed 's/^\([-+ ][^-+:]*\):[^:]*:/\1:(password):/'
+			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


More information about the svn-src-head mailing list