From 93ce19df3af3276c14a0de816d0ae22293107d14 Mon Sep 17 00:00:00 2001
From: Ed Schouten <ed@FreeBSD.org>
Date: Fri, 2 Apr 2010 11:05:59 +0000
Subject: [PATCH] Change how getent utmpx works.

- Always require active, log or lastlogin to be provided.
- Allow the user to provide custom filenames.
---
 usr.bin/getent/getent.c | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/usr.bin/getent/getent.c b/usr.bin/getent/getent.c
index e958665d8fdf..0459cca0066d 100644
--- a/usr.bin/getent/getent.c
+++ b/usr.bin/getent/getent.c
@@ -615,14 +615,13 @@ static int
 utmpx(int argc, char *argv[])
 {
 	const struct utmpx *ut;
-	int rv = RV_OK, db;
+	const char *file = NULL;
+	int rv = RV_OK, db = 0;
 
 	assert(argc > 1);
 	assert(argv != NULL);
 
-	if (argc == 2) {
-		db = UTXDB_ACTIVE;
-	} else if (argc == 3) {
+	if (argc == 3 || argc == 4) {
 		if (strcmp(argv[2], "active") == 0)
 			db = UTXDB_ACTIVE;
 		else if (strcmp(argv[2], "lastlogin") == 0)
@@ -631,15 +630,18 @@ utmpx(int argc, char *argv[])
 			db = UTXDB_LOG;
 		else
 			rv = RV_USAGE;
+		if (argc == 4)
+			file = argv[3];
 	} else {
 		rv = RV_USAGE;
 	}
 
 	if (rv == RV_USAGE) {
-		fprintf(stderr, "Usage: %s utmpx [active | lastlogin | log]\n",
+		fprintf(stderr,
+		    "Usage: %s utmpx active | lastlogin | log [filename]\n",
 		    getprogname());
 	} else if (rv == RV_OK) {
-		if (setutxdb(db, NULL) != 0)
+		if (setutxdb(db, file) != 0)
 			return (RV_NOTFOUND);
 		while ((ut = getutxent()) != NULL)
 			utmpxprint(ut);