Date: Fri, 14 Feb 2020 02:27:01 +0000 (UTC) From: Kyle Evans <kevans@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r357900 - in stable: 11/etc/periodic/daily 12/usr.sbin/periodic/etc/daily Message-ID: <202002140227.01E2R1Df010860@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: kevans Date: Fri Feb 14 02:27:01 2020 New Revision: 357900 URL: https://svnweb.freebsd.org/changeset/base/357900 Log: MFC r357756: 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. Modified: stable/12/usr.sbin/periodic/etc/daily/200.backup-passwd Directory Properties: stable/12/ (props changed) Changes in other areas also in this revision: Modified: stable/11/etc/periodic/daily/200.backup-passwd Directory Properties: stable/11/ (props changed) Modified: stable/12/usr.sbin/periodic/etc/daily/200.backup-passwd ============================================================================== --- stable/12/usr.sbin/periodic/etc/daily/200.backup-passwd Fri Feb 14 02:22:08 2020 (r357899) +++ stable/12/usr.sbin/periodic/etc/daily/200.backup-passwd Fri Feb 14 02:27:01 2020 (r357900) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202002140227.01E2R1Df010860>