From owner-freebsd-bugs Sat May 4 12:59: 5 2002 Delivered-To: freebsd-bugs@freebsd.org Received: from rwcrmhc53.attbi.com (rwcrmhc53.attbi.com [204.127.198.39]) by hub.freebsd.org (Postfix) with ESMTP id 3E9F937B419; Sat, 4 May 2002 12:59:01 -0700 (PDT) Received: from blossom.cjclark.org ([12.234.91.48]) by rwcrmhc53.attbi.com (InterMail vM.4.01.03.27 201-229-121-127-20010626) with ESMTP id <20020504195900.BAEM5896.rwcrmhc53.attbi.com@blossom.cjclark.org>; Sat, 4 May 2002 19:59:00 +0000 Received: (from cjc@localhost) by blossom.cjclark.org (8.11.6/8.11.6) id g44JwtH81527; Sat, 4 May 2002 12:58:55 -0700 (PDT) (envelope-from cjc) Date: Sat, 4 May 2002 12:58:55 -0700 From: "Crist J. Clark" To: Brian Somers Cc: johan@FreeBSD.ORG, freebsd-bugs@FreeBSD.ORG, brian@FreeBSD.ORG Subject: Re: conf/37618: etc/security calls diff -w, but i dont think it means to Message-ID: <20020504125854.C74245@blossom.cjclark.org> References: <200205031216.g43CGcDH003119@hak.lan.Awfulhak.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.2.5i In-Reply-To: <200205031216.g43CGcDH003119@hak.lan.Awfulhak.org>; from brian@freebsd-services.com on Fri, May 03, 2002 at 01:16:37PM +0100 X-URL: http://people.freebsd.org/~cjc/ Sender: owner-freebsd-bugs@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.org On Fri, May 03, 2002 at 01:16:37PM +0100, Brian Somers wrote: > > Synopsis: etc/security calls diff -w, but i dont think it means to > > > > Responsible-Changed-From-To: freebsd-bugs->brian > > Responsible-Changed-By: johan > > Responsible-Changed-When: Thu May 2 18:08:41 PDT 2002 > > Responsible-Changed-Why: > > Over to Brian who made that commit in rev 1.41 of > > /etc/security. > > > > Brian, what was the reason for this change? > > > > Note that this now is in etc/periodic/security/100.chksetuid > > > > http://www.freebsd.org/cgi/query-pr.cgi?pr=37618 > > I've attached uuencoded versions of the setuid.today and > setuid.yesterday files on my laptop. Running diff -b on them gives > way too much output. diff -w is much better. It seems like this is the right way to make everyone happy. Index: 100.chksetuid =================================================================== RCS file: /export/freebsd/ncvs/src/etc/periodic/security/100.chksetuid,v retrieving revision 1.1 diff -u -r1.1 100.chksetuid --- 100.chksetuid 7 Dec 2001 23:57:38 -0000 1.1 +++ 100.chksetuid 4 May 2002 19:56:13 -0000 @@ -52,7 +52,7 @@ find $mount -xdev -type f \ \( -perm -u+x -or -perm -g+x -or -perm -o+x \) \ \( -perm -u+s -or -perm -g+s \) -print0 - done | xargs -0 -n 20 ls -liTd | sort +10 > ${TMP} + done | xargs -0 -n 20 ls -liTd | sed 's/^ *//' | sort +10 > ${TMP} if [ ! -f ${LOG}/setuid.today ]; then rc=1 @@ -64,7 +64,7 @@ then [ $rc -lt 1 ] && rc=1 echo "${host} setuid diffs:" - diff -w ${LOG}/setuid.today ${TMP} + diff -b ${LOG}/setuid.today ${TMP} mv ${LOG}/setuid.today ${LOG}/setuid.yesterday || rc=3 mv ${TMP} ${LOG}/setuid.today || 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-bugs" in the body of the message