Add back in the YP code from 1.1.5. (This attribution brought to you

by Theo de Raadt.)  Added a new make flag variable, NO_YP_LIBC, which
disables YP entirely.  User-land programs to come later.

lib/libc/Makefile

@@ -23,6 +23,12 @@ INSTALL_PIC_ARCHIVE=	yes
 .include "${.CURDIR}/stdlib/Makefile.inc"
 .include "${.CURDIR}/string/Makefile.inc"
 .include "${.CURDIR}/sys/Makefile.inc"
+.include "${.CURDIR}/rpc/Makefile.inc"
+.include "${.CURDIR}/xdr/Makefile.inc"
+.if !defined(NO_YP_LIBC)
+CFLAGS+= -DYP
+.include "${.CURDIR}/yp/Makefile.inc"
+.endif
 
 KQSRCS=	adddi3.c anddi3.c ashldi3.c ashrdi3.c cmpdi2.c divdi3.c iordi3.c \
 	lshldi3.c lshrdi3.c moddi3.c muldi3.c negdi2.c notdi2.c qdivrem.c \

lib/libc/yp/Makefile.inc

@@ -0,0 +1,8 @@
+#	from: @(#)Makefile.inc	5.3 (Berkeley) 2/20/91
+#	$Id: Makefile.inc,v 1.1 1993/11/01 23:56:27 paul Exp $
+
+# yp sources
+.PATH: ${.CURDIR}/yp
+
+SRCS+=	xdryp.c yplib.c
+

lib/libc/yp/xdryp.c

@@ -0,0 +1,394 @@
+/*
+ * Copyright (c) 1992/3 Theo de Raadt <deraadt@fsa.ca>
+ * 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. 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 = "$Id: xdryp.c,v 1.1 1993/11/01 23:56:28 paul Exp $";
+#endif
+
+#include <sys/param.h>
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <stdio.h>
+#include <ctype.h>
+#include <rpc/rpc.h>
+#include <rpc/xdr.h>
+#include <rpcsvc/yp_prot.h>
+#include <rpcsvc/ypclnt.h>
+
+extern int (*ypresp_allfn)();
+extern void *ypresp_data;
+
+struct ypresp_all {
+	bool_t more;
+	union {
+		struct ypresp_key_val val;
+	} ypresp_all_u;
+};
+
+bool_t
+xdr_domainname(xdrs, objp)
+XDR *xdrs;
+char *objp;
+{
+	if (!xdr_string(xdrs, &objp, YPMAXDOMAIN)) {
+		return (FALSE);
+	}
+	return (TRUE);
+}
+
+bool_t
+xdr_peername(xdrs, objp)
+XDR *xdrs;
+char *objp;
+{
+	if (!xdr_string(xdrs, &objp, YPMAXPEER)) {
+		return (FALSE);
+	}
+	return (TRUE);
+}
+
+bool_t
+xdr_datum(xdrs, objp)
+XDR *xdrs;
+datum *objp;
+{
+	if (!xdr_bytes(xdrs, (char **)&objp->dptr, (u_int *)&objp->dsize, YPMAXRECORD)) {
+		return (FALSE);
+	}
+	return (TRUE);
+}
+
+bool_t
+xdr_mapname(xdrs, objp)
+XDR *xdrs;
+char *objp;
+{
+	if (!xdr_string(xdrs, &objp, YPMAXMAP)) {
+		return (FALSE);
+	}
+	return (TRUE);
+}
+
+bool_t
+xdr_ypreq_key(xdrs, objp)
+XDR *xdrs;
+struct ypreq_key *objp;
+{
+	if (!xdr_domainname(xdrs, objp->domain)) {
+		return (FALSE);
+	}
+	if (!xdr_mapname(xdrs, objp->map)) {
+		return (FALSE);
+	}
+	if (!xdr_datum(xdrs, &objp->keydat)) {
+		return (FALSE);
+	}
+	return (TRUE);
+}
+
+bool_t
+xdr_ypreq_nokey(xdrs, objp)
+XDR *xdrs;
+struct ypreq_nokey *objp;
+{
+	if (!xdr_domainname(xdrs, objp->domain)) {
+		return (FALSE);
+	}
+	if (!xdr_mapname(xdrs, objp->map)) {
+		return (FALSE);
+	}
+	return (TRUE);
+}
+
+bool_t
+xdr_yp_inaddr(xdrs, objp)
+XDR *xdrs;
+struct in_addr *objp;
+{
+	if (!xdr_opaque(xdrs, (caddr_t)&objp->s_addr, sizeof objp->s_addr)) {
+		return (FALSE);
+	}
+	return (TRUE);
+}
+
+bool_t
+xdr_ypbind_binding(xdrs, objp)
+XDR *xdrs;
+struct ypbind_binding *objp;
+{
+	if (!xdr_yp_inaddr(xdrs, &objp->ypbind_binding_addr)) {
+		return (FALSE);
+	}
+	if (!xdr_opaque(xdrs, (void *)&objp->ypbind_binding_port,
+	    sizeof objp->ypbind_binding_port)) {
+		return (FALSE);
+	}
+	return (TRUE);
+}
+
+bool_t
+xdr_ypbind_resptype(xdrs, objp)
+XDR *xdrs;
+enum ypbind_resptype *objp;
+{
+	if (!xdr_enum(xdrs, (enum_t *)objp)) {
+		return (FALSE);
+	}
+	return (TRUE);
+}
+
+bool_t
+xdr_ypstat(xdrs, objp)
+XDR *xdrs;
+enum ypbind_resptype *objp;
+{
+	if (!xdr_enum(xdrs, (enum_t *)objp)) {
+		return (FALSE);
+	}
+	return (TRUE);
+}
+
+bool_t
+xdr_ypbind_resp(xdrs, objp)
+XDR *xdrs;
+struct ypbind_resp *objp;
+{
+	if (!xdr_ypbind_resptype(xdrs, &objp->ypbind_status)) {
+		return (FALSE);
+	}
+	switch (objp->ypbind_status) {
+	case YPBIND_FAIL_VAL:
+		if (!xdr_u_int(xdrs, (u_int *)&objp->ypbind_respbody.ypbind_error)) {
+			return (FALSE);
+		}
+		break;
+	case YPBIND_SUCC_VAL:
+		if (!xdr_ypbind_binding(xdrs, &objp->ypbind_respbody.ypbind_bindinfo)) {
+			return (FALSE);
+		}
+		break;
+	default:
+		return (FALSE);
+	}
+	return (TRUE);
+}
+
+bool_t
+xdr_ypresp_val(xdrs, objp)
+XDR *xdrs;
+struct ypresp_val *objp;
+{
+	if (!xdr_ypstat(xdrs, &objp->status)) {
+		return (FALSE);
+	}
+	if (!xdr_datum(xdrs, &objp->valdat)) {
+		return (FALSE);
+	}
+	return (TRUE);
+}
+
+bool_t
+xdr_ypbind_setdom(xdrs, objp)
+XDR *xdrs;
+struct ypbind_setdom *objp;
+{
+	if (!xdr_domainname(xdrs, objp->ypsetdom_domain)) {
+		return (FALSE);
+	}
+	if (!xdr_ypbind_binding(xdrs, &objp->ypsetdom_binding)) {
+		return (FALSE);
+	}
+	if (!xdr_u_short(xdrs, &objp->ypsetdom_vers)) {
+		return (FALSE);
+	}
+	return (TRUE);
+}
+
+bool_t
+xdr_ypresp_key_val(xdrs, objp)
+XDR *xdrs;
+struct ypresp_key_val *objp;
+{
+	if (!xdr_ypstat(xdrs, &objp->status)) {
+		return (FALSE);
+	}
+	if (!xdr_datum(xdrs, &objp->valdat)) {
+		return (FALSE);
+	}
+	if (!xdr_datum(xdrs, &objp->keydat)) {
+		return (FALSE);
+	}
+	return (TRUE);
+}
+
+bool_t
+xdr_ypresp_all(xdrs, objp)
+XDR *xdrs;
+struct ypresp_all *objp;
+{
+	if (!xdr_bool(xdrs, &objp->more)) {
+		return (FALSE);
+	}
+	switch (objp->more) {
+	case TRUE:
+		if (!xdr_ypresp_key_val(xdrs, &objp->ypresp_all_u.val)) {
+			return (FALSE);
+		}
+		break;
+	case FALSE:
+		break;
+	default:
+		return (FALSE);
+	}
+	return (TRUE);
+}
+
+bool_t
+xdr_ypresp_all_seq(xdrs, objp)
+XDR *xdrs;
+u_long *objp;
+{
+	struct ypresp_all out;
+	u_long status;
+	char *key, *val;
+	int r;
+
+	bzero(&out, sizeof out);
+	while(1) {
+		if( !xdr_ypresp_all(xdrs, &out)) {
+			xdr_free(xdr_ypresp_all, (char *)&out);
+			*objp = YP_YPERR;
+			return FALSE;
+		}
+		if(out.more == 0) {
+			xdr_free(xdr_ypresp_all, (char *)&out);
+			return FALSE;
+		}
+		status = out.ypresp_all_u.val.status;
+		switch(status) {
+		case YP_TRUE:
+			key = (char *)malloc(out.ypresp_all_u.val.keydat.dsize + 1);
+			bcopy(out.ypresp_all_u.val.keydat.dptr, key,
+				out.ypresp_all_u.val.keydat.dsize);
+			key[out.ypresp_all_u.val.keydat.dsize] = '\0';
+			val = (char *)malloc(out.ypresp_all_u.val.valdat.dsize + 1);
+			bcopy(out.ypresp_all_u.val.valdat.dptr, val,
+				out.ypresp_all_u.val.valdat.dsize);
+			val[out.ypresp_all_u.val.valdat.dsize] = '\0';
+			xdr_free(xdr_ypresp_all, (char *)&out);
+
+			r = (*ypresp_allfn)(status,
+				key, out.ypresp_all_u.val.keydat.dsize,
+				val, out.ypresp_all_u.val.valdat.dsize,
+				ypresp_data);
+			*objp = status;
+			free(key);
+			free(val);
+			if(r)
+				return TRUE;
+			break;
+		case YP_NOMORE:
+			xdr_free(xdr_ypresp_all, (char *)&out);
+			return TRUE;
+		default:
+			xdr_free(xdr_ypresp_all, (char *)&out);
+			*objp = status;
+			return TRUE;
+		}
+	}
+}
+
+bool_t
+xdr_ypresp_master(xdrs, objp)
+XDR *xdrs;
+struct ypresp_master *objp;
+{
+	if (!xdr_ypstat(xdrs, &objp->status)) {
+		return (FALSE);
+	}
+	if (!xdr_string(xdrs, &objp->master, YPMAXPEER)) {
+		return (FALSE);
+	}
+	return (TRUE);
+}
+
+bool_t
+xdr_ypmaplist_str(xdrs, objp)
+XDR *xdrs;
+char *objp;
+{
+	if (!xdr_string(xdrs, &objp, YPMAXMAP+1)) {
+		return (FALSE);
+	}
+	return (TRUE);
+}
+
+bool_t
+xdr_ypmaplist(xdrs, objp)
+XDR *xdrs;
+struct ypmaplist *objp;
+{
+	if (!xdr_ypmaplist_str(xdrs, objp->ypml_name)) {
+		return (FALSE);
+	}
+	if (!xdr_pointer(xdrs, (caddr_t *)&objp->ypml_next,
+	    sizeof(struct ypmaplist), xdr_ypmaplist)) {
+		return (FALSE);
+	}
+	return (TRUE);
+}
+
+bool_t
+xdr_ypresp_maplist(xdrs, objp)
+XDR *xdrs;
+struct ypresp_maplist *objp;
+{
+	if (!xdr_ypstat(xdrs, &objp->status)) {
+		return (FALSE);
+	}
+	if (!xdr_pointer(xdrs, (caddr_t *)&objp->list,
+	    sizeof(struct ypmaplist), xdr_ypmaplist)) {
+		return (FALSE);
+	}
+	return (TRUE);
+}
+
+bool_t
+xdr_ypresp_order(xdrs, objp)
+XDR *xdrs;
+struct ypresp_order *objp;
+{
+	if (!xdr_ypstat(xdrs, &objp->status)) {
+		return (FALSE);
+	}
+	if (!xdr_u_long(xdrs, &objp->ordernum)) {
+		return (FALSE);
+	}
+	return (TRUE);
+}

lib/libc/yp/yplib.c

@@ -0,0 +1,794 @@
+/*
+ * Copyright (c) 1992/3 Theo de Raadt <deraadt@fsa.ca>
+ * 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. 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 = "$Id: yplib.c,v 1.2 1994/01/11 19:01:09 nate Exp $";
+#endif
+
+#include <sys/param.h>
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <sys/file.h>
+#include <sys/uio.h>
+#include <errno.h>
+#include <stdio.h>
+#include <string.h>
+#include <rpc/rpc.h>
+#include <rpc/xdr.h>
+#include <rpcsvc/yp_prot.h>
+#include <rpcsvc/ypclnt.h>
+
+#ifndef BINDINGDIR
+#define BINDINGDIR "/var/yp/binding"
+#endif
+#define YPMATCHCACHE
+
+extern bool_t xdr_domainname(), xdr_ypbind_resp();
+extern bool_t xdr_ypreq_key(), xdr_ypresp_val();
+extern bool_t xdr_ypreq_nokey(), xdr_ypresp_key_val();
+extern bool_t xdr_ypresp_all(), xdr_ypresp_all_seq();
+extern bool_t xdr_ypresp_master();
+
+int (*ypresp_allfn)();
+void *ypresp_data;
+
+struct dom_binding *_ypbindlist;
+static char _yp_domain[MAXHOSTNAMELEN];
+int _yplib_timeout = 10;
+
+#ifdef YPMATCHCACHE
+int _yplib_cache = 5;
+
+static struct ypmatch_ent {
+	struct ypmatch_ent *next;
+	char *map, *key, *val;
+	int keylen, vallen;
+	time_t expire_t;
+} *ypmc;
+
+static void
+ypmatch_add(map, key, keylen, val, vallen)
+char *map;
+char *key;
+int keylen;
+char *val;
+int vallen;
+{
+	struct ypmatch_ent *ep;
+	time_t t;
+
+	time(&t);
+
+	for(ep=ypmc; ep; ep=ep->next)
+		if(ep->expire_t < t)
+			break;
+	if(ep==NULL) {
+		ep = (struct ypmatch_ent *)malloc(sizeof *ep);
+		bzero((char *)ep, sizeof *ep);
+		if(ypmc)
+			ep->next = ypmc;
+		ypmc = ep;
+	}
+
+	if(ep->key)
+		free(ep->key);
+	if(ep->val)
+		free(ep->val);
+
+	ep->key = NULL;
+	ep->val = NULL;
+
+	ep->key = (char *)malloc(keylen);
+	if(ep->key==NULL)
+		return;
+
+	ep->val = (char *)malloc(vallen);
+	if(ep->key==NULL) {
+		free(ep->key);
+		ep->key = NULL;
+		return;
+	}
+	ep->keylen = keylen;
+	ep->vallen = vallen;
+
+	bcopy(key, ep->key, ep->keylen);
+	bcopy(val, ep->val, ep->vallen);
+
+	if(ep->map) {
+		if( strcmp(ep->map, map) ) {
+			free(ep->map);
+			ep->map = strdup(map);
+		}
+	} else {
+		ep->map = strdup(map);
+	}
+
+	ep->expire_t = t + _yplib_cache;
+}
+
+static bool_t
+ypmatch_find(map, key, keylen, val, vallen)
+char *map;
+char *key;
+int keylen;
+char **val;
+int *vallen;
+{
+	struct ypmatch_ent *ep;
+	time_t t;
+
+	if(ypmc==NULL)
+		return 0;
+
+	time(&t);
+
+	for(ep=ypmc; ep; ep=ep->next) {
+		if(ep->keylen != keylen)
+			continue;
+		if(strcmp(ep->map, map))
+			continue;
+		if(bcmp(ep->key, key, keylen))
+			continue;
+		if(t > ep->expire_t)
+			continue;
+
+		*val = ep->val;
+		*vallen = ep->vallen;
+		return 1;
+	}
+	return 0;
+}
+#endif
+
+int
+_yp_dobind(dom, ypdb)
+char *dom;
+struct dom_binding **ypdb;
+{
+	static int pid = -1;
+	char path[MAXPATHLEN];
+	struct dom_binding *ysd, *ysd2;
+	struct ypbind_resp ypbr;
+	struct timeval tv;
+	struct sockaddr_in clnt_sin;
+	int clnt_sock, fd, gpid;
+	CLIENT *client;
+	int new=0, r;
+
+	gpid = getpid();
+	if( !(pid==-1 || pid==gpid) ) {
+		ysd = _ypbindlist;
+		while(ysd) {
+			if(ysd->dom_client)
+				clnt_destroy(ysd->dom_client);
+			ysd2 = ysd->dom_pnext;
+			free(ysd);
+			ysd = ysd2;
+		}
+		_ypbindlist = NULL;
+	}
+	pid = gpid;
+
+	if(ypdb!=NULL)
+		*ypdb = NULL;
+
+	if(dom==NULL || strlen(dom)==0)
+		return YPERR_BADARGS;
+
+	for(ysd = _ypbindlist; ysd; ysd = ysd->dom_pnext)
+		if( strcmp(dom, ysd->dom_domain) == 0)
+			break;
+	if(ysd==NULL) {
+		ysd = (struct dom_binding *)malloc(sizeof *ysd);
+		bzero((char *)ysd, sizeof *ysd);
+		ysd->dom_socket = -1;
+		ysd->dom_vers = 0;
+		new = 1;
+	}
+again:
+#ifdef BINDINGDIR
+	if(ysd->dom_vers==0) {
+		sprintf(path, "%s/%s.%d", BINDINGDIR, dom, 2);
+		if( (fd=open(path, O_RDONLY)) == -1) {
+			/* no binding file, YP is dead. */
+			if(new)
+				free(ysd);
+			return YPERR_YPBIND;
+		}
+		if( flock(fd, LOCK_EX|LOCK_NB) == -1 && errno==EWOULDBLOCK) {
+			struct iovec iov[2];
+			struct ypbind_resp ybr;
+			u_short	ypb_port;
+
+			iov[0].iov_base = (caddr_t)&ypb_port;
+			iov[0].iov_len = sizeof ypb_port;
+			iov[1].iov_base = (caddr_t)&ybr;
+			iov[1].iov_len = sizeof ybr;
+
+			r = readv(fd, iov, 2);
+			if(r != iov[0].iov_len + iov[1].iov_len) {
+				close(fd);
+				ysd->dom_vers = -1;
+				goto again;
+			}
+
+			bzero(&ysd->dom_server_addr, sizeof ysd->dom_server_addr);
+			ysd->dom_server_addr.sin_family = AF_INET;
+			ysd->dom_server_addr.sin_len = sizeof(struct sockaddr_in);
+			ysd->dom_server_addr.sin_addr =
+			    ybr.ypbind_respbody.ypbind_bindinfo.ypbind_binding_addr;
+			ysd->dom_server_addr.sin_port =
+			    ybr.ypbind_respbody.ypbind_bindinfo.ypbind_binding_port;
+
+			ysd->dom_server_port = ysd->dom_server_addr.sin_port;
+			close(fd);
+			goto gotit;
+		} else {
+			/* no lock on binding file, YP is dead. */
+			close(fd);
+			if(new)
+				free(ysd);
+			return YPERR_YPBIND;
+		}
+	}
+#endif
+	if(ysd->dom_vers==-1 || ysd->dom_vers==0) {
+		bzero((char *)&clnt_sin, sizeof clnt_sin);
+		clnt_sin.sin_family = AF_INET;
+		clnt_sin.sin_addr.s_addr = htonl(INADDR_LOOPBACK);
+
+		clnt_sock = RPC_ANYSOCK;
+		client = clnttcp_create(&clnt_sin, YPBINDPROG, YPBINDVERS, &clnt_sock,
+			0, 0);
+		if(client==NULL) {
+			clnt_pcreateerror("clnttcp_create");
+			if(new)
+				free(ysd);
+			return YPERR_YPBIND;
+		}
+
+		tv.tv_sec = _yplib_timeout;
+		tv.tv_usec = 0;
+		r = clnt_call(client, YPBINDPROC_DOMAIN,
+			xdr_domainname, dom, xdr_ypbind_resp, &ypbr, tv);
+		if(r != RPC_SUCCESS) {
+			fprintf(stderr,
+			"YP: server for domain %s not responding, still trying\n", dom);
+			clnt_destroy(client);
+			ysd->dom_vers = -1;
+			goto again;
+		}
+		clnt_destroy(client);
+
+		bzero((char *)&ysd->dom_server_addr, sizeof ysd->dom_server_addr);
+		ysd->dom_server_addr.sin_family = AF_INET;
+		ysd->dom_server_addr.sin_port =
+			ypbr.ypbind_respbody.ypbind_bindinfo.ypbind_binding_port;
+		ysd->dom_server_addr.sin_addr.s_addr =
+			ypbr.ypbind_respbody.ypbind_bindinfo.ypbind_binding_addr.s_addr;
+		ysd->dom_server_port =
+			ypbr.ypbind_respbody.ypbind_bindinfo.ypbind_binding_port;
+gotit:
+		ysd->dom_vers = YPVERS;
+		strcpy(ysd->dom_domain, dom);
+	}
+
+	tv.tv_sec = _yplib_timeout/2;
+	tv.tv_usec = 0;
+	if(ysd->dom_client)
+		clnt_destroy(ysd->dom_client);
+	ysd->dom_socket = RPC_ANYSOCK;
+	ysd->dom_client = clntudp_create(&ysd->dom_server_addr,
+		YPPROG, YPVERS, tv, &ysd->dom_socket);
+	if(ysd->dom_client==NULL) {
+		clnt_pcreateerror("clntudp_create");
+		ysd->dom_vers = -1;
+		goto again;
+	}
+	if( fcntl(ysd->dom_socket, F_SETFD, 1) == -1)
+		perror("fcntl: F_SETFD");
+
+	if(new) {
+		ysd->dom_pnext = _ypbindlist;
+		_ypbindlist = ysd;
+	}
+
+	if(ypdb!=NULL)
+		*ypdb = ysd;
+	return 0;
+}
+
+static void
+_yp_unbind(ypb)
+struct dom_binding *ypb;
+{
+	clnt_destroy(ypb->dom_client);
+	ypb->dom_client = NULL;
+	ypb->dom_socket = -1;
+}
+
+int
+yp_bind(dom)
+char *dom;
+{
+	return _yp_dobind(dom, NULL);
+}
+
+void
+yp_unbind(dom)
+char *dom;
+{
+	struct dom_binding *ypb, *ypbp;
+
+	ypbp = NULL;
+	for(ypb=_ypbindlist; ypb; ypb=ypb->dom_pnext) {
+		if( strcmp(dom, ypb->dom_domain) == 0) {
+			clnt_destroy(ypb->dom_client);
+			if(ypbp)
+				ypbp->dom_pnext = ypb->dom_pnext;
+			else
+				_ypbindlist = ypb->dom_pnext;
+			free(ypb);
+			return;
+		}
+		ypbp = ypb;
+	}
+	return;
+}
+
+int
+yp_match(indomain, inmap, inkey, inkeylen, outval, outvallen)
+char *indomain;
+char *inmap;
+const char *inkey;
+int inkeylen;
+char **outval;
+int *outvallen;
+{
+	struct dom_binding *ysd;
+	struct ypresp_val yprv;
+	struct timeval tv;
+	struct ypreq_key yprk;
+	int r;
+
+	*outval = NULL;
+	*outvallen = 0;
+
+again:
+	if( _yp_dobind(indomain, &ysd) != 0)
+		return YPERR_DOMAIN;
+
+#ifdef YPMATCHCACHE
+	if( !strcmp(_yp_domain, indomain) && ypmatch_find(inmap, inkey,
+	    inkeylen, &yprv.valdat.dptr, &yprv.valdat.dsize)) {
+		*outvallen = yprv.valdat.dsize;
+		*outval = (char *)malloc(*outvallen+1);
+		bcopy(yprv.valdat.dptr, *outval, *outvallen);
+		(*outval)[*outvallen] = '\0';
+		return 0;
+	}
+#endif
+
+	tv.tv_sec = _yplib_timeout;
+	tv.tv_usec = 0;
+
+	yprk.domain = indomain;
+	yprk.map = inmap;
+	yprk.keydat.dptr = (char *)inkey;
+	yprk.keydat.dsize = inkeylen;
+
+	bzero((char *)&yprv, sizeof yprv);
+
+	r = clnt_call(ysd->dom_client, YPPROC_MATCH,
+		xdr_ypreq_key, &yprk, xdr_ypresp_val, &yprv, tv);
+	if(r != RPC_SUCCESS) {
+		clnt_perror(ysd->dom_client, "yp_match: clnt_call");
+		ysd->dom_vers = -1;
+		goto again;
+	}
+	if( !(r=ypprot_err(yprv.status)) ) {
+		*outvallen = yprv.valdat.dsize;
+		*outval = (char *)malloc(*outvallen+1);
+		bcopy(yprv.valdat.dptr, *outval, *outvallen);
+		(*outval)[*outvallen] = '\0';
+#ifdef YPMATCHCACHE
+		if( strcmp(_yp_domain, indomain)==0 )
+			 ypmatch_add(inmap, inkey, inkeylen, *outval, *outvallen);
+#endif
+	}
+	xdr_free(xdr_ypresp_val, (char *)&yprv);
+	_yp_unbind(ysd);
+	return r;
+}
+
+int
+yp_get_default_domain(domp)
+char **domp;
+{
+	*domp = NULL;
+	if(_yp_domain[0] == '\0')
+		if( getdomainname(_yp_domain, sizeof _yp_domain))
+			return YPERR_NODOM;
+	*domp = _yp_domain;
+	return 0;
+}
+
+int
+yp_first(indomain, inmap, outkey, outkeylen, outval, outvallen)
+char *indomain;
+char *inmap;
+char **outkey;
+int *outkeylen;
+char **outval;
+int *outvallen;
+{
+	struct ypresp_key_val yprkv;
+	struct ypreq_nokey yprnk;
+	struct dom_binding *ysd;
+	struct timeval tv;
+	int r;
+
+	*outkey = *outval = NULL;
+	*outkeylen = *outvallen = 0;
+
+again:
+	if( _yp_dobind(indomain, &ysd) != 0)
+		return YPERR_DOMAIN;
+
+	tv.tv_sec = _yplib_timeout;
+	tv.tv_usec = 0;
+
+	yprnk.domain = indomain;
+	yprnk.map = inmap;
+	bzero((char *)&yprkv, sizeof yprkv);
+
+	r = clnt_call(ysd->dom_client, YPPROC_FIRST,
+		xdr_ypreq_nokey, &yprnk, xdr_ypresp_key_val, &yprkv, tv);
+	if(r != RPC_SUCCESS) {
+		clnt_perror(ysd->dom_client, "yp_first: clnt_call");
+		ysd->dom_vers = -1;
+		goto again;
+	}
+	if( !(r=ypprot_err(yprkv.status)) ) {
+		*outkeylen = yprkv.keydat.dsize;
+		*outkey = (char *)malloc(*outkeylen+1);
+		bcopy(yprkv.keydat.dptr, *outkey, *outkeylen);
+		(*outkey)[*outkeylen] = '\0';
+		*outvallen = yprkv.valdat.dsize;
+		*outval = (char *)malloc(*outvallen+1);
+		bcopy(yprkv.valdat.dptr, *outval, *outvallen);
+		(*outval)[*outvallen] = '\0';
+	}
+	xdr_free(xdr_ypresp_key_val, (char *)&yprkv);
+	_yp_unbind(ysd);
+	return r;
+}
+
+int
+yp_next(indomain, inmap, inkey, inkeylen, outkey, outkeylen, outval, outvallen)
+char *indomain;
+char *inmap;
+char *inkey;
+int inkeylen;
+char **outkey;
+int *outkeylen;
+char **outval;
+int *outvallen;
+{
+	struct ypresp_key_val yprkv;
+	struct ypreq_key yprk;
+	struct dom_binding *ysd;
+	struct timeval tv;
+	int r;
+
+	*outkey = *outval = NULL;
+	*outkeylen = *outvallen = 0;
+
+again:
+	if( _yp_dobind(indomain, &ysd) != 0)
+		return YPERR_DOMAIN;
+
+	tv.tv_sec = _yplib_timeout;
+	tv.tv_usec = 0;
+
+	yprk.domain = indomain;
+	yprk.map = inmap;
+	yprk.keydat.dptr = inkey;
+	yprk.keydat.dsize = inkeylen;
+	bzero((char *)&yprkv, sizeof yprkv);
+
+	r = clnt_call(ysd->dom_client, YPPROC_NEXT,
+		xdr_ypreq_key, &yprk, xdr_ypresp_key_val, &yprkv, tv);
+	if(r != RPC_SUCCESS) {
+		clnt_perror(ysd->dom_client, "yp_next: clnt_call");
+		ysd->dom_vers = -1;
+		goto again;
+	}
+	if( !(r=ypprot_err(yprkv.status)) ) {
+		*outkeylen = yprkv.keydat.dsize;
+		*outkey = (char *)malloc(*outkeylen+1);
+		bcopy(yprkv.keydat.dptr, *outkey, *outkeylen);
+		(*outkey)[*outkeylen] = '\0';
+		*outvallen = yprkv.valdat.dsize;
+		*outval = (char *)malloc(*outvallen+1);
+		bcopy(yprkv.valdat.dptr, *outval, *outvallen);
+		(*outval)[*outvallen] = '\0';
+	}
+	xdr_free(xdr_ypresp_key_val, (char *)&yprkv);
+	_yp_unbind(ysd);
+	return r;
+}
+
+int
+yp_all(indomain, inmap, incallback)
+char *indomain;
+char *inmap;
+struct ypall_callback *incallback;
+{
+	struct ypreq_nokey yprnk;
+	struct dom_binding *ysd;
+	struct timeval tv;
+	struct sockaddr_in clnt_sin;
+	CLIENT *clnt;
+	u_long status;
+	int clnt_sock;
+
+	if( _yp_dobind(indomain, &ysd) != 0)
+		return YPERR_DOMAIN;
+
+	tv.tv_sec = _yplib_timeout;
+	tv.tv_usec = 0;
+	clnt_sock = RPC_ANYSOCK;
+	clnt_sin = ysd->dom_server_addr;
+	clnt_sin.sin_port = 0;
+	clnt = clnttcp_create(&clnt_sin, YPPROG, YPVERS, &clnt_sock, 0, 0);
+	if(clnt==NULL) {
+		printf("clnttcp_create failed\n");
+		return YPERR_PMAP;
+	}
+
+	yprnk.domain = indomain;
+	yprnk.map = inmap;
+	ypresp_allfn = incallback->foreach;
+	ypresp_data = (void *)incallback->data;
+
+	(void) clnt_call(clnt, YPPROC_ALL,
+		xdr_ypreq_nokey, &yprnk, xdr_ypresp_all_seq, &status, tv);
+	clnt_destroy(clnt);
+	xdr_free(xdr_ypresp_all_seq, (char *)&status);	/* not really needed... */
+	_yp_unbind(ysd);
+
+	if(status != YP_FALSE)
+		return ypprot_err(status);
+	return 0;
+}
+
+int
+yp_order(indomain, inmap, outorder)
+char *indomain;
+char *inmap;
+int *outorder;
+{
+ 	struct dom_binding *ysd;
+	struct ypresp_order ypro;
+	struct ypreq_nokey yprnk;
+	struct timeval tv;
+	int r;
+
+again:
+	if( _yp_dobind(indomain, &ysd) != 0)
+		return YPERR_DOMAIN;
+
+	tv.tv_sec = _yplib_timeout;
+	tv.tv_usec = 0;
+
+	yprnk.domain = indomain;
+	yprnk.map = inmap;
+
+	bzero((char *)(char *)&ypro, sizeof ypro);
+
+	r = clnt_call(ysd->dom_client, YPPROC_ORDER,
+		xdr_ypreq_nokey, &yprnk, xdr_ypresp_order, &ypro, tv);
+	if(r != RPC_SUCCESS) {
+		clnt_perror(ysd->dom_client, "yp_order: clnt_call");
+		ysd->dom_vers = -1;
+		goto again;
+	}
+
+	*outorder = ypro.ordernum;
+	xdr_free(xdr_ypresp_order, (char *)&ypro);
+	_yp_unbind(ysd);
+	return ypprot_err(ypro.status);
+}
+
+int
+yp_master(indomain, inmap, outname)
+char *indomain;
+char *inmap;
+char **outname;
+{
+	struct dom_binding *ysd;
+	struct ypresp_master yprm;
+	struct ypreq_nokey yprnk;
+	struct timeval tv;
+	int r;
+
+again:
+	if( _yp_dobind(indomain, &ysd) != 0)
+		return YPERR_DOMAIN;
+
+	tv.tv_sec = _yplib_timeout;
+	tv.tv_usec = 0;
+
+	yprnk.domain = indomain;
+	yprnk.map = inmap;
+
+	bzero((char *)&yprm, sizeof yprm);
+
+	r = clnt_call(ysd->dom_client, YPPROC_MASTER,
+		xdr_ypreq_nokey, &yprnk, xdr_ypresp_master, &yprm, tv);
+	if(r != RPC_SUCCESS) {
+		clnt_perror(ysd->dom_client, "yp_master: clnt_call");
+		ysd->dom_vers = -1;
+		goto again;
+	}
+	if( !(r=ypprot_err(yprm.status)) ) {
+		*outname = (char *)strdup(yprm.master);
+	}
+	xdr_free(xdr_ypresp_master, (char *)&yprm);
+	_yp_unbind(ysd);
+	return r;
+}
+
+yp_maplist(indomain, outmaplist)
+char *indomain;
+struct ypmaplist **outmaplist;
+{
+	struct dom_binding *ysd;
+	struct ypresp_maplist ypml;
+	struct timeval tv;
+	int r;
+
+again:
+	if( _yp_dobind(indomain, &ysd) != 0)
+		return YPERR_DOMAIN;
+
+	tv.tv_sec = _yplib_timeout;
+	tv.tv_usec = 0;
+
+	bzero((char *)&ypml, sizeof ypml);
+
+	r = clnt_call(ysd->dom_client, YPPROC_MAPLIST,
+		xdr_domainname, indomain, xdr_ypresp_maplist, &ypml, tv);
+	if (r != RPC_SUCCESS) {
+		clnt_perror(ysd->dom_client, "yp_maplist: clnt_call");
+		ysd->dom_vers = -1;
+		goto again;
+	}
+	*outmaplist = ypml.list;
+	/* NO: xdr_free(xdr_ypresp_maplist, &ypml);*/
+	_yp_unbind(ysd);
+	return ypprot_err(ypml.status);
+}
+
+char *
+yperr_string(incode)
+int incode;
+{
+	static char err[80];
+
+	switch(incode) {
+	case 0:
+		return "Success";
+	case YPERR_BADARGS:
+		return "Request arguments bad";
+	case YPERR_RPC:
+		return "RPC failure";
+	case YPERR_DOMAIN:
+		return "Can't bind to server which serves this domain";
+	case YPERR_MAP:
+		return "No such map in server's domain";
+	case YPERR_KEY:
+		return "No such key in map";
+	case YPERR_YPERR:
+		return "YP server error";
+	case YPERR_RESRC:
+		return "Local resource allocation failure";
+	case YPERR_NOMORE:
+		return "No more records in map database";
+	case YPERR_PMAP:
+		return "Can't communicate with portmapper";
+	case YPERR_YPBIND:
+		return "Can't communicate with ypbind";
+	case YPERR_YPSERV:
+		return "Can't communicate with ypserv";
+	case YPERR_NODOM:
+		return "Local domain name not set";
+	case YPERR_BADDB:
+		return "Server data base is bad";
+	case YPERR_VERS:
+		return "YP server version mismatch - server can't supply service.";
+	case YPERR_ACCESS:
+		return "Access violation";
+	case YPERR_BUSY:
+		return "Database is busy";
+	}
+	sprintf(err, "YP unknown error %d\n", incode);
+	return err;
+}
+
+int
+ypprot_err(incode)
+unsigned int incode;
+{
+	switch(incode) {
+	case YP_TRUE:
+		return 0;
+	case YP_FALSE:
+		return YPERR_YPBIND;
+	case YP_NOMORE:
+		return YPERR_NOMORE;
+	case YP_NOMAP:
+		return YPERR_MAP;
+	case YP_NODOM:
+		return YPERR_NODOM;
+	case YP_NOKEY:
+		return YPERR_KEY;
+	case YP_BADOP:
+		return YPERR_YPERR;
+	case YP_BADDB:
+		return YPERR_BADDB;
+	case YP_YPERR:
+		return YPERR_YPERR;
+	case YP_BADARGS:
+		return YPERR_BADARGS;
+	case YP_VERS:
+		return YPERR_VERS;
+	}
+	return YPERR_YPERR;
+}
+
+int
+_yp_check(dom)
+char **dom;
+{
+	int use_yp = 0;
+	char *unused;
+
+	if( _yp_domain[0]=='\0' )
+		if( yp_get_default_domain(&unused) )
+			return 0;
+
+	if(dom)
+		*dom = _yp_domain;
+
+	if( yp_bind(_yp_domain)==0 )
+		return 1;
+	return 0;
+}