svn commit: r201678 - user/ed/utmpx/sbin/init

[Ed Schouten]

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?
+	 */
 }
 
 /*