From owner-svn-src-user@FreeBSD.ORG  Mon Jan 11 19:10:30 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 49FC11065692;
	Mon, 11 Jan 2010 19:10:30 +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 397B58FC37;
	Mon, 11 Jan 2010 19:10:30 +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 o0BJAUmE049955;
	Mon, 11 Jan 2010 19:10:30 GMT (envelope-from ed@svn.freebsd.org)
Received: (from ed@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o0BJAUtZ049953;
	Mon, 11 Jan 2010 19:10:30 GMT (envelope-from ed@svn.freebsd.org)
Message-Id: <201001111910.o0BJAUtZ049953@svn.freebsd.org>
From: Ed Schouten <ed@FreeBSD.org>
Date: Mon, 11 Jan 2010 19:10:30 +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: r202104 - 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: Mon, 11 Jan 2010 19:10:30 -0000

Author: ed
Date: Mon Jan 11 19:10:29 2010
New Revision: 202104
URL: http://svn.freebsd.org/changeset/base/202104

Log:
  Enable the code to shut down sessions at the end properly.

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	Mon Jan 11 19:04:24 2010	(r202103)
+++ user/ed/utmpx/usr.sbin/ac/ac.c	Mon Jan 11 19:10:29 2010	(r202104)
@@ -477,7 +477,7 @@ int
 ac(const char *file)
 {
 	struct utmp_list *lp, *head = NULL;
-	struct utmpx *usr;
+	struct utmpx *usr, usht;
 	struct tm *ltm;
 	time_t prev_secs, secs, ut_timecopy;
 	int day, rfound, tchanged, tskipped;
@@ -581,32 +581,28 @@ ac(const char *file)
 		}
 	}
 	endutxent();
-#if 0
-	if (usr != NULL) {
-		if (!(Flags & AC_W))
-			usr->ut_tv.tv_sec = time(NULL);
-		usr->ut_type = SHUTDOWN_TIME;
-
-		if (Flags & AC_D) {
-			ut_timecopy = usr->ut_tv.tv_sec;
-			ltm = localtime(&ut_timecopy);
-			if (day >= 0 && day != ltm->tm_yday) {
-				/*
-				 * print yesterday's total
-				 */
-				secs = ut_timecopy;
-				secs -= ltm->tm_sec;
-				secs -= 60 * ltm->tm_min;
-				secs -= 3600 * ltm->tm_hour;
-				show_today(Users, head, secs);
-			}
+	if (!(Flags & AC_W))
+		usht.ut_tv.tv_sec = time(NULL);
+	usht.ut_type = SHUTDOWN_TIME;
+
+	if (Flags & AC_D) {
+		ut_timecopy = usht.ut_tv.tv_sec;
+		ltm = localtime(&ut_timecopy);
+		if (day >= 0 && day != ltm->tm_yday) {
+			/*
+			 * print yesterday's total
+			 */
+			secs = ut_timecopy;
+			secs -= ltm->tm_sec;
+			secs -= 60 * ltm->tm_min;
+			secs -= 3600 * ltm->tm_hour;
+			show_today(Users, head, secs);
 		}
-		/*
-		 * anyone still logged in gets time up to now
-		 */
-		head = log_out(head, usr);
 	}
-#endif
+	/*
+	 * anyone still logged in gets time up to now
+	 */
+	head = log_out(head, &usht);
 
 	if (Flags & AC_D)
 		show_today(Users, head, time((time_t *)0));