From owner-svn-src-user@FreeBSD.ORG  Wed Jan  6 23:36:15 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 3DA1E10656AD;
	Wed,  6 Jan 2010 23:36:15 +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 2E56C8FC18;
	Wed,  6 Jan 2010 23:36:15 +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 o06NaFND074569;
	Wed, 6 Jan 2010 23:36:15 GMT (envelope-from ed@svn.freebsd.org)
Received: (from ed@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o06NaFYb074567;
	Wed, 6 Jan 2010 23:36:15 GMT (envelope-from ed@svn.freebsd.org)
Message-Id: <201001062336.o06NaFYb074567@svn.freebsd.org>
From: Ed Schouten <ed@FreeBSD.org>
Date: Wed, 6 Jan 2010 23:36:15 +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: r201695 - user/ed/utmpx/lib/libc/gen
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 23:36:15 -0000

Author: ed
Date: Wed Jan  6 23:36:14 2010
New Revision: 201695
URL: http://svn.freebsd.org/changeset/base/201695

Log:
  Truncate utx.active when (re)booting.
  
  This makes sure utmp entries never survive a reboot.

Modified:
  user/ed/utmpx/lib/libc/gen/pututxline.c

Modified: user/ed/utmpx/lib/libc/gen/pututxline.c
==============================================================================
--- user/ed/utmpx/lib/libc/gen/pututxline.c	Wed Jan  6 23:34:53 2010	(r201694)
+++ user/ed/utmpx/lib/libc/gen/pututxline.c	Wed Jan  6 23:36:14 2010	(r201695)
@@ -181,6 +181,13 @@ utx_active_remove(struct futx *fu)
 }
 
 static void
+utx_active_purge(void)
+{
+
+	truncate(_PATH_UTX_ACTIVE, 0);
+}
+
+static void
 utx_lastlogin_add(const struct futx *fu)
 {
 	int fd;
@@ -253,9 +260,11 @@ pututxline(const struct utmpx *utmpx)
 	
 	switch (fu.fu_type) {
 	case BOOT_TIME:
+	case SHUTDOWN_TIME:
+		utx_active_purge();
+		break;
 	case OLD_TIME:
 	case NEW_TIME:
-	case SHUTDOWN_TIME:
 		break;
 	case USER_PROCESS:
 		utx_active_add(&fu);