From owner-svn-src-user@FreeBSD.ORG  Wed Jan  6 21:36:34 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 3D6F41065670;
	Wed,  6 Jan 2010 21:36:34 +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 2DC838FC0A;
	Wed,  6 Jan 2010 21:36:34 +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 o06LaYuY046763;
	Wed, 6 Jan 2010 21:36:34 GMT (envelope-from ed@svn.freebsd.org)
Received: (from ed@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o06LaYwq046760;
	Wed, 6 Jan 2010 21:36:34 GMT (envelope-from ed@svn.freebsd.org)
Message-Id: <201001062136.o06LaYwq046760@svn.freebsd.org>
From: Ed Schouten <ed@FreeBSD.org>
Date: Wed, 6 Jan 2010 21:36:34 +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: r201678 - user/ed/utmpx/sbin/init
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 21:36:34 -0000

Author: ed
Date: Wed Jan  6 21:36:33 2010
New Revision: 201678
URL: http://svn.freebsd.org/changeset/base/201678

Log:
  Calling ulog_logout() here makes no sense at all.
  
  Now that we have ut_id, we should walk through all sessions using
  getutxline() and terminate all of them by hand.

Modified:
  user/ed/utmpx/sbin/init/Makefile
  user/ed/utmpx/sbin/init/init.c

Modified: user/ed/utmpx/sbin/init/Makefile
==============================================================================
--- user/ed/utmpx/sbin/init/Makefile	Wed Jan  6 21:27:06 2010	(r201677)
+++ user/ed/utmpx/sbin/init/Makefile	Wed Jan  6 21:36:33 2010	(r201678)
@@ -6,8 +6,8 @@ MAN=	init.8
 PRECIOUSPROG=
 INSTALLFLAGS=-b -B.bak
 CFLAGS+=-DDEBUGSHELL -DSECURE -DLOGIN_CAP -DCOMPAT_SYSV_INIT
-DPADD=	${LIBUTIL} ${LIBULOG} ${LIBCRYPT}
-LDADD=	-lutil -lulog -lcrypt
+DPADD=	${LIBUTIL} ${LIBCRYPT}
+LDADD=	-lutil -lcrypt
 
 NO_SHARED?=	YES
 

Modified: user/ed/utmpx/sbin/init/init.c
==============================================================================
--- user/ed/utmpx/sbin/init/init.c	Wed Jan  6 21:27:06 2010	(r201677)
+++ user/ed/utmpx/sbin/init/init.c	Wed Jan  6 21:36:33 2010	(r201678)
@@ -569,10 +569,13 @@ transition(state_t s)
  * NB: should send a message to the session logger to avoid blocking.
  */
 static void
-clear_session_logs(session_t *sp)
+clear_session_logs(session_t *sp __unused)
 {
 
-	ulog_logout(sp->se_device);
+	/*
+	 * XXX: Use getutxline() and call pututxline() for each entry.
+	 * Is this safe to do this here?  Is it really required anyway?
+	 */
 }
 
 /*