From owner-freebsd-current Sat Nov 10 23:15:46 2001 Delivered-To: freebsd-current@freebsd.org Received: from hawk.prod.itd.earthlink.net (hawk.mail.pas.earthlink.net [207.217.120.22]) by hub.freebsd.org (Postfix) with ESMTP id 21E0537B405 for ; Sat, 10 Nov 2001 23:15:42 -0800 (PST) Received: from dialup-209.245.134.200.dial1.sanjose1.level3.net ([209.245.134.200] helo=blossom.cjclark.org) by hawk.prod.itd.earthlink.net with esmtp (Exim 3.33 #1) id 162oqA-0007XB-00; Sat, 10 Nov 2001 23:15:40 -0800 Received: (from cjc@localhost) by blossom.cjclark.org (8.11.6/8.11.3) id fAB7FCS72992; Sat, 10 Nov 2001 23:15:12 -0800 (PST) (envelope-from cjc) Date: Sat, 10 Nov 2001 23:15:11 -0800 From: "Crist J. Clark" To: Alexander Leidinger Cc: current@FreeBSD.ORG Subject: Re: daily run output & passwd diff Message-ID: <20011110231511.G69195@blossom.cjclark.org> Reply-To: cjclark@alum.mit.edu References: <200111091355.fA9Dtul24149@Magelan.Leidinger.net> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.2.5i In-Reply-To: <200111091355.fA9Dtul24149@Magelan.Leidinger.net>; from Alexander@Leidinger.net on Fri, Nov 09, 2001 at 02:55:55PM +0100 X-URL: http://people.freebsd.org/~cjc/ Sender: owner-freebsd-current@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On Fri, Nov 09, 2001 at 02:55:55PM +0100, Alexander Leidinger wrote: > Hi, > > I think the CVS tag shouldn't be interpreted as an entry which contains > a password. > > ---snip--- > Backup passwd and group files: > > 1c1 > < # $FreeBSD:(password):09:07 peter Exp $ > --- > > # $FreeBSD:(password):27:16 ache Exp $ > 16a17 > > www:(password):80:80::0:0:World Wide Web Owner:/nonexistent:/sbin/nologin > Magelan.Leidinger.net group diffs: > 1c1 > < # $FreeBSD: src/etc/group,v 1.21 2001/10/18 16:53:20 sheldonh Exp $ > --- > > # $FreeBSD: src/etc/group,v 1.22 2001/10/25 03:27:16 ache Exp $ > 20a21 > > www:*:80: > ---snip--- Makes sense. No need to hide the revision number. Committed to -CURRENT. MFC 1 week. Index: 200.backup-passwd =================================================================== RCS file: /home/ncvs/src/etc/periodic/daily/200.backup-passwd,v retrieving revision 1.8 diff -u -r1.8 200.backup-passwd --- 200.backup-passwd 2000/09/14 17:19:10 1.8 +++ 200.backup-passwd 2001/11/11 07:09:49 @@ -42,7 +42,7 @@ [ $rc -lt 1 ] && rc=1 echo "$host passwd diffs:" diff $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 -- Crist J. Clark | cjclark@alum.mit.edu | cjclark@jhu.edu http://people.freebsd.org/~cjc/ | cjc@freebsd.org To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-current" in the body of the message