5 files changed, 21 insertions, 12 deletions
diff --git a/lib/librpcsvc/yp.x b/lib/librpcsvc/yp.x
index df2489e4f3f..9e81df14976 100644
--- a/lib/librpcsvc/yp.x
+++ b/lib/librpcsvc/yp.x
@@ -1,4 +1,4 @@
-/*	$OpenBSD: yp.x,v 1.2 1997/08/19 07:54:52 niklas Exp $	*/
+/*	$OpenBSD: yp.x,v 1.3 2003/02/13 05:54:39 maja Exp $	*/
 
 /*
  * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
@@ -36,7 +36,7 @@
 #ifndef RPC_HDR
 %#ifndef lint
 %/*static char sccsid[] = "from: @(#)yp.x	2.1 88/08/01 4.0 RPCSRC";*/
-%static char rcsid[] = "$OpenBSD: yp.x,v 1.2 1997/08/19 07:54:52 niklas Exp $";
+%static char rcsid[] = "$OpenBSD: yp.x,v 1.3 2003/02/13 05:54:39 maja Exp $";
 %#endif /* not lint */
 #endif
 
@@ -121,8 +121,13 @@ struct ypresp_val {
 
 struct ypresp_key_val {
 	ypstat stat;
+#ifdef STUPID_SUN_BUG /* These are backwards */
 	keydat key;
 	valdat val;
+#else
+	valdat val;
+	keydat key;
+#endif
 };
 
 
@@ -239,7 +244,11 @@ program YPPROG {
 		YPPROC_MATCH(ypreq_key) = 3;
 
 		ypresp_key_val 
+#ifdef STUPID_SUN_BUG /* should be ypreq_nokey */
 		YPPROC_FIRST(ypreq_key) = 4;
+#else
+		YPPROC_FIRST(ypreq_nokey) = 4;
+#endif
 
 		ypresp_key_val 
 		YPPROC_NEXT(ypreq_key) = 5;
diff --git a/usr.sbin/ypserv/ypserv/Makefile b/usr.sbin/ypserv/ypserv/Makefile
index 28e0e8a0fbf..235b95b5096 100644
--- a/usr.sbin/ypserv/ypserv/Makefile
+++ b/usr.sbin/ypserv/ypserv/Makefile
@@ -1,8 +1,8 @@
-#	$OpenBSD: Makefile,v 1.8 2002/01/01 21:10:59 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.9 2003/02/13 05:54:39 maja Exp $
 
 PROG=	ypserv
 SRCS=	ypserv.c ypserv_proc.c ypserv_db.c acl.c yplog.c ypdb.c \
-	ypserv_xdr.c ypserv_xdr_v1.c
+	ypserv_xdr_v1.c
 MAN=	ypserv.acl.5 securenet.5 ypserv.8
 LDADD+=	-lutil -lrpcsvc
 DPADD+=	${LIBUTIL} ${LIBRPCSVC}
diff --git a/usr.sbin/ypserv/ypserv/ypserv.c b/usr.sbin/ypserv/ypserv/ypserv.c
index 774310eca4e..f5fb73d3415 100644
--- a/usr.sbin/ypserv/ypserv/ypserv.c
+++ b/usr.sbin/ypserv/ypserv/ypserv.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ypserv.c,v 1.25 2002/09/06 19:13:10 deraadt Exp $ */
+/*	$OpenBSD: ypserv.c,v 1.26 2003/02/13 05:54:39 maja Exp $ */
 
 /*
  * Copyright (c) 1994 Mats O Jansson <moj@stacken.kth.se>
@@ -32,7 +32,7 @@
  */
 
 #ifndef LINT
-static char rcsid[] = "$OpenBSD: ypserv.c,v 1.25 2002/09/06 19:13:10 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: ypserv.c,v 1.26 2003/02/13 05:54:39 maja Exp $";
 #endif
 
 #include <sys/types.h>
@@ -40,7 +40,7 @@ static char rcsid[] = "$OpenBSD: ypserv.c,v 1.25 2002/09/06 19:13:10 deraadt Exp
 #include <sys/ioctl.h>
 #include <sys/ttycom.h>
 #include <netinet/in.h>
-#include "yp.h"
+#include <rpcsvc/yp.h>
 #include "ypv1.h"
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/usr.sbin/ypserv/ypserv/ypserv_proc.c b/usr.sbin/ypserv/ypserv/ypserv_proc.c
index efc4d9a7c85..ab09532c00c 100644
--- a/usr.sbin/ypserv/ypserv/ypserv_proc.c
+++ b/usr.sbin/ypserv/ypserv/ypserv_proc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ypserv_proc.c,v 1.18 2002/07/19 02:38:40 deraadt Exp $ */
+/*	$OpenBSD: ypserv_proc.c,v 1.19 2003/02/13 05:54:39 maja Exp $ */
 
 /*
  * Copyright (c) 1994 Mats O Jansson <moj@stacken.kth.se>
@@ -32,11 +32,11 @@
  */
 
 #ifndef LINT
-static char rcsid[] = "$OpenBSD: ypserv_proc.c,v 1.18 2002/07/19 02:38:40 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: ypserv_proc.c,v 1.19 2003/02/13 05:54:39 maja Exp $";
 #endif
 
 #include <rpc/rpc.h>
-#include "yp.h"
+#include <rpcsvc/yp.h>
 #include "ypv1.h"
 #include <rpcsvc/ypclnt.h>
 #include <sys/stat.h>
diff --git a/usr.sbin/ypserv/ypserv/ypserv_xdr_v1.c b/usr.sbin/ypserv/ypserv/ypserv_xdr_v1.c
index a862f3c9e55..f4fdb5cc405 100644
--- a/usr.sbin/ypserv/ypserv/ypserv_xdr_v1.c
+++ b/usr.sbin/ypserv/ypserv/ypserv_xdr_v1.c
@@ -3,10 +3,10 @@
  * It was generated using rpcgen.
  */
 
-#include "yp.h"
+#include <rpcsvc/yp.h>
 #include "ypv1.h"
 #ifndef lint
-static char rcsid[] = "$OpenBSD: ypserv_xdr_v1.c,v 1.3 2002/01/01 21:15:03 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: ypserv_xdr_v1.c,v 1.4 2003/02/13 05:54:39 maja Exp $";
 #endif /* not lint */
 
 bool_t