diff options
| author | ed <ed@FreeBSD.org> | 2010-01-13 18:17:53 +0000 |
|---|---|---|
| committer | ed <ed@FreeBSD.org> | 2010-01-13 18:17:53 +0000 |
| commit | 57d10a6e95a4cdb97bc1a8c3125f1a2719736ccf (patch) | |
| tree | 10b814541a563afa6b8b679658d5f3d3d04162dc /usr.sbin | |
| parent | 7297d6b5779271a7e43264e39e539c880d9d50fa (diff) | |
| download | FreeBSD-src-57d10a6e95a4cdb97bc1a8c3125f1a2719736ccf.zip FreeBSD-src-57d10a6e95a4cdb97bc1a8c3125f1a2719736ccf.tar.gz | |
Port all applications in usr.sbin/ from libulog to utmpx.
Diffstat (limited to 'usr.sbin')
| -rw-r--r-- | usr.sbin/bsnmpd/modules/snmp_hostres/Makefile | 4 | ||||
| -rw-r--r-- | usr.sbin/bsnmpd/modules/snmp_hostres/hostres_scalars.c | 3 | ||||
| -rw-r--r-- | usr.sbin/rwhod/Makefile | 3 | ||||
| -rw-r--r-- | usr.sbin/rwhod/rwhod.c | 3 | ||||
| -rw-r--r-- | usr.sbin/syslogd/Makefile | 4 | ||||
| -rw-r--r-- | usr.sbin/syslogd/syslogd.c | 3 |
6 files changed, 7 insertions, 13 deletions
diff --git a/usr.sbin/bsnmpd/modules/snmp_hostres/Makefile b/usr.sbin/bsnmpd/modules/snmp_hostres/Makefile index 3e9e05f..2922f45 100644 --- a/usr.sbin/bsnmpd/modules/snmp_hostres/Makefile +++ b/usr.sbin/bsnmpd/modules/snmp_hostres/Makefile @@ -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> diff --git a/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_scalars.c b/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_scalars.c index 8cf648b..f86334e 100644 --- a/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_scalars.c +++ b/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_scalars.c @@ -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" diff --git a/usr.sbin/rwhod/Makefile b/usr.sbin/rwhod/Makefile index 439a11c..f1b5d99 100644 --- a/usr.sbin/rwhod/Makefile +++ b/usr.sbin/rwhod/Makefile @@ -6,7 +6,4 @@ MAN= rwhod.8 WARNS?= 3 -DPADD= ${LIBULOG} -LDADD= -lulog - .include <bsd.prog.mk> diff --git a/usr.sbin/rwhod/rwhod.c b/usr.sbin/rwhod/rwhod.c index 9679fae..6b63843 100644 --- a/usr.sbin/rwhod/rwhod.c +++ b/usr.sbin/rwhod/rwhod.c @@ -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> diff --git a/usr.sbin/syslogd/Makefile b/usr.sbin/syslogd/Makefile index e5c823c..1682b49 100644 --- a/usr.sbin/syslogd/Makefile +++ b/usr.sbin/syslogd/Makefile @@ -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 diff --git a/usr.sbin/syslogd/syslogd.c b/usr.sbin/syslogd/syslogd.c index 5d50082..b803969 100644 --- a/usr.sbin/syslogd/syslogd.c +++ b/usr.sbin/syslogd/syslogd.c @@ -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" |
