From 4fd774bd7a61a9374fb58776ff2795676d84edca Mon Sep 17 00:00:00 2001 From: deraadt Date: Mon, 26 Oct 2015 10:12:46 +0000 Subject: [PATCH] last consumer in base of pidfile()... --- usr.sbin/ypserv/ypserv/Makefile | 6 +++--- usr.sbin/ypserv/ypserv/ypserv.c | 3 +-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/usr.sbin/ypserv/ypserv/Makefile b/usr.sbin/ypserv/ypserv/Makefile index 59526795d11..5d39212520c 100644 --- a/usr.sbin/ypserv/ypserv/Makefile +++ b/usr.sbin/ypserv/ypserv/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.11 2004/01/20 21:06:02 matthieu Exp $ +# $OpenBSD: Makefile,v 1.12 2015/10/26 10:12:46 deraadt Exp $ PROG= ypserv MAN= ypserv.acl.5 securenet.5 ypserv.8 @@ -12,8 +12,8 @@ SRCS+= ypserv.c ypserv_proc.c ypserv_db.c acl.c yplog.c ypdb.c CLEANFILES+= ${TSRCS} ${HDRS} -LDADD+= -lutil -lrpcsvc -DPADD+= ${LIBUTIL} ${LIBRPCSVC} +LDADD+= -lrpcsvc +DPADD+= ${LIBRPCSVC} .PATH: ${.CURDIR}/../common CFLAGS+=-DDAEMON -DOPTDB -I${.CURDIR}/../common -I. #CFLAGS=-DDAEMON -I${.CURDIR}/../common -DDEBUG -g diff --git a/usr.sbin/ypserv/ypserv/ypserv.c b/usr.sbin/ypserv/ypserv/ypserv.c index 354486d68e5..539e21ebfcd 100644 --- a/usr.sbin/ypserv/ypserv/ypserv.c +++ b/usr.sbin/ypserv/ypserv/ypserv.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ypserv.c,v 1.41 2015/01/15 00:40:26 deraadt Exp $ */ +/* $OpenBSD: ypserv.c,v 1.42 2015/10/26 10:12:46 deraadt Exp $ */ /* * Copyright (c) 1994 Mats O Jansson @@ -473,7 +473,6 @@ main(int argc, char *argv[]) (void)signal(SIGCHLD, sig_child); (void)signal(SIGHUP, sig_hup); - pidfile(NULL); if (_rpcfdtype == 0 || _rpcfdtype == SOCK_DGRAM) { transp = svcudp_create(sock); -- 2.20.1