From 152532fde68ce0b36c127946df1695418c8e1125 Mon Sep 17 00:00:00 2001
From: guenther <>
Date: Mon, 30 May 2016 02:53:29 +0000
Subject: [PATCH] Stop publicly declaring _yp_dobind() and struct dom_binding,
 closing out a rant Theo wrote 24 years ago.  Mark __ypexclude_{add,is,free}()
 as hidden

"get off my lawn!" deraadt@
---
 src/include/rpcsvc/yp_prot.h | 25 +------------------------
 src/include/rpcsvc/ypclnt.h  |  4 +---
 2 files changed, 2 insertions(+), 27 deletions(-)

diff --git a/src/include/rpcsvc/yp_prot.h b/src/include/rpcsvc/yp_prot.h
index d78bd61d..243cf529 100644
--- a/src/include/rpcsvc/yp_prot.h
+++ b/src/include/rpcsvc/yp_prot.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: yp_prot.h,v 1.9 2015/09/28 20:49:24 deraadt Exp $	*/
+/*	$OpenBSD: yp_prot.h,v 1.10 2016/05/30 02:53:29 guenther Exp $	*/
 /*	$NetBSD: yp_prot.h,v 1.6 1995/07/14 21:10:58 christos Exp $	*/
 
 /*
@@ -189,29 +189,6 @@ struct ypresp_maplist {
 #define YP_BADARGS	((unsigned long)-7)	/* request arguments bad */
 #define YP_VERS		((unsigned long)-8)	/* YP server version mismatch */
 
-/*
- * Sun's header file says:
- * "Domain binding data structure, used by ypclnt package and ypserv modules.
- * Users of the ypclnt package (or of this protocol) don't HAVE to know about
- * it, but it must be available to users because _yp_dobind is a public
- * interface."
- *
- * This is totally bogus! Nowhere else does Sun state that _yp_dobind() is
- * a public interface, and I don't know any reason anyone would want to call
- * it. But, just in case anyone does actually expect it to be available..
- * we provide this.. exactly as Sun wants it.
- */
-struct dom_binding {
-	struct dom_binding *dom_pnext;
-	char dom_domain[YPMAXDOMAIN + 1];
-	struct sockaddr_in dom_server_addr;
-	unsigned short dom_server_port;
-	int dom_socket;
-	CLIENT *dom_client;
-	unsigned short dom_local_port;
-	long dom_vers;
-};
-
 /*
  * YPBIND PROTOCOL:
  *
diff --git a/src/include/rpcsvc/ypclnt.h b/src/include/rpcsvc/ypclnt.h
index f271e5c6..f7af7c3d 100644
--- a/src/include/rpcsvc/ypclnt.h
+++ b/src/include/rpcsvc/ypclnt.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ypclnt.h,v 1.9 2004/01/22 21:48:02 espie Exp $	*/
+/*	$OpenBSD: ypclnt.h,v 1.10 2016/05/30 02:53:29 guenther Exp $	*/
 /*	$NetBSD: ypclnt.h,v 1.7 1995/07/14 21:11:10 christos Exp $	*/
 
 /*
@@ -63,8 +63,6 @@ struct ypall_callback {
 
 __BEGIN_DECLS
 int	yp_bind(const char *);
-struct dom_binding;
-int	_yp_dobind(const char *, struct dom_binding **);
 void	yp_unbind(const char *);
 int	yp_get_default_domain(char **);
 int	yp_match(const char *, const char *, const char *, int , char **,