svn commit: r202210 - in head/libexec: rpc.rusersd talkd

[Ed Schouten]

Author: ed
Date: Wed Jan 13 18:28:58 2010
New Revision: 202210
URL: http://svn.freebsd.org/changeset/base/202210

Log:
  Port all apps in libexec/ from libulog to utmpx.

Modified:
  head/libexec/rpc.rusersd/Makefile
  head/libexec/rpc.rusersd/rusers_proc.c
  head/libexec/talkd/Makefile
  head/libexec/talkd/process.c

Modified: head/libexec/rpc.rusersd/Makefile
==============================================================================
--- head/libexec/rpc.rusersd/Makefile	Wed Jan 13 18:28:41 2010	(r202209)
+++ head/libexec/rpc.rusersd/Makefile	Wed Jan 13 18:28:58 2010	(r202210)
@@ -4,8 +4,8 @@ PROG =	rpc.rusersd
 SRCS =	rusersd.c rusers_proc.c
 MAN =	rpc.rusersd.8
 
-DPADD=	${LIBRPCSVC} ${LIBULOG} ${LIBUTIL}
-LDADD=	-lrpcsvc -lulog -lutil
+DPADD=	${LIBRPCSVC} ${LIBUTIL}
+LDADD=	-lrpcsvc -lutil
 
 #.if exists(/usr/X11R6/include/X11/extensions/xidle.h)
 #CFLAGS+= -DXIDLE

Modified: head/libexec/rpc.rusersd/rusers_proc.c
==============================================================================
--- head/libexec/rpc.rusersd/rusers_proc.c	Wed Jan 13 18:28:41 2010	(r202209)
+++ head/libexec/rpc.rusersd/rusers_proc.c	Wed Jan 13 18:28:58 2010	(r202210)
@@ -45,8 +45,7 @@ static const char rcsid[] =
 #include <sys/stat.h>
 #include <stdlib.h>
 #include <syslog.h>
-#define	_ULOG_POSIX_NAMES
-#include <ulog.h>
+#include <utmpx.h>
 #ifdef XIDLE
 #include <setjmp.h>
 #include <X11/Xlib.h>

Modified: head/libexec/talkd/Makefile
==============================================================================
--- head/libexec/talkd/Makefile	Wed Jan 13 18:28:41 2010	(r202209)
+++ head/libexec/talkd/Makefile	Wed Jan 13 18:28:58 2010	(r202210)
@@ -7,8 +7,4 @@ SRCS=	talkd.c announce.c process.c table
 MAN=	talkd.8
 CFLAGS+=-I${.CURDIR}/../../usr.bin/wall
 
-
-DPADD=	${LIBULOG}
-LDADD=	-lulog
-
 .include <bsd.prog.mk>

Modified: head/libexec/talkd/process.c
==============================================================================
--- head/libexec/talkd/process.c	Wed Jan 13 18:28:41 2010	(r202209)
+++ head/libexec/talkd/process.c	Wed Jan 13 18:28:58 2010	(r202210)
@@ -59,8 +59,7 @@ static const char rcsid[] =
 #include <stdio.h>
 #include <string.h>
 #include <syslog.h>
-#define	_ULOG_POSIX_NAMES
-#include <ulog.h>
+#include <utmpx.h>
 
 #include "extern.h"