use -lrpcsvc

2 files changed, 4 insertions, 86 deletions

diff --git a/libexec/rpc.yppasswdd/Makefile b/libexec/rpc.yppasswdd/Makefile
index ea656798fe8..62b8d4ffb19 100644
--- a/libexec/rpc.yppasswdd/Makefile
+++ b/libexec/rpc.yppasswdd/Makefile
@@ -1,14 +1,14 @@
-#	$OpenBSD: Makefile,v 1.7 1997/08/19 07:00:50 niklas Exp $
+#	$OpenBSD: Makefile,v 1.8 2001/11/07 19:07:06 deraadt Exp $
 #	from: @(#)Makefile	5.8 (Berkeley) 7/28/90
 
 PROG=	rpc.yppasswdd
-SRCS=	rpc.yppasswdd.c yppasswdd_xdr.c yppasswdd_proc.c yppasswdd_mkpw.c
+SRCS=	rpc.yppasswdd.c yppasswdd_proc.c yppasswdd_mkpw.c
 MAN=	rpc.yppasswdd.8
 BINOWN= root
 BINMODE=555
 BINDIR=/usr/sbin
 MLINKS= rpc.yppasswdd.8 yppasswdd.8
-DPADD+= ${LIBUTIL}
-LDADD+= -lutil
+DPADD+= ${LIBUTIL} ${LIBRPCSVC}
+LDADD+= -lutil -lrpcsvc
 
 .include <bsd.prog.mk>
diff --git a/libexec/rpc.yppasswdd/yppasswdd_xdr.c b/libexec/rpc.yppasswdd/yppasswdd_xdr.c
deleted file mode 100644
index 3941508c285..00000000000
--- a/libexec/rpc.yppasswdd/yppasswdd_xdr.c
+++ /dev/null
@@ -1,82 +0,0 @@
-/*	$OpenBSD: yppasswdd_xdr.c,v 1.4 1997/08/19 07:00:52 niklas Exp $	*/
-
-/*
- * Copyright (c) 1994 Mats O Jansson <moj@stacken.kth.se>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by Mats O Jansson
- * 4. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
- * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifndef LINT
-static char rcsid[] = "$OpenBSD: yppasswdd_xdr.c,v 1.4 1997/08/19 07:00:52 niklas Exp $";
-#endif
-
-#include <rpc/rpc.h>
-#include <rpcsvc/yppasswd.h>
-
-bool_t
-xdr_x_passwd(xdrs, objp)
-	XDR *xdrs;
-	x_passwd *objp;
-{
-	if (!xdr_string(xdrs, &objp->pw_name, ~0)) {
-		return (FALSE);
-	}
-	if (!xdr_string(xdrs, &objp->pw_passwd, ~0)) {
-		return (FALSE);
-	}
-	if (!xdr_int(xdrs, &objp->pw_uid)) {
-		return (FALSE);
-	}
-	if (!xdr_int(xdrs, &objp->pw_gid)) {
-		return (FALSE);
-	}
-	if (!xdr_string(xdrs, &objp->pw_gecos, ~0)) {
-		return (FALSE);
-	}
-	if (!xdr_string(xdrs, &objp->pw_dir, ~0)) {
-		return (FALSE);
-	}
-	if (!xdr_string(xdrs, &objp->pw_shell, ~0)) {
-		return (FALSE);
-	}
-	return (TRUE);
-}
-
-bool_t
-xdr_yppasswd(xdrs, objp)
-	XDR *xdrs;
-	yppasswd *objp;
-{
-	if (!xdr_string(xdrs, &objp->oldpass, ~0)) {
-		return (FALSE);
-	}
-	if (!xdr_x_passwd(xdrs, &objp->newpw)) {
-		return (FALSE);
-	}
-	return (TRUE);
-}