NIS client toolbox. This centralizes code which is duplicated all over

our tree.

Sponsored by:	DARPA, NAI Labs.

7 files changed, 497 insertions, 0 deletions

diff --git a/lib/libypclnt/Makefile b/lib/libypclnt/Makefile
new file mode 100644
index 0000000..09e477a
--- /dev/null
+++ b/lib/libypclnt/Makefile
@@ -0,0 +1,54 @@
+# $FreeBSD$
+
+LIB		 = ypclnt
+SHLIB_MAJOR	 = 1
+SHLIB_MINOR	 = 0
+SRCS		 = 
+SRCS		+= ypclnt_connect.c
+SRCS		+= ypclnt_error.c
+SRCS		+= ypclnt_free.c
+SRCS		+= ypclnt_new.c
+SRCS		+= ypclnt_passwd.c
+SRCS		+= ${GENSRCS}
+INCS		 = ypclnt.h
+CLEANFILES	+= ${GENSRCS}
+DPADD		+= ${LIBRPCSVC}
+LDADD		+= -lrpcsvc
+WARNS		?= 4
+
+GENSRCS		 =
+GENSRCS		+= yp.h
+GENSRCS		+= yp_clnt.c
+GENSRCS		+= yppasswd.h
+GENSRCS		+= yppasswd_clnt.c
+GENSRCS		+= yppasswd_private.h
+GENSRCS		+= yppasswd_private_clnt.c
+GENSRCS		+= yppasswd_private_xdr.c
+
+RPCGEN		 = rpcgen -C
+RPCSRC		 = ${.CURDIR}/../../include/rpcsvc/yp.x
+RPCSRC_PW	 = ${.CURDIR}/../../include/rpcsvc/yppasswd.x
+RPCSRC_PRIV	 = ${.CURDIR}/../../usr.sbin/rpc.yppasswdd/yppasswd_private.x
+
+yp.h: ${RPCSRC}
+	${RPCGEN} -h -o ${.TARGET} ${RPCSRC}
+
+yp_clnt.c: ${RPCSRC}
+	${RPCGEN} -l -o ${.TARGET} ${RPCSRC}
+
+yppasswd.h: ${RPCSRC_PW}
+	${RPCGEN} -h -o ${.TARGET} ${RPCSRC_PW}
+
+yppasswd_clnt.c: ${RPCSRC_PW}
+	${RPCGEN} -l -o ${.TARGET} ${RPCSRC_PW}
+
+yppasswd_private.h: ${RPCSRC_PRIV}
+	${RPCGEN} -h -o ${.TARGET} ${RPCSRC_PRIV}
+
+yppasswd_private_xdr.c: ${RPCSRC_PRIV}
+	${RPCGEN} -c -o ${.TARGET} ${RPCSRC_PRIV}
+
+yppasswd_private_clnt.c: ${RPCSRC_PRIV}
+	${RPCGEN} -l -o ${.TARGET} ${RPCSRC_PRIV}
+
+.include <bsd.lib.mk>
diff --git a/lib/libypclnt/ypclnt_connect.c b/lib/libypclnt/ypclnt_connect.c
new file mode 100644
index 0000000..5670fa4
--- /dev/null
+++ b/lib/libypclnt/ypclnt_connect.c
@@ -0,0 +1,90 @@
+/*-
+ * Copyright (c) 2002 Networks Associates Technology, Inc.
+ * All rights reserved.
+ *
+ * This software was developed for the FreeBSD Project by ThinkSec AS and
+ * NAI Labs, the Security Research Division of Network Associates, Inc.
+ * under DARPA/SPAWAR contract N66001-01-C-8035 ("CBOSS"), as part of the
+ * DARPA CHATS research program.
+ *
+ * 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 AND CONTRIBUTORS ``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 OR CONTRIBUTORS 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.
+ *
+ * $FreeBSD$
+ */
+
+#include <sys/param.h>
+
+#include <err.h>
+#include <errno.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+#include <rpcsvc/ypclnt.h>
+
+#include "ypclnt.h"
+
+int
+ypclnt_connect(ypclnt_t *ypclnt)
+{
+	int r;
+
+	/* get default domain name unless specified */
+	if (ypclnt->domain == NULL) {
+		if ((ypclnt->domain = malloc(MAXHOSTNAMELEN)) == NULL) {
+			ypclnt_error(ypclnt, __func__,
+			    "%s", strerror(errno));
+			return (-1);
+		}
+		if (getdomainname(ypclnt->domain, MAXHOSTNAMELEN) != 0) {
+			ypclnt_error(ypclnt, __func__,
+			    "can't get NIS domain name");
+			return (-1);
+		}
+	}
+	YPCLNT_DEBUG("domain '%s'", ypclnt->domain);
+
+	/* map must be specified */
+	if (ypclnt->map == NULL) {
+		ypclnt_error(ypclnt, __func__,
+		    "caller must specify map name");
+		return (-1);
+	}
+	YPCLNT_DEBUG("map '%s'", ypclnt->map);
+
+	/* get master server for requested map unless specified */
+	if (ypclnt->server == NULL) {
+		r = yp_master(ypclnt->domain, ypclnt->map, &ypclnt->server);
+		if (r != 0) {
+			ypclnt_error(ypclnt, __func__,
+			    "can't get NIS server name: %s", yperr_string(r));
+			return (-1);
+		}
+	}
+	YPCLNT_DEBUG("server '%s'", ypclnt->server);
+
+	ypclnt_error(ypclnt, NULL, NULL);
+	return (0);
+}
diff --git a/lib/libypclnt/ypclnt_error.c b/lib/libypclnt/ypclnt_error.c
new file mode 100644
index 0000000..a7d986f
--- /dev/null
+++ b/lib/libypclnt/ypclnt_error.c
@@ -0,0 +1,59 @@
+/*-
+ * Copyright (c) 2002 Networks Associates Technology, Inc.
+ * All rights reserved.
+ *
+ * This software was developed for the FreeBSD Project by ThinkSec AS and
+ * NAI Labs, the Security Research Division of Network Associates, Inc.
+ * under DARPA/SPAWAR contract N66001-01-C-8035 ("CBOSS"), as part of the
+ * DARPA CHATS research program.
+ *
+ * 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 AND CONTRIBUTORS ``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 OR CONTRIBUTORS 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.
+ *
+ * $FreeBSD$
+ */
+
+#include <stdarg.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+#include "ypclnt.h"
+
+void
+ypclnt_error(ypclnt_t *ypclnt, const char *func, const char *fmt, ...)
+{
+	char *errmsg;
+	va_list ap;
+
+	free(ypclnt->error);
+	ypclnt->error = NULL;
+	if (fmt == NULL)
+		return;
+
+	va_start(ap, fmt);
+	vasprintf(&errmsg, fmt, ap);
+	va_end(ap);
+	asprintf(&ypclnt->error, "%s(): %s", func, errmsg);
+	free(errmsg);
+}
diff --git a/lib/libypclnt/ypclnt_free.c b/lib/libypclnt/ypclnt_free.c
new file mode 100644
index 0000000..f5e78a4
--- /dev/null
+++ b/lib/libypclnt/ypclnt_free.c
@@ -0,0 +1,51 @@
+/*-
+ * Copyright (c) 2002 Networks Associates Technology, Inc.
+ * All rights reserved.
+ *
+ * This software was developed for the FreeBSD Project by ThinkSec AS and
+ * NAI Labs, the Security Research Division of Network Associates, Inc.
+ * under DARPA/SPAWAR contract N66001-01-C-8035 ("CBOSS"), as part of the
+ * DARPA CHATS research program.
+ *
+ * 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 AND CONTRIBUTORS ``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 OR CONTRIBUTORS 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.
+ *
+ * $FreeBSD$
+ */
+
+#include <stdlib.h>
+
+#include "ypclnt.h"
+
+void
+ypclnt_free(ypclnt_t *ypclnt)
+{
+	if (ypclnt != NULL) {
+		free(ypclnt->domain);
+		free(ypclnt->map);
+		free(ypclnt->server);
+		free(ypclnt->error);
+		free(ypclnt);
+	}
+}
diff --git a/lib/libypclnt/ypclnt_get.c b/lib/libypclnt/ypclnt_get.c
new file mode 100644
index 0000000..8a70971
--- /dev/null
+++ b/lib/libypclnt/ypclnt_get.c
@@ -0,0 +1,52 @@
+/*-
+ * Copyright (c) 2002 Networks Associates Technology, Inc.
+ * All rights reserved.
+ *
+ * This software was developed for the FreeBSD Project by ThinkSec AS and
+ * NAI Labs, the Security Research Division of Network Associates, Inc.
+ * under DARPA/SPAWAR contract N66001-01-C-8035 ("CBOSS"), as part of the
+ * DARPA CHATS research program.
+ *
+ * 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 AND CONTRIBUTORS ``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 OR CONTRIBUTORS 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.
+ *
+ * $FreeBSD$
+ */
+
+#include "ypclnt.h"
+
+char *
+ypclnt_get(ypclnt_t *ypc, const char *key)
+{
+	char *value;
+	int len, r;
+
+	r = yp_match(ypc->domain, ypc->map,
+	    key, (int)strlen(key), &value, &len);
+	if (r != 0) {
+		ypclnt_error(ypc, __func__, "%s", yperr_string(r));
+		return (NULL);
+	}
+	return (value);
+}
diff --git a/lib/libypclnt/ypclnt_new.c b/lib/libypclnt/ypclnt_new.c
new file mode 100644
index 0000000..650cfdd
--- /dev/null
+++ b/lib/libypclnt/ypclnt_new.c
@@ -0,0 +1,62 @@
+/*-
+ * Copyright (c) 2002 Networks Associates Technology, Inc.
+ * All rights reserved.
+ *
+ * This software was developed for the FreeBSD Project by ThinkSec AS and
+ * NAI Labs, the Security Research Division of Network Associates, Inc.
+ * under DARPA/SPAWAR contract N66001-01-C-8035 ("CBOSS"), as part of the
+ * DARPA CHATS research program.
+ *
+ * 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 AND CONTRIBUTORS ``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 OR CONTRIBUTORS 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.
+ *
+ * $FreeBSD$
+ */
+
+#include <stdlib.h>
+#include <string.h>
+
+#include "ypclnt.h"
+
+ypclnt_t *
+ypclnt_new(const char *domain, const char *map, const char *server)
+{
+	ypclnt_t *ypclnt;
+
+	if ((ypclnt = calloc(1, sizeof *ypclnt)) == NULL)
+		return (NULL);
+	if (domain != NULL && (ypclnt->domain = strdup(domain)) == NULL)
+		goto fail;
+	if (map != NULL && (ypclnt->map = strdup(map)) == NULL)
+		goto fail;
+	if (server != NULL && (ypclnt->server = strdup(server)) == NULL)
+		goto fail;
+	return (ypclnt);
+ fail:
+	free(ypclnt->domain);
+	free(ypclnt->map);
+	free(ypclnt->server);
+	free(ypclnt);
+	return (NULL);
+}
diff --git a/lib/libypclnt/ypclnt_passwd.c b/lib/libypclnt/ypclnt_passwd.c
new file mode 100644
index 0000000..b472db0
--- /dev/null
+++ b/lib/libypclnt/ypclnt_passwd.c
@@ -0,0 +1,129 @@
+/*-
+ * Copyright (c) 2002 Networks Associates Technology, Inc.
+ * All rights reserved.
+ *
+ * This software was developed for the FreeBSD Project by ThinkSec AS and
+ * NAI Labs, the Security Research Division of Network Associates, Inc.
+ * under DARPA/SPAWAR contract N66001-01-C-8035 ("CBOSS"), as part of the
+ * DARPA CHATS research program.
+ *
+ * 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 AND CONTRIBUTORS ``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 OR CONTRIBUTORS 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.
+ *
+ * $FreeBSD$
+ */
+
+#include <err.h>
+#include <errno.h>
+#include <pwd.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include <rpcsvc/ypclnt.h>
+#include <rpcsvc/yppasswd.h>
+
+#include "ypclnt.h"
+
+int
+ypclnt_passwd(ypclnt_t *ypclnt, const struct passwd *pwd, const char *passwd)
+{
+	struct yppasswd yppwd;
+	struct rpc_err rpcerr;
+	CLIENT *clnt = NULL;
+	int ret, *result;
+
+	/* check that rpc.yppasswdd is running */
+	if (getrpcport(ypclnt->server, YPPASSWDPROG,
+		YPPASSWDPROC_UPDATE, IPPROTO_UDP) == 0) {
+		ypclnt_error(ypclnt, __func__, "no rpc.yppasswdd on server");
+		return (-1);
+	}
+
+	/* fill the yppasswd structure */
+	memset(&yppwd, 0, sizeof yppwd);
+	yppwd.newpw.pw_uid = pwd->pw_uid;
+	yppwd.newpw.pw_gid = pwd->pw_gid;
+	if ((yppwd.newpw.pw_name = strdup(pwd->pw_name)) == NULL ||
+	    (yppwd.newpw.pw_passwd = strdup(pwd->pw_passwd)) == NULL ||
+	    (yppwd.newpw.pw_gecos = strdup(pwd->pw_gecos)) == NULL ||
+	    (yppwd.newpw.pw_dir = strdup(pwd->pw_dir)) == NULL ||
+	    (yppwd.newpw.pw_shell = strdup(pwd->pw_shell)) == NULL ||
+	    (yppwd.oldpass = strdup(passwd)) == NULL) {
+		ypclnt_error(ypclnt, __func__, strerror(errno));
+		ret = -1;
+		goto done;
+	}
+
+	/* connect to rpc.yppasswdd */
+	clnt = clnt_create(ypclnt->server, YPPASSWDPROG, YPPASSWDVERS, "udp");
+	if (clnt == NULL) {
+		ypclnt_error(ypclnt, __func__,
+		    "failed to connect to rpc.yppasswdd: %s",
+		    clnt_spcreateerror(ypclnt->server));
+		ret = -1;
+		goto done;
+	}
+	clnt->cl_auth = authunix_create_default();
+
+	/* request the update */
+	result = yppasswdproc_update_1(&yppwd, clnt);
+
+	/* check for RPC errors */
+	clnt_geterr(clnt, &rpcerr);
+	if (rpcerr.re_status != RPC_SUCCESS) {
+		ypclnt_error(ypclnt, __func__,
+		    "NIS password update failed: %s",
+		    clnt_sperror(clnt, ypclnt->server));
+		ret = -1;
+		goto done;
+	}
+
+	/* check the result of the update */
+	if (result == NULL || *result != 0) {
+		ypclnt_error(ypclnt, __func__,
+		    "NIS password update failed");
+		/* XXX how do we get more details? */
+		ret = -1;
+		goto done;
+	}
+
+	ypclnt_error(ypclnt, NULL, NULL);
+	ret = 0;
+
+ done:
+	if (clnt != NULL) {
+		auth_destroy(clnt->cl_auth);
+		clnt_destroy(clnt);
+	}
+	free(yppwd.newpw.pw_name);
+	free(yppwd.newpw.pw_passwd);
+	free(yppwd.newpw.pw_gecos);
+	free(yppwd.newpw.pw_dir);
+	free(yppwd.newpw.pw_shell);
+	if (yppwd.oldpass != NULL) {
+		memset(yppwd.oldpass, 0, strlen(yppwd.oldpass));
+		free(yppwd.oldpass);
+	}
+	return (ret);
+}