Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 4 May 2002 12:58:55 -0700
From:      "Crist J. Clark" <cjc@FreeBSD.ORG>
To:        Brian Somers <brian@freebsd-services.com>
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>
In-Reply-To: <200205031216.g43CGcDH003119@hak.lan.Awfulhak.org>; from brian@freebsd-services.com on Fri, May 03, 2002 at 01:16:37PM %2B0100
References:  <johan@FreeBSD.org> <200205031216.g43CGcDH003119@hak.lan.Awfulhak.org>

next in thread | previous in thread | raw e-mail | index | archive | help
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




Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20020504125854.C74245>