summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTodd C. Miller <millert@cvs.openbsd.org>2003-01-17 17:56:54 +0000
committerTodd C. Miller <millert@cvs.openbsd.org>2003-01-17 17:56:54 +0000
commit5fe510f33ee13d181c331d20a57b11bd81b2e474 (patch)
treecaad8f87f92ffab7a3beabb8dfd68593eab17ecd
parent555a11a92bdf70de2eb5f79169dbd13ba4f519ca (diff)
Don't report setugid directories in "ncheck -s" output since those
bits have no meaning on OpenBSD. deraadt@ OK
-rw-r--r--sbin/ncheck_ffs/ncheck_ffs.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/sbin/ncheck_ffs/ncheck_ffs.c b/sbin/ncheck_ffs/ncheck_ffs.c
index b10f9bb4689..5b89f460bf6 100644
--- a/sbin/ncheck_ffs/ncheck_ffs.c
+++ b/sbin/ncheck_ffs/ncheck_ffs.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ncheck_ffs.c,v 1.14 2002/08/12 00:42:56 aaron Exp $ */
+/* $OpenBSD: ncheck_ffs.c,v 1.15 2003/01/17 17:56:53 millert Exp $ */
/*-
* Copyright (c) 1995, 1996 SigmaSoft, Th. Lockert <tholo@sigmasoft.com>
@@ -31,7 +31,7 @@
*/
#ifndef lint
-static char rcsid[] = "$OpenBSD: ncheck_ffs.c,v 1.14 2002/08/12 00:42:56 aaron Exp $";
+static char rcsid[] = "$OpenBSD: ncheck_ffs.c,v 1.15 2003/01/17 17:56:53 millert Exp $";
#endif /* not lint */
#include <sys/param.h>
@@ -167,9 +167,9 @@ findinodes(ino_t maxino)
if (mode == IFDIR)
cacheino(ino, dp);
if (iflag ||
- (sflag &&
- (((dp->di_mode & (ISGID | ISUID)) == 0) &&
- ((mode == IFREG) || (mode == IFDIR) || (mode == IFLNK)))))
+ (sflag && (mode == IFDIR ||
+ ((dp->di_mode & (ISGID | ISUID)) == 0 &&
+ (mode == IFREG || mode == IFLNK)))))
continue;
addinode(ino);
}