Date: Wed, 13 Jan 2010 18:17:53 +0000 (UTC) From: Ed Schouten <ed@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r202206 - in head/usr.sbin: bsnmpd/modules/snmp_hostres rwhod syslogd Message-ID: <201001131817.o0DIHrkQ084799@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ed Date: Wed Jan 13 18:17:53 2010 New Revision: 202206 URL: http://svn.freebsd.org/changeset/base/202206 Log: Port all applications in usr.sbin/ from libulog to utmpx. Modified: head/usr.sbin/bsnmpd/modules/snmp_hostres/Makefile head/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_scalars.c head/usr.sbin/rwhod/Makefile head/usr.sbin/rwhod/rwhod.c head/usr.sbin/syslogd/Makefile head/usr.sbin/syslogd/syslogd.c Modified: head/usr.sbin/bsnmpd/modules/snmp_hostres/Makefile ============================================================================== --- head/usr.sbin/bsnmpd/modules/snmp_hostres/Makefile Wed Jan 13 18:17:12 2010 (r202205) +++ head/usr.sbin/bsnmpd/modules/snmp_hostres/Makefile Wed Jan 13 18:17:53 2010 (r202206) @@ -69,8 +69,8 @@ MAN= snmp_hostres.3 DEFS= ${MOD}_tree.def BMIBS= BEGEMOT-HOSTRES-MIB.txt -DPADD= ${LIBKVM} ${LIBDEVINFO} ${LIBM} ${LIBGEOM} ${LIBMEMSTAT} ${LIBULOG} -LDADD= -lkvm -ldevinfo -lm -lgeom -lmemstat -lulog +DPADD= ${LIBKVM} ${LIBDEVINFO} ${LIBM} ${LIBGEOM} ${LIBMEMSTAT} +LDADD= -lkvm -ldevinfo -lm -lgeom -lmemstat .include <bsd.snmpmod.mk> Modified: head/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_scalars.c ============================================================================== --- head/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_scalars.c Wed Jan 13 18:17:12 2010 (r202205) +++ head/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_scalars.c Wed Jan 13 18:17:53 2010 (r202206) @@ -41,8 +41,7 @@ #include <stdint.h> #include <string.h> #include <syslog.h> -#define _ULOG_POSIX_NAMES -#include <ulog.h> +#include <utmpx.h> #include "hostres_snmp.h" #include "hostres_oid.h" Modified: head/usr.sbin/rwhod/Makefile ============================================================================== --- head/usr.sbin/rwhod/Makefile Wed Jan 13 18:17:12 2010 (r202205) +++ head/usr.sbin/rwhod/Makefile Wed Jan 13 18:17:53 2010 (r202206) @@ -6,7 +6,4 @@ MAN= rwhod.8 WARNS?= 3 -DPADD= ${LIBULOG} -LDADD= -lulog - .include <bsd.prog.mk> Modified: head/usr.sbin/rwhod/rwhod.c ============================================================================== --- head/usr.sbin/rwhod/rwhod.c Wed Jan 13 18:17:12 2010 (r202205) +++ head/usr.sbin/rwhod/rwhod.c Wed Jan 13 18:17:53 2010 (r202206) @@ -67,9 +67,8 @@ __FBSDID("$FreeBSD$"); #include <string.h> #include <syslog.h> #include <timeconv.h> -#define _ULOG_POSIX_NAMES -#include <ulog.h> #include <unistd.h> +#include <utmpx.h> #include <pwd.h> #include <grp.h> Modified: head/usr.sbin/syslogd/Makefile ============================================================================== --- head/usr.sbin/syslogd/Makefile Wed Jan 13 18:17:12 2010 (r202205) +++ head/usr.sbin/syslogd/Makefile Wed Jan 13 18:17:53 2010 (r202206) @@ -9,8 +9,8 @@ PROG= syslogd MAN= syslog.conf.5 syslogd.8 SRCS= syslogd.c ttymsg.c -DPADD= ${LIBULOG} ${LIBUTIL} -LDADD= -lulog -lutil +DPADD= ${LIBUTIL} +LDADD= -lutil WARNS?= 3 Modified: head/usr.sbin/syslogd/syslogd.c ============================================================================== --- head/usr.sbin/syslogd/syslogd.c Wed Jan 13 18:17:12 2010 (r202205) +++ head/usr.sbin/syslogd/syslogd.c Wed Jan 13 18:17:53 2010 (r202206) @@ -105,9 +105,8 @@ __FBSDID("$FreeBSD$"); #include <stdlib.h> #include <string.h> #include <sysexits.h> -#define _ULOG_POSIX_NAMES -#include <ulog.h> #include <unistd.h> +#include <utmpx.h> #include "pathnames.h" #include "ttymsg.h"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201001131817.o0DIHrkQ084799>