Module Name: src
Committed By: christos
Date: Fri May 1 14:26:10 UTC 2009
Modified Files:
src/usr.bin/who: utmpentry.c
Log Message:
PR/41313: Chris Spiegel: getutentries() in src/usr.bin/who/utmpentry.c thinks
there are no entries if only one of utmp/utmpx support is selected
mangled && -> ||
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/usr.bin/who/utmpentry.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/who/utmpentry.c
diff -u src/usr.bin/who/utmpentry.c:1.16 src/usr.bin/who/utmpentry.c:1.17
--- src/usr.bin/who/utmpentry.c:1.16 Tue Oct 28 10:01:46 2008
+++ src/usr.bin/who/utmpentry.c Fri May 1 10:26:10 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: utmpentry.c,v 1.16 2008/10/28 14:01:46 christos Exp $ */
+/* $NetBSD: utmpentry.c,v 1.17 2009/05/01 14:26:10 christos Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: utmpentry.c,v 1.16 2008/10/28 14:01:46 christos Exp $");
+__RCSID("$NetBSD: utmpentry.c,v 1.17 2009/05/01 14:26:10 christos Exp $");
#endif
#include <sys/stat.h>
@@ -242,7 +242,7 @@
}
#endif
numutmp = 0;
-#if defined(SUPPORT_UTMP) && defined(SUPPORT_UTMPX)
+#if defined(SUPPORT_UTMP) || defined(SUPPORT_UTMPX)
if (ehead != NULL) {
struct utmpentry *from = ehead, *save;
