off to the bitbucket in the sky

4 files changed, 2 insertions, 190 deletions

diff --git a/usr.sbin/ypserv/Makefile b/usr.sbin/ypserv/Makefile
index 2c99ca31d0c..43f4b44dccd 100644
--- a/usr.sbin/ypserv/Makefile
+++ b/usr.sbin/ypserv/Makefile
@@ -1,6 +1,6 @@
-#	$OpenBSD: Makefile,v 1.6 1997/07/26 12:12:26 maja Exp $
+#	$OpenBSD: Makefile,v 1.7 2015/11/17 15:22:55 deraadt Exp $
 
 SUBDIR=	makedbm mkalias mknetid revnetgroup stdethers stdhosts \
-	ypinit ypserv yptest yppush ypxfr
+	ypinit ypserv yppush ypxfr
 
 .include <bsd.subdir.mk>
diff --git a/usr.sbin/ypserv/yptest/Makefile b/usr.sbin/ypserv/yptest/Makefile
deleted file mode 100644
index f0d197a2b7f..00000000000
--- a/usr.sbin/ypserv/yptest/Makefile
+++ /dev/null
@@ -1,6 +0,0 @@
-#	$OpenBSD: Makefile,v 1.2 1996/05/30 09:53:31 deraadt Exp $
-
-PROG=	yptest
-MAN=	yptest.8
-
-.include <bsd.prog.mk>
diff --git a/usr.sbin/ypserv/yptest/yptest.8 b/usr.sbin/ypserv/yptest/yptest.8
deleted file mode 100644
index d5978b36b25..00000000000
--- a/usr.sbin/ypserv/yptest/yptest.8
+++ /dev/null
@@ -1,58 +0,0 @@
-.\"	$OpenBSD: yptest.8,v 1.14 2013/07/16 11:13:34 schwarze 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.
-.\"
-.\" 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.
-.\"
-.Dd $Mdocdate: July 16 2013 $
-.Dt YPTEST 8
-.Os
-.Sh NAME
-.Nm yptest
-.Nd calls different YP routines
-.Sh SYNOPSIS
-.Nm yptest
-.\".Op Fl u Ar file
-.\".Nm /usr/sbin/makedbm
-.\".Op Fl bls
-.\".Op Fl i Ar yp_input_file
-.\".Op Fl o Ar yp_output_file
-.\".Op Fl d Ar yp_domain_name
-.\".Op Fl m Ar yp_master_name
-.\".Ar infile
-.\".Ar outfile
-.Sh DESCRIPTION
-.Nm
-checks various YP functions to see if the YP server works as expected.
-.\".Pp
-.\"The options are as follows:
-.\".Bl -tag -width Ds
-.\".It Fl d Ar yp_domain_name
-.\"Include an entry the in the map with the key YP_DOMAIN_NAME and the argument
-.\"as value.
-.\".El
-.Sh SEE ALSO
-.Xr yp 8 ,
-.Xr ypserv 8
-.Sh AUTHORS
-.An Mats O Jansson Aq Mt moj@stacken.kth.se
diff --git a/usr.sbin/ypserv/yptest/yptest.c b/usr.sbin/ypserv/yptest/yptest.c
deleted file mode 100644
index c0ead320f7a..00000000000
--- a/usr.sbin/ypserv/yptest/yptest.c
+++ /dev/null
@@ -1,124 +0,0 @@
-/*	$OpenBSD: yptest.c,v 1.18 2009/11/21 19:31:40 ian 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.
- *
- * 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.
- */
-
-#include <stdio.h>
-#include <unistd.h>
-#include <string.h>
-#include <rpc/rpc.h>
-#include <rpc/xdr.h>
-#include <rpcsvc/yp.h>
-#include <rpcsvc/ypclnt.h>
-
-static int
-yptest_foreach(u_long status, char *key, int keylen, char *val, int vallen,
-    void *data)
-{
-	if (status == 2)
-		return(0);
-
-	key[keylen] = '\0';
-	val[vallen] = '\0';
-	printf("%s %s\n", key, val);
-	return 0;
-}
-
-int
-main(int argc, char *argv[])
-{
-	char *Domain, *Value, *Key2;
-	char *Map = "hosts.byname", *Key = "localhost";
-	int ValLen, Status, Order, KeyLen;
-	struct ypall_callback Callback;
-	struct ypmaplist *ypml, *y;
-
-	Status = yp_get_default_domain(&Domain);
-	if (Status)
-		printf("yp error: %s\n", yperr_string(Status));
-
-	printf("Test 1: yp_match %s %s\n", Key, Map);
-	KeyLen = strlen(Key);
-	Status = yp_match(Domain, Map, Key, KeyLen, &Value, &ValLen);
-	if (Status)
-		printf("yp error: %s\n", yperr_string(Status));
-	else
-		printf("%*.*s\n", ValLen, ValLen, Value);
-
-	printf("\nTest 2: yp_first\n");
-	Status = yp_first(Domain, Map, &Key2, &KeyLen, &Value, &ValLen);
-	if (Status)
-		printf("yp error: %s\n", yperr_string(Status));
-	else
-		printf("%*.*s %*.*s\n", KeyLen, KeyLen, Key2, ValLen, ValLen, Value);
-
-	printf("\nTest 3: yp_next\n");
-	while (Status == 0) {
-		Status = yp_next(Domain, Map, Key2, KeyLen, &Key2,
-		    &KeyLen, &Value, &ValLen);
-		if (Status)
-			printf("yp error: %s\n", yperr_string(Status));
-		else
-			printf("%*.*s %*.*s\n", KeyLen, KeyLen, Key2,
-			    ValLen, ValLen, Value);
-	}
-
-	printf("\nTest 4: yp_master\n");
-	Status = yp_master(Domain, Map, &Key2);
-	if (Status)
-		printf("yp error: %s\n", yperr_string(Status));
-	else
-		printf("%s\n", Key2);
-
-	printf("\nTest 5: yp_order\n");
-	Status = yp_order(Domain, Map, &Order);
-	if (Status)
-		printf("yp error: %s\n", yperr_string(Status));
-	else
-		printf("%d\n", Order);
-
-	printf("\nTest 6: yp_maplist\n");
-	ypml = NULL;
-	switch (yp_maplist(Domain, &ypml)) {
-	case 0:
-		for (y = ypml; y; ) {
-			ypml = y;
-			printf("%s\n", ypml->map);
-			y = ypml->next;
-		}
-		break;
-	default:
-		printf("yp error: %s\n", yperr_string(Status));
-		break;
-	}
-
-	printf("\nTest 7: yp_all\n");
-	Callback.foreach = yptest_foreach;
-	Status = yp_all(Domain, Map, &Callback);
-	if (Status)
-		printf("yp error: %s\n", yperr_string(Status));
-	return 0;
-}