From owner-svn-src-user@FreeBSD.ORG  Wed Jan  6 19:57:39 2010
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 0F9761065676;
	Wed,  6 Jan 2010 19:57:39 +0000 (UTC) (envelope-from ed@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id F39F28FC1B;
	Wed,  6 Jan 2010 19:57:38 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o06Jvc0J023815;
	Wed, 6 Jan 2010 19:57:38 GMT (envelope-from ed@svn.freebsd.org)
Received: (from ed@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o06JvcVL023814;
	Wed, 6 Jan 2010 19:57:38 GMT (envelope-from ed@svn.freebsd.org)
Message-Id: <201001061957.o06JvcVL023814@svn.freebsd.org>
From: Ed Schouten <ed@FreeBSD.org>
Date: Wed, 6 Jan 2010 19:57:38 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r201661 - user/ed/utmpx/usr.sbin/ac
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 06 Jan 2010 19:57:39 -0000

Author: ed
Date: Wed Jan  6 19:57:38 2010
New Revision: 201661
URL: http://svn.freebsd.org/changeset/base/201661

Log:
  Make ac(8) work with utmpx.
  
  For DEAD_PROCESS entries we should always just compare ut_id's.
  DEAD_PROCESS entries don't have a user name nor a TTY device.

Modified:
  user/ed/utmpx/usr.sbin/ac/ac.c

Modified: user/ed/utmpx/usr.sbin/ac/ac.c
==============================================================================
--- user/ed/utmpx/usr.sbin/ac/ac.c	Wed Jan  6 19:29:18 2010	(r201660)
+++ user/ed/utmpx/usr.sbin/ac/ac.c	Wed Jan  6 19:57:38 2010	(r201661)
@@ -378,7 +378,8 @@ log_out(struct utmp_list *head, struct u
 
 	for (lp = head, lp2 = NULL; lp != NULL; )
 		if (up->ut_type == BOOT_TIME || up->ut_type == SHUTDOWN_TIME ||
-		    strcmp(lp->usr.ut_line, up->ut_line) == 0) {
+		    (up->ut_type == DEAD_PROCESS &&
+		    strcmp(lp->usr.ut_id, up->ut_id) == 0)) {
 			secs = up->ut_tv.tv_sec - lp->usr.ut_tv.tv_sec;
 			Users = update_user(Users, lp->usr.ut_user, secs);
 #ifdef DEBUG
@@ -553,6 +554,7 @@ ac(const char *file)
 			for (lp = head; lp != NULL; lp = lp->next)
 				lp->usr.ut_tv.tv_sec -= secs;
 			break;
+		case BOOT_TIME:
 		case SHUTDOWN_TIME:
 			head = log_out(head, usr);
 			FirstTime = ut_timecopy; /* shouldn't be needed */