diff --git a/main/libtirpc/APKBUILD b/main/libtirpc/APKBUILD
index c9b2a21ed144213242c7504298f2e85f3e8c549f..563ccde06568480298ca1100ec9e5f5c911e72e0 100644
--- a/main/libtirpc/APKBUILD
+++ b/main/libtirpc/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=libtirpc
-pkgver=0.3.2
-pkgrel=2
+pkgver=1.0.1
+pkgrel=0
pkgdesc="Transport Independent RPC library (SunRPC replacement)"
url="http://libtirpc.sourceforge.net/"
arch="all"
@@ -11,17 +11,11 @@ depends_dev="krb5-dev bsd-compat-headers"
makedepends="$depends_dev autoconf automake libtool linux-headers"
subpackages="$pkgname-dev $pkgname-doc $pkgname-dbg"
source="http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2
- nis.h
- musl-fixes.patch
+ git.patch
"
prepare() {
cd "$srcdir"/$pkgname-$pkgver
-
- # uclibc/musl does not provide nis.h so provide our own
- mkdir src/rpcsvc
- cp "$srcdir"/nis.h src/rpcsvc/
-
for i in $source; do
case $i in
*.patch)
@@ -49,12 +43,9 @@ package() {
make DESTDIR="$pkgdir" install || return 1
}
-md5sums="373d5ad46b1d19759ec763a9f0afcf4d libtirpc-0.3.2.tar.bz2
-821394d42c2a666d9b69452b4cc444b5 nis.h
-80b104bc7c7ec96825120aaf38c44693 musl-fixes.patch"
-sha256sums="2008a379f37f2c5d5a87a568b06707422cc3e4f5da305f7fb71f3f4c6d473ffc libtirpc-0.3.2.tar.bz2
-82657302b530628afd5866b76fc338956ca011d11e995cf6dea5d8b0493278eb nis.h
-c9790cfd760fb6ee96e18cc224055a96c2533ef22c1175ad9e019e7e8289b607 musl-fixes.patch"
-sha512sums="f7a58826f0d873e3d67238ff723d6edcdcc00d64daee26c7ec1c967b237e555b0c73aa5baedab9573c0c0799ac4b652956f2bbe4aad247dfbeb7e3da0942a030 libtirpc-0.3.2.tar.bz2
-83be3277aa7539d454273d7579827ff09e6b927e21de0af8a9290733b4bdfdcebfef26c9faffffd005a7631eae8beb4db9f60787f08db92fdd140686fe160c47 nis.h
-8f9c434a7ed5cf08616ea9133bbb812d58be6964e616e3f4ee0e0794df9b04bb42399e55d17a81fe696d3d39738afccab2060a32128a92bbee8356b5e8a4ad12 musl-fixes.patch"
+md5sums="36ce1c0ff80863bb0839d54aa0b94014 libtirpc-1.0.1.tar.bz2
+43be5566ae65d498938688a713472193 git.patch"
+sha256sums="5156974f31be7ccbc8ab1de37c4739af6d9d42c87b1d5caf4835dda75fcbb89e libtirpc-1.0.1.tar.bz2
+0a62de190d38660efff0ddbb73b5b6315fdc015c20cf9c235e35c0cf7eeb0e85 git.patch"
+sha512sums="c9b449e737bc2bd3d56e31e8352f312e89a7ec2a11b73b5ac314e7d82d3b644c611e422b623912453b67b668f86a6de7bb7f18c9495dd15de8e2798ec2ff41c8 libtirpc-1.0.1.tar.bz2
+4dd540470e9a25b5df0ea2c883dd647f26b71ed82e880c7efa4eed51dd98b898e18964a3ee998ceeadf39caed0a661f110f72157ec70584e33131d0a0f375a00 git.patch"
diff --git a/main/libtirpc/git.patch b/main/libtirpc/git.patch
new file mode 100644
index 0000000000000000000000000000000000000000..e45856338665402216c447cca1898f0f0010ffb9
--- /dev/null
+++ b/main/libtirpc/git.patch
@@ -0,0 +1,842 @@
+diff --git a/.gitignore b/.gitignore
+index b7814a3..ef97e01 100644
+--- a/.gitignore
++++ b/.gitignore
+@@ -34,6 +34,9 @@ libtirpc.pc
+ lib*.a
+ src/libtirpc.la
+ src/libtirpc_la-*.lo
++tirpc/stamp-h2
++tirpc/tirpc-features.h
++
+ # generic editor backup et al
+ *~
+ .stgitmail.txt
+diff --git a/src/Makefile.am b/src/Makefile.am
+index e4ed8aa..fba2aa4 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -24,7 +24,7 @@ libtirpc_la_SOURCES = auth_none.c auth_unix.c authunix_prot.c bindresvport.c cln
+ rpcb_st_xdr.c svc.c svc_auth.c svc_dg.c svc_auth_unix.c svc_auth_none.c \
+ svc_auth_des.c \
+ svc_generic.c svc_raw.c svc_run.c svc_simple.c svc_vc.c getpeereid.c \
+- auth_time.c auth_des.c authdes_prot.c debug.c
++ auth_time.c auth_des.c authdes_prot.c debug.c des_crypt.c des_impl.c
+
+ ## XDR
+ libtirpc_la_SOURCES += xdr.c xdr_rec.c xdr_array.c xdr_float.c xdr_mem.c xdr_reference.c xdr_stdio.c xdr_sizeof.c
+diff --git a/src/auth_des.c b/src/auth_des.c
+index 4d3639e..af2f61f 100644
+--- a/src/auth_des.c
++++ b/src/auth_des.c
+@@ -46,8 +46,8 @@
+ #include <rpc/clnt.h>
+ #include <rpc/xdr.h>
+ #include <sys/socket.h>
+-#undef NIS
+-#include <rpcsvc/nis.h>
++
++#include "nis.h"
+
+ #if defined(LIBC_SCCS) && !defined(lint)
+ #endif
+diff --git a/src/auth_gss.c b/src/auth_gss.c
+index 9b88c38..5959893 100644
+--- a/src/auth_gss.c
++++ b/src/auth_gss.c
+@@ -526,6 +526,14 @@ _rpc_gss_refresh(AUTH *auth, rpc_gss_options_ret_t *options_ret)
+ gr.gr_major != GSS_S_CONTINUE_NEEDED)) {
+ options_ret->major_status = gr.gr_major;
+ options_ret->minor_status = gr.gr_minor;
++ if (call_stat != RPC_SUCCESS) {
++ struct rpc_err err;
++ clnt_geterr(gd->clnt, &err);
++ LIBTIRPC_DEBUG(1, ("authgss_refresh: %s errno: %s",
++ clnt_sperrno(call_stat), strerror(err.re_errno)));
++ } else
++ gss_log_status("authgss_refresh:",
++ gr.gr_major, gr.gr_minor);
+ return FALSE;
+ }
+
+diff --git a/src/auth_time.c b/src/auth_time.c
+index 10e58eb..7f83ab4 100644
+--- a/src/auth_time.c
++++ b/src/auth_time.c
+@@ -44,8 +44,8 @@
+ #include <rpc/rpcb_prot.h>
+ //#include <clnt_soc.h>
+ #include <sys/select.h>
+-#undef NIS
+-#include <rpcsvc/nis.h>
++
++#include "nis.h"
+
+
+ #ifdef TESTING
+diff --git a/src/clnt_vc.c b/src/clnt_vc.c
+index a72f9f7..a5fbe2f 100644
+--- a/src/clnt_vc.c
++++ b/src/clnt_vc.c
+@@ -72,6 +72,8 @@
+ #define CMGROUP_MAX 16
+ #define SCM_CREDS 0x03 /* process creds (struct cmsgcred) */
+
++#undef rpc_createerr /* make it clear it is a thread safe variable */
++
+ /*
+ * Credentials structure, used to verify the identity of a peer
+ * process that has sent us a message. This is allocated by the
+@@ -188,10 +190,11 @@ clnt_vc_create(fd, raddr, prog, vers, sendsz, recvsz)
+ cl = (CLIENT *)mem_alloc(sizeof (*cl));
+ ct = (struct ct_data *)mem_alloc(sizeof (*ct));
+ if ((cl == (CLIENT *)NULL) || (ct == (struct ct_data *)NULL)) {
++ struct rpc_createerr *ce = &get_rpc_createerr();
++ ce->cf_stat = RPC_SYSTEMERROR;
++ ce->cf_error.re_errno = errno;
+ (void) syslog(LOG_ERR, clnt_vc_errstr,
+ clnt_vc_str, __no_mem_str);
+- rpc_createerr.cf_stat = RPC_SYSTEMERROR;
+- rpc_createerr.cf_error.re_errno = errno;
+ goto err;
+ }
+ ct->ct_addr.buf = NULL;
+@@ -230,26 +233,29 @@ clnt_vc_create(fd, raddr, prog, vers, sendsz, recvsz)
+ assert(vc_cv != (cond_t *) NULL);
+
+ /*
+- * XXX - fvdl connecting while holding a mutex?
++ * Do not hold mutex during connect
+ */
++ mutex_unlock(&clnt_fd_lock);
++
+ slen = sizeof ss;
+ if (getpeername(fd, (struct sockaddr *)&ss, &slen) < 0) {
+ if (errno != ENOTCONN) {
+- rpc_createerr.cf_stat = RPC_SYSTEMERROR;
+- rpc_createerr.cf_error.re_errno = errno;
+- mutex_unlock(&clnt_fd_lock);
++ struct rpc_createerr *ce = &get_rpc_createerr();
++ ce->cf_stat = RPC_SYSTEMERROR;
++ ce->cf_error.re_errno = errno;
+ thr_sigsetmask(SIG_SETMASK, &(mask), NULL);
+ goto err;
+ }
+ if (connect(fd, (struct sockaddr *)raddr->buf, raddr->len) < 0){
+- rpc_createerr.cf_stat = RPC_SYSTEMERROR;
+- rpc_createerr.cf_error.re_errno = errno;
+- mutex_unlock(&clnt_fd_lock);
+- thr_sigsetmask(SIG_SETMASK, &(mask), NULL);
+- goto err;
++ if (errno != EISCONN) {
++ struct rpc_createerr *ce = &get_rpc_createerr();
++ ce->cf_stat = RPC_SYSTEMERROR;
++ ce->cf_error.re_errno = errno;
++ thr_sigsetmask(SIG_SETMASK, &(mask), NULL);
++ goto err;
++ }
+ }
+ }
+- mutex_unlock(&clnt_fd_lock);
+ if (!__rpc_fd2sockinfo(fd, &si))
+ goto err;
+ thr_sigsetmask(SIG_SETMASK, &(mask), NULL);
+diff --git a/src/des_impl.c b/src/des_impl.c
+index c5b7ed6..15bec2a 100644
+--- a/src/des_impl.c
++++ b/src/des_impl.c
+@@ -6,7 +6,8 @@
+ /* see <http://www.gnu.org/licenses/> to obtain a copy. */
+ #include <string.h>
+ #include <stdint.h>
+-#include <rpc/rpc_des.h>
++#include <sys/types.h>
++#include <rpc/des.h>
+
+
+ static const uint32_t des_SPtrans[8][64] =
+@@ -587,7 +588,7 @@ _des_crypt (char *buf, unsigned len, struct desparams *desp)
+ }
+ tin0 = tin1 = tout0 = tout1 = xor0 = xor1 = 0;
+ tbuf[0] = tbuf[1] = 0;
+- __bzero (schedule, sizeof (schedule));
++ memset (schedule, 0, sizeof (schedule));
+
+ return (1);
+ }
+diff --git a/src/getpublickey.c b/src/getpublickey.c
+index 764a5f9..8cf4dc2 100644
+--- a/src/getpublickey.c
++++ b/src/getpublickey.c
+@@ -38,8 +38,10 @@
+ #include <pwd.h>
+ #include <rpc/rpc.h>
+ #include <rpc/key_prot.h>
++#ifdef YP
+ #include <rpcsvc/yp_prot.h>
+ #include <rpcsvc/ypclnt.h>
++#endif
+ #include <string.h>
+ #include <stdlib.h>
+
+diff --git a/src/getrpcport.c b/src/getrpcport.c
+index b452c99..c28cd61 100644
+--- a/src/getrpcport.c
++++ b/src/getrpcport.c
+@@ -57,8 +57,8 @@ getrpcport(host, prognum, versnum, proto)
+ memset(&addr, 0, sizeof(addr));
+ addr.sin_family = AF_INET;
+ addr.sin_port = 0;
+- if (hp->h_length > sizeof(addr))
+- hp->h_length = sizeof(addr);
++ if (hp->h_length > sizeof(addr.sin_addr.s_addr))
++ hp->h_length = sizeof(addr.sin_addr.s_addr);
+ memcpy(&addr.sin_addr.s_addr, hp->h_addr, (size_t)hp->h_length);
+ /* Inconsistent interfaces need casts! :-( */
+ return (pmap_getport(&addr, (u_long)prognum, (u_long)versnum,
+diff --git a/src/nis.h b/src/nis.h
+new file mode 100644
+index 0000000..588c041
+--- /dev/null
++++ b/src/nis.h
+@@ -0,0 +1,70 @@
++/*
++ * Copyright (c) 2010, Oracle America, Inc.
++ *
++ * Redistribution and use in source and binary forms, with or without
++ * modification, are permitted provided that the following conditions are
++ * met:
++ *
++ * * Redistributions of source code must retain the above copyright
++ * notice, this list of conditions and the following disclaimer.
++ * * 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.
++ * * Neither the name of the "Oracle America, Inc." nor the names of its
++ * contributors may be used to endorse or promote products derived
++ * from this software without specific prior written permission.
++ *
++ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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
++ * COPYRIGHT HOLDER 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.
++ */
++
++#ifndef _INTERNAL_NIS_H
++#define _INTERNAL_NIS_H 1
++
++/* This file only contains the definition of nis_server, to be
++ able to compile libtirpc without the need to have a glibc
++ with sunrpc or a libnsl already installed. */
++
++#define NIS_PK_NONE 0
++
++struct nis_attr {
++ char *zattr_ndx;
++ struct {
++ u_int zattr_val_len;
++ char *zattr_val_val;
++ } zattr_val;
++};
++typedef struct nis_attr nis_attr;
++
++typedef char *nis_name;
++
++struct endpoint {
++ char *uaddr;
++ char *family;
++ char *proto;
++};
++typedef struct endpoint endpoint;
++
++struct nis_server {
++ nis_name name;
++ struct {
++ u_int ep_len;
++ endpoint *ep_val;
++ } ep;
++ uint32_t key_type;
++ netobj pkey;
++};
++typedef struct nis_server nis_server;
++
++#endif /* ! _INTERNAL_NIS_H */
+diff --git a/src/rpc_dtablesize.c b/src/rpc_dtablesize.c
+index 13d320c..3fe503a 100644
+--- a/src/rpc_dtablesize.c
++++ b/src/rpc_dtablesize.c
+@@ -27,22 +27,14 @@
+ */
+
+ #include <unistd.h>
+-
+ #include <sys/select.h>
+-
+-int _rpc_dtablesize(void); /* XXX */
++#include <rpc/clnt.h>
++#include <rpc/rpc_com.h>
+
+ /*
+ * Cache the result of getdtablesize(), so we don't have to do an
+ * expensive system call every time.
+ */
+-/*
+- * XXX In FreeBSD 2.x, you can have the maximum number of open file
+- * descriptors be greater than FD_SETSIZE (which us 256 by default).
+- *
+- * Since old programs tend to use this call to determine the first arg
+- * for _select(), having this return > FD_SETSIZE is a Bad Idea(TM)!
+- */
+ int
+ _rpc_dtablesize(void)
+ {
+diff --git a/src/rpc_soc.c b/src/rpc_soc.c
+index 1ec7b3f..ed0892a 100644
+--- a/src/rpc_soc.c
++++ b/src/rpc_soc.c
+@@ -61,8 +61,8 @@
+ #include <string.h>
+ #include <unistd.h>
+ #include <fcntl.h>
+-#include <rpcsvc/nis.h>
+
++#include "nis.h"
+ #include "rpc_com.h"
+
+ extern mutex_t rpcsoc_lock;
+diff --git a/src/rtime.c b/src/rtime.c
+index c34e0af..b642840 100644
+--- a/src/rtime.c
++++ b/src/rtime.c
+@@ -46,6 +46,7 @@
+ #include <unistd.h>
+ #include <errno.h>
+ #include <sys/types.h>
++#include <sys/poll.h>
+ #include <sys/socket.h>
+ #include <sys/time.h>
+ #include <netinet/in.h>
+@@ -67,7 +68,8 @@ rtime(addrp, timep, timeout)
+ struct timeval *timeout;
+ {
+ int s;
+- fd_set readfds;
++ struct pollfd fd;
++ int milliseconds;
+ int res;
+ unsigned long thetime;
+ struct sockaddr_in from;
+@@ -94,31 +96,32 @@ rtime(addrp, timep, timeout)
+ addrp->sin_port = serv->s_port;
+
+ if (type == SOCK_DGRAM) {
+- res = sendto(s, (char *)&thetime, sizeof(thetime), 0,
++ res = sendto(s, (char *)&thetime, sizeof(thetime), 0,
+ (struct sockaddr *)addrp, sizeof(*addrp));
+ if (res < 0) {
+ do_close(s);
+- return(-1);
++ return(-1);
+ }
+- do {
+- FD_ZERO(&readfds);
+- FD_SET(s, &readfds);
+- res = select(_rpc_dtablesize(), &readfds,
+- (fd_set *)NULL, (fd_set *)NULL, timeout);
+- } while (res < 0 && errno == EINTR);
++
++ milliseconds = (timeout->tv_sec * 1000) + (timeout->tv_usec / 1000);
++ fd.fd = s;
++ fd.events = POLLIN;
++ do
++ res = poll (&fd, 1, milliseconds);
++ while (res < 0 && errno == EINTR);
+ if (res <= 0) {
+ if (res == 0) {
+ errno = ETIMEDOUT;
+ }
+ do_close(s);
+- return(-1);
++ return(-1);
+ }
+ fromlen = sizeof(from);
+- res = recvfrom(s, (char *)&thetime, sizeof(thetime), 0,
++ res = recvfrom(s, (char *)&thetime, sizeof(thetime), 0,
+ (struct sockaddr *)&from, &fromlen);
+ do_close(s);
+ if (res < 0) {
+- return(-1);
++ return(-1);
+ }
+ } else {
+ if (connect(s, (struct sockaddr *)addrp, sizeof(*addrp)) < 0) {
+diff --git a/src/svc.c b/src/svc.c
+index 9c41445..b59467b 100644
+--- a/src/svc.c
++++ b/src/svc.c
+@@ -99,7 +99,7 @@ xprt_register (xprt)
+ {
+ __svc_xports = (SVCXPRT **) calloc (_rpc_dtablesize(), sizeof (SVCXPRT *));
+ if (__svc_xports == NULL)
+- return;
++ goto unlock;
+ }
+ if (sock < _rpc_dtablesize())
+ {
+@@ -120,14 +120,14 @@ xprt_register (xprt)
+ svc_pollfd[i].fd = sock;
+ svc_pollfd[i].events = (POLLIN | POLLPRI |
+ POLLRDNORM | POLLRDBAND);
+- return;
++ goto unlock;
+ }
+
+ new_svc_pollfd = (struct pollfd *) realloc (svc_pollfd,
+ sizeof (struct pollfd)
+ * (svc_max_pollfd + 1));
+ if (new_svc_pollfd == NULL) /* Out of memory */
+- return;
++ goto unlock;
+ svc_pollfd = new_svc_pollfd;
+ ++svc_max_pollfd;
+
+@@ -135,6 +135,7 @@ xprt_register (xprt)
+ svc_pollfd[svc_max_pollfd - 1].events = (POLLIN | POLLPRI |
+ POLLRDNORM | POLLRDBAND);
+ }
++unlock:
+ rwlock_unlock (&svc_fd_lock);
+ }
+
+diff --git a/src/svc_auth_des.c b/src/svc_auth_des.c
+index 5bc264c..2e90146 100644
+--- a/src/svc_auth_des.c
++++ b/src/svc_auth_des.c
+@@ -86,13 +86,13 @@ static struct cache_entry *authdes_cache/* [AUTHDES_CACHESZ] */;
+ static short *authdes_lru/* [AUTHDES_CACHESZ] */;
+
+ static void cache_init(); /* initialize the cache */
+-static short cache_spot(); /* find an entry in the cache */
+-static void cache_ref(/*short sid*/); /* note that sid was ref'd */
++static short cache_spot(des_block *key, char *name, struct timeval *timestamp); /* find an entry in the cache */
++static void cache_ref(short sid); /* note that sid was ref'd */
+
+-static void invalidate(); /* invalidate entry in cache */
++static void invalidate(char *cred); /* invalidate entry in cache */
+
+ /*
+- * cache statistics
++ * cache statistics
+ */
+ static struct {
+ u_long ncachehits; /* times cache hit, and is not replay */
+diff --git a/src/svc_auth_gss.c b/src/svc_auth_gss.c
+index b6aa407..bece46a 100644
+--- a/src/svc_auth_gss.c
++++ b/src/svc_auth_gss.c
+@@ -129,6 +129,8 @@ struct svc_rpc_gss_data {
+ ((struct svc_rpc_gss_data *)(auth)->svc_ah_private)
+
+ /* Global server credentials. */
++static u_int _svcauth_req_time = 0;
++static gss_OID_set_desc _svcauth_oid_set = {1, GSS_C_NULL_OID };
+ static gss_cred_id_t _svcauth_gss_creds;
+ static gss_name_t _svcauth_gss_name = GSS_C_NO_NAME;
+ static char * _svcauth_svc_name = NULL;
+@@ -167,6 +169,7 @@ svcauth_gss_import_name(char *service)
+ gss_name_t name;
+ gss_buffer_desc namebuf;
+ OM_uint32 maj_stat, min_stat;
++ bool_t result;
+
+ gss_log_debug("in svcauth_gss_import_name()");
+
+@@ -181,22 +184,21 @@ svcauth_gss_import_name(char *service)
+ maj_stat, min_stat);
+ return (FALSE);
+ }
+- if (svcauth_gss_set_svc_name(name) != TRUE) {
+- gss_release_name(&min_stat, &name);
+- return (FALSE);
+- }
+- return (TRUE);
++ result = svcauth_gss_set_svc_name(name);
++ gss_release_name(&min_stat, &name);
++ return result;
+ }
+
+ static bool_t
+-svcauth_gss_acquire_cred(u_int req_time, gss_OID_set_desc *oid_set)
++svcauth_gss_acquire_cred(void)
+ {
+ OM_uint32 maj_stat, min_stat;
+
+ gss_log_debug("in svcauth_gss_acquire_cred()");
+
+- maj_stat = gss_acquire_cred(&min_stat, _svcauth_gss_name, req_time,
+- oid_set, GSS_C_ACCEPT,
++ maj_stat = gss_acquire_cred(&min_stat, _svcauth_gss_name,
++ _svcauth_req_time, &_svcauth_oid_set,
++ GSS_C_ACCEPT,
+ &_svcauth_gss_creds, NULL, NULL);
+
+ if (maj_stat != GSS_S_COMPLETE) {
+@@ -300,6 +302,8 @@ svcauth_gss_accept_sec_context(struct svc_req *rqst,
+ NULL,
+ &gd->deleg);
+
++ xdr_free((xdrproc_t)xdr_rpc_gss_init_args, (caddr_t)&recv_tok);
++
+ if (gr->gr_major != GSS_S_COMPLETE &&
+ gr->gr_major != GSS_S_CONTINUE_NEEDED) {
+ gss_log_status("svcauth_gss_accept_sec_context: accept_sec_context",
+@@ -352,8 +356,11 @@ svcauth_gss_accept_sec_context(struct svc_req *rqst,
+ return (FALSE);
+
+ rqst->rq_xprt->xp_verf.oa_flavor = RPCSEC_GSS;
+- rqst->rq_xprt->xp_verf.oa_base = checksum.value;
++ memcpy(rqst->rq_xprt->xp_verf.oa_base, checksum.value,
++ checksum.length);
+ rqst->rq_xprt->xp_verf.oa_length = checksum.length;
++
++ gss_release_buffer(&min_stat, &checksum);
+ }
+ return (TRUE);
+ }
+@@ -435,10 +442,13 @@ svcauth_gss_nextverf(struct svc_req *rqst, u_int num)
+ maj_stat, min_stat);
+ return (FALSE);
+ }
++
+ rqst->rq_xprt->xp_verf.oa_flavor = RPCSEC_GSS;
+- rqst->rq_xprt->xp_verf.oa_base = (caddr_t)checksum.value;
++ memcpy(rqst->rq_xprt->xp_verf.oa_base, checksum.value, checksum.length);
+ rqst->rq_xprt->xp_verf.oa_length = (u_int)checksum.length;
+
++ gss_release_buffer(&min_stat, &checksum);
++
+ return (TRUE);
+ }
+
+@@ -568,6 +578,8 @@ _svcauth_gss(struct svc_req *rqst, struct rpc_msg *msg, bool_t *no_dispatch)
+ gss_qop_t qop;
+ struct svcauth_gss_cache_entry **ce;
+ time_t now;
++ enum auth_stat result = AUTH_OK;
++ OM_uint32 min_stat;
+
+ gss_log_debug("in svcauth_gss()");
+
+@@ -621,19 +633,25 @@ _svcauth_gss(struct svc_req *rqst, struct rpc_msg *msg, bool_t *no_dispatch)
+ XDR_DESTROY(&xdrs);
+
+ /* Check version. */
+- if (gc->gc_v != RPCSEC_GSS_VERSION)
+- return (AUTH_BADCRED);
++ if (gc->gc_v != RPCSEC_GSS_VERSION) {
++ result = AUTH_BADCRED;
++ goto out;
++ }
+
+ /* Check RPCSEC_GSS service. */
+ if (gc->gc_svc != RPCSEC_GSS_SVC_NONE &&
+ gc->gc_svc != RPCSEC_GSS_SVC_INTEGRITY &&
+- gc->gc_svc != RPCSEC_GSS_SVC_PRIVACY)
+- return (AUTH_BADCRED);
++ gc->gc_svc != RPCSEC_GSS_SVC_PRIVACY) {
++ result = AUTH_BADCRED;
++ goto out;
++ }
+
+ /* Check sequence number. */
+ if (gd->established) {
+- if (gc->gc_seq > MAXSEQ)
+- return (RPCSEC_GSS_CTXPROBLEM);
++ if (gc->gc_seq > MAXSEQ) {
++ result = RPCSEC_GSS_CTXPROBLEM;
++ goto out;
++ }
+
+ if ((offset = gd->seqlast - gc->gc_seq) < 0) {
+ gd->seqlast = gc->gc_seq;
+@@ -643,7 +661,8 @@ _svcauth_gss(struct svc_req *rqst, struct rpc_msg *msg, bool_t *no_dispatch)
+ }
+ else if (offset >= gd->win || (gd->seqmask & (1 << offset))) {
+ *no_dispatch = 1;
+- return (RPCSEC_GSS_CTXPROBLEM);
++ result = RPCSEC_GSS_CTXPROBLEM;
++ goto out;
+ }
+ gd->seq = gc->gc_seq;
+ gd->seqmask |= (1 << offset);
+@@ -654,35 +673,52 @@ _svcauth_gss(struct svc_req *rqst, struct rpc_msg *msg, bool_t *no_dispatch)
+ rqst->rq_svcname = (char *)gd->ctx;
+ }
+
++ rqst->rq_xprt->xp_verf.oa_base = msg->rm_call.cb_verf.oa_base;
++
+ /* Handle RPCSEC_GSS control procedure. */
+ switch (gc->gc_proc) {
+
+ case RPCSEC_GSS_INIT:
+ case RPCSEC_GSS_CONTINUE_INIT:
+- if (rqst->rq_proc != NULLPROC)
+- return (AUTH_FAILED); /* XXX ? */
++ if (rqst->rq_proc != NULLPROC) {
++ result = AUTH_FAILED; /* XXX ? */
++ break;
++ }
+
+ if (_svcauth_gss_name == GSS_C_NO_NAME) {
+- if (!svcauth_gss_import_name("nfs"))
+- return (AUTH_FAILED);
++ if (!svcauth_gss_import_name("nfs")) {
++ result = AUTH_FAILED;
++ break;
++ }
+ }
+
+- if (!svcauth_gss_acquire_cred(0, GSS_C_NULL_OID_SET))
+- return (AUTH_FAILED);
++ if (!svcauth_gss_acquire_cred()) {
++ result = AUTH_FAILED;
++ break;
++ }
+
+- if (!svcauth_gss_accept_sec_context(rqst, &gr))
+- return (AUTH_REJECTEDCRED);
++ if (!svcauth_gss_accept_sec_context(rqst, &gr)) {
++ result = AUTH_REJECTEDCRED;
++ break;
++ }
+
+- if (!svcauth_gss_nextverf(rqst, htonl(gr.gr_win)))
+- return (AUTH_FAILED);
++ if (!svcauth_gss_nextverf(rqst, htonl(gr.gr_win))) {
++ result = AUTH_FAILED;
++ break;
++ }
+
+ *no_dispatch = TRUE;
+
+ call_stat = svc_sendreply(rqst->rq_xprt,
+ (xdrproc_t)xdr_rpc_gss_init_res, (caddr_t)&gr);
+
+- if (!call_stat)
+- return (AUTH_FAILED);
++ gss_release_buffer(&min_stat, &gr.gr_token);
++ free(gr.gr_ctx.value);
++
++ if (!call_stat) {
++ result = AUTH_FAILED;
++ break;
++ }
+
+ if (gr.gr_major == GSS_S_COMPLETE)
+ gd->established = TRUE;
+@@ -690,27 +726,37 @@ _svcauth_gss(struct svc_req *rqst, struct rpc_msg *msg, bool_t *no_dispatch)
+ break;
+
+ case RPCSEC_GSS_DATA:
+- if (!svcauth_gss_validate(gd, msg, &qop))
+- return (RPCSEC_GSS_CREDPROBLEM);
++ if (!svcauth_gss_validate(gd, msg, &qop)) {
++ result = RPCSEC_GSS_CREDPROBLEM;
++ break;
++ }
+
+- if (!svcauth_gss_nextverf(rqst, htonl(gc->gc_seq)))
+- return (AUTH_FAILED);
++ if (!svcauth_gss_nextverf(rqst, htonl(gc->gc_seq))) {
++ result = AUTH_FAILED;
++ break;
++ }
+
+ if (!gd->callback_done) {
+ gd->callback_done = TRUE;
+ gd->sec.qop = qop;
+ (void)rpc_gss_num_to_qop(gd->rcred.mechanism,
+ gd->sec.qop, &gd->rcred.qop);
+- if (!svcauth_gss_callback(rqst, gd))
+- return (AUTH_REJECTEDCRED);
++ if (!svcauth_gss_callback(rqst, gd)) {
++ result = AUTH_REJECTEDCRED;
++ break;
++ }
+ }
+
+ if (gd->locked) {
+ if (gd->rcred.service !=
+- _rpc_gss_svc_to_service(gc->gc_svc))
+- return (AUTH_FAILED);
+- if (gd->sec.qop != qop)
+- return (AUTH_BADVERF);
++ _rpc_gss_svc_to_service(gc->gc_svc)) {
++ result = AUTH_FAILED;
++ break;
++ }
++ if (gd->sec.qop != qop) {
++ result = AUTH_BADVERF;
++ break;
++ }
+ }
+
+ if (gd->sec.qop != qop) {
+@@ -724,17 +770,25 @@ _svcauth_gss(struct svc_req *rqst, struct rpc_msg *msg, bool_t *no_dispatch)
+ break;
+
+ case RPCSEC_GSS_DESTROY:
+- if (rqst->rq_proc != NULLPROC)
+- return (AUTH_FAILED); /* XXX ? */
++ if (rqst->rq_proc != NULLPROC) {
++ result = AUTH_FAILED; /* XXX ? */
++ break;
++ }
+
+- if (!svcauth_gss_validate(gd, msg, &qop))
+- return (RPCSEC_GSS_CREDPROBLEM);
++ if (!svcauth_gss_validate(gd, msg, &qop)) {
++ result = RPCSEC_GSS_CREDPROBLEM;
++ break;
++ }
+
+- if (!svcauth_gss_nextverf(rqst, htonl(gc->gc_seq)))
+- return (AUTH_FAILED);
++ if (!svcauth_gss_nextverf(rqst, htonl(gc->gc_seq))) {
++ result = AUTH_FAILED;
++ break;
++ }
+
+- if (!svcauth_gss_release_cred())
+- return (AUTH_FAILED);
++ if (!svcauth_gss_release_cred()) {
++ result = AUTH_FAILED;
++ break;
++ }
+
+ SVCAUTH_DESTROY(&SVC_XP_AUTH(rqst->rq_xprt));
+ SVC_XP_AUTH(rqst->rq_xprt).svc_ah_ops = svc_auth_none.svc_ah_ops;
+@@ -743,10 +797,12 @@ _svcauth_gss(struct svc_req *rqst, struct rpc_msg *msg, bool_t *no_dispatch)
+ break;
+
+ default:
+- return (AUTH_REJECTEDCRED);
++ result = AUTH_REJECTEDCRED;
+ break;
+ }
+- return (AUTH_OK);
++out:
++ xdr_free((xdrproc_t)xdr_rpc_gss_cred, (caddr_t)gc);
++ return result;
+ }
+
+ static bool_t
+@@ -890,7 +946,6 @@ bool_t
+ rpc_gss_set_svc_name(char *principal, char *mechanism, u_int req_time,
+ u_int UNUSED(program), u_int UNUSED(version))
+ {
+- gss_OID_set_desc oid_set;
+ rpc_gss_OID oid;
+ char *save;
+
+@@ -902,14 +957,13 @@ rpc_gss_set_svc_name(char *principal, char *mechanism, u_int req_time,
+
+ if (!rpc_gss_mech_to_oid(mechanism, &oid))
+ goto out_err;
+- oid_set.count = 1;
+- oid_set.elements = (gss_OID)oid;
+
+ if (!svcauth_gss_import_name(principal))
+ goto out_err;
+- if (!svcauth_gss_acquire_cred(req_time, &oid_set))
+- goto out_err;
+
++ _svcauth_req_time = req_time;
++ _svcauth_oid_set.count = 1;
++ _svcauth_oid_set.elements = (gss_OID)oid;
+ free(_svcauth_svc_name);
+ _svcauth_svc_name = save;
+ return TRUE;
+diff --git a/src/svc_vc.c b/src/svc_vc.c
+index 6ae613d..97a76a3 100644
+--- a/src/svc_vc.c
++++ b/src/svc_vc.c
+@@ -270,14 +270,8 @@ makefd_xprt(fd, sendsize, recvsize)
+ struct cf_conn *cd;
+ const char *netid;
+ struct __rpc_sockinfo si;
+-
+- assert(fd != -1);
+
+- if (fd >= FD_SETSIZE) {
+- warnx("svc_vc: makefd_xprt: fd too high\n");
+- xprt = NULL;
+- goto done;
+- }
++ assert(fd != -1);
+
+ xprt = mem_alloc(sizeof(SVCXPRT));
+ if (xprt == NULL) {
+@@ -338,22 +332,10 @@ rendezvous_request(xprt, msg)
+ r = (struct cf_rendezvous *)xprt->xp_p1;
+ again:
+ len = sizeof addr;
+- if ((sock = accept(xprt->xp_fd, (struct sockaddr *)(void *)&addr,
+- &len)) < 0) {
++ sock = accept(xprt->xp_fd, (struct sockaddr *)(void *)&addr, &len);
++ if (sock < 0) {
+ if (errno == EINTR)
+ goto again;
+-
+- if (errno == EMFILE || errno == ENFILE) {
+- /* If there are no file descriptors available, then accept will fail.
+- We want to delay here so the connection request can be dequeued;
+- otherwise we can bounce between polling and accepting, never
+- giving the request a chance to dequeue and eating an enormous
+- amount of cpu time in svc_run if we're polling on many file
+- descriptors. */
+- struct timespec ts = { .tv_sec = 0, .tv_nsec = 50000000 };
+- nanosleep (&ts, NULL);
+- goto again;
+- }
+ return (FALSE);
+ }
+ /*
+diff --git a/tirpc/rpc/des.h b/tirpc/rpc/des.h
+index d2881ad..018aa48 100644
+--- a/tirpc/rpc/des.h
++++ b/tirpc/rpc/des.h
+@@ -82,6 +82,6 @@ struct desparams {
+ /*
+ * Software DES.
+ */
+-extern int _des_crypt( char *, int, struct desparams * );
++extern int _des_crypt( char *, unsigned, struct desparams * );
+
+ #endif
+diff --git a/tirpc/rpc/rpcent.h b/tirpc/rpc/rpcent.h
+index 147f909..e07503c 100644
+--- a/tirpc/rpc/rpcent.h
++++ b/tirpc/rpc/rpcent.h
+@@ -60,10 +60,11 @@ struct rpcent {
+ extern struct rpcent *getrpcbyname(const char *);
+ extern struct rpcent *getrpcbynumber(int);
+ extern struct rpcent *getrpcent(void);
+-#endif
+
+ extern void setrpcent(int);
+ extern void endrpcent(void);
++#endif
++
+ #ifdef __cplusplus
+ }
+ #endif
diff --git a/main/libtirpc/libtirpc-0.3.2-get-default-domain.patch b/main/libtirpc/libtirpc-0.3.2-get-default-domain.patch
deleted file mode 100644
index dc0635b9871bd4abb91e20c051b016af362d371a..0000000000000000000000000000000000000000
--- a/main/libtirpc/libtirpc-0.3.2-get-default-domain.patch
+++ /dev/null
@@ -1,104 +0,0 @@
-commit f7f6d01a83d136c98acbc1d7f098da25097bd0b6
-Author: Armin K <krejzi@email.com>
-Date: Thu Jun 18 11:59:18 2015 -0400
-
- __rpc_get_default_domain is undefined with LDFLAGS=-Wl,--no-undefined
-
- commit 109ccb9fe removed the __rpc_get_default_domain()
- interface which is not defined in the glibc. This
- brings the interface back.
-
- Reviewed-by: Chuck Lever <chuck.lever@oracle.com>
- Signed-off-by: Steve Dickson <steved@redhat.com>
-
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 6cc567a..66fcc6c 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -69,7 +69,7 @@ if GSS
- endif
-
- libtirpc_la_SOURCES += key_call.c key_prot_xdr.c getpublickey.c
--libtirpc_la_SOURCES += netname.c netnamer.c rtime.c
-+libtirpc_la_SOURCES += netname.c netnamer.c rpcdname.c rtime.c
-
- CLEANFILES = cscope.* *~
- DISTCLEANFILES = Makefile.in
-diff --git a/src/rpcdname.c b/src/rpcdname.c
-new file mode 100644
-index 0000000..3e6a988
---- /dev/null
-+++ b/src/rpcdname.c
-@@ -0,0 +1,72 @@
-+/*
-+ * Copyright (c) 2009, Sun Microsystems, Inc.
-+ * All rights reserved.
-+ *
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions are met:
-+ * - Redistributions of source code must retain the above copyright notice,
-+ * this list of conditions and the following disclaimer.
-+ * - 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.
-+ * - Neither the name of Sun Microsystems, Inc. nor the names of its
-+ * contributors may be used to endorse or promote products derived
-+ * from this software without specific prior written permission.
-+ *
-+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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 COPYRIGHT HOLDER 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.
-+ */
-+
-+/*
-+ * rpcdname.c
-+ * Gets the default domain name
-+ */
-+
-+#include <stdlib.h>
-+#include <unistd.h>
-+#include <string.h>
-+
-+static char *default_domain = 0;
-+
-+static char *
-+get_default_domain()
-+{
-+ char temp[256];
-+
-+ if (default_domain)
-+ return (default_domain);
-+ if (getdomainname(temp, sizeof(temp)) < 0)
-+ return (0);
-+ if ((int) strlen(temp) > 0) {
-+ default_domain = (char *)malloc((strlen(temp)+(unsigned)1));
-+ if (default_domain == 0)
-+ return (0);
-+ (void) strcpy(default_domain, temp);
-+ return (default_domain);
-+ }
-+ return (0);
-+}
-+
-+/*
-+ * This is a wrapper for the system call getdomainname which returns a
-+ * ypclnt.h error code in the failure case. It also checks to see that
-+ * the domain name is non-null, knowing that the null string is going to
-+ * get rejected elsewhere in the NIS client package.
-+ */
-+int
-+__rpc_get_default_domain(domain)
-+ char **domain;
-+{
-+ if ((*domain = get_default_domain()) != 0)
-+ return (0);
-+ return (-1);
-+}
diff --git a/main/libtirpc/musl-fixes.patch b/main/libtirpc/musl-fixes.patch
deleted file mode 100644
index 421ccb0db38822d53b84cc68f93e546228a62121..0000000000000000000000000000000000000000
--- a/main/libtirpc/musl-fixes.patch
+++ /dev/null
@@ -1,172 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index 99a0d33..efe3f3a 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -45,7 +45,7 @@ AC_HEADER_DIRENT
- AC_PREFIX_DEFAULT(/usr)
- AC_CHECK_HEADERS([arpa/inet.h fcntl.h libintl.h limits.h locale.h netdb.h netinet/in.h stddef.h stdint.h stdlib.h string.h sys/ioctl.h sys/param.h sys/socket.h sys/time.h syslog.h unistd.h features.h gssapi/gssapi_ext.h])
- AC_CHECK_LIB([pthread], [pthread_create])
--AC_CHECK_FUNCS([getrpcbyname getrpcbynumber setrpcent endrpcent getrpcent])
-+AC_CHECK_FUNCS([getrpcbyname getrpcbynumber setrpcent endrpcent getrpcent cbc_crypt ecb_crypt])
-
- AC_CONFIG_FILES([Makefile src/Makefile man/Makefile doc/Makefile])
- AC_OUTPUT(libtirpc.pc)
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 6cc567a..4ed1a55 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -51,7 +51,7 @@ libtirpc_la_SOURCES = auth_none.c auth_unix.c authunix_prot.c bindresvport.c cln
- rpc_callmsg.c rpc_generic.c rpc_soc.c rpcb_clnt.c rpcb_prot.c \
- rpcb_st_xdr.c svc.c svc_auth.c svc_dg.c svc_auth_unix.c svc_auth_none.c \
- svc_generic.c svc_raw.c svc_run.c svc_simple.c svc_vc.c getpeereid.c \
-- auth_time.c auth_des.c authdes_prot.c debug.c
-+ auth_time.c auth_des.c authdes_prot.c debug.c des_crypt.c
-
- ## XDR
- libtirpc_la_SOURCES += xdr.c xdr_rec.c xdr_array.c xdr_float.c xdr_mem.c xdr_reference.c xdr_stdio.c
-@@ -69,7 +69,7 @@ if GSS
- endif
-
- libtirpc_la_SOURCES += key_call.c key_prot_xdr.c getpublickey.c
--libtirpc_la_SOURCES += netname.c netnamer.c rtime.c
-+libtirpc_la_SOURCES += netname.c netnamer.c rtime.c rpcdname.c
-
- CLEANFILES = cscope.* *~
- DISTCLEANFILES = Makefile.in
-diff --git a/src/des_crypt.c b/src/des_crypt.c
-index 1d1badd..0aff4d5 100644
---- a/src/des_crypt.c
-+++ b/src/des_crypt.c
-@@ -67,6 +67,7 @@ static int common_crypt( char *, char *, unsigned, unsigned, struct desparams *
- /*
- * CBC mode encryption
- */
-+#ifndef HAVE_CBC_CRYPT
- int
- cbc_crypt(key, buf, len, mode, ivec)
- char *key;
-@@ -89,11 +90,13 @@ cbc_crypt(key, buf, len, mode, ivec)
- COPY8(dp.des_ivec, ivec);
- return(err);
- }
-+#endif
-
-
- /*
- * ECB mode encryption
- */
-+#ifndef HAVE_ECB_CRYPT
- int
- ecb_crypt(key, buf, len, mode)
- char *key;
-@@ -111,12 +114,14 @@ ecb_crypt(key, buf, len, mode)
- #endif
- return(common_crypt(key, buf, len, mode, &dp));
- }
-+#endif
-
-
-
- /*
- * Common code to cbc_crypt() & ecb_crypt()
- */
-+#if !defined(HAVE_CBC_CRYPT) || !defined(HAVE_ECB_CRYPT)
- static int
- common_crypt(key, buf, len, mode, desp)
- char *key;
-@@ -144,3 +149,4 @@ common_crypt(key, buf, len, mode, desp)
-
- return(desdev == DES_SW ? DESERR_NONE : DESERR_NOHWDEVICE);
- }
-+#endif
-diff --git a/src/getpublickey.c b/src/getpublickey.c
-index 764a5f9..a09acb7 100644
---- a/src/getpublickey.c
-+++ b/src/getpublickey.c
-@@ -38,8 +38,6 @@
- #include <pwd.h>
- #include <rpc/rpc.h>
- #include <rpc/key_prot.h>
--#include <rpcsvc/yp_prot.h>
--#include <rpcsvc/ypclnt.h>
- #include <string.h>
- #include <stdlib.h>
-
-diff --git a/src/rpcdname.c b/src/rpcdname.c
-new file mode 100644
-index 0000000..3e6a988
---- /dev/null
-+++ b/src/rpcdname.c
-@@ -0,0 +1,72 @@
-+/*
-+ * Copyright (c) 2009, Sun Microsystems, Inc.
-+ * All rights reserved.
-+ *
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions are met:
-+ * - Redistributions of source code must retain the above copyright notice,
-+ * this list of conditions and the following disclaimer.
-+ * - 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.
-+ * - Neither the name of Sun Microsystems, Inc. nor the names of its
-+ * contributors may be used to endorse or promote products derived
-+ * from this software without specific prior written permission.
-+ *
-+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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 COPYRIGHT HOLDER 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.
-+ */
-+
-+/*
-+ * rpcdname.c
-+ * Gets the default domain name
-+ */
-+
-+#include <stdlib.h>
-+#include <unistd.h>
-+#include <string.h>
-+
-+static char *default_domain = 0;
-+
-+static char *
-+get_default_domain()
-+{
-+ char temp[256];
-+
-+ if (default_domain)
-+ return (default_domain);
-+ if (getdomainname(temp, sizeof(temp)) < 0)
-+ return (0);
-+ if ((int) strlen(temp) > 0) {
-+ default_domain = (char *)malloc((strlen(temp)+(unsigned)1));
-+ if (default_domain == 0)
-+ return (0);
-+ (void) strcpy(default_domain, temp);
-+ return (default_domain);
-+ }
-+ return (0);
-+}
-+
-+/*
-+ * This is a wrapper for the system call getdomainname which returns a
-+ * ypclnt.h error code in the failure case. It also checks to see that
-+ * the domain name is non-null, knowing that the null string is going to
-+ * get rejected elsewhere in the NIS client package.
-+ */
-+int
-+__rpc_get_default_domain(domain)
-+ char **domain;
-+{
-+ if ((*domain = get_default_domain()) != 0)
-+ return (0);
-+ return (-1);
-+}
diff --git a/main/libtirpc/nis.h b/main/libtirpc/nis.h
deleted file mode 100644
index 8e295966851241f7deb757d9b19423b70e7532a9..0000000000000000000000000000000000000000
--- a/main/libtirpc/nis.h
+++ /dev/null
@@ -1,545 +0,0 @@
-/*
- * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
- * unrestricted use provided that this legend is included on all tape
- * media and as a part of the software program in whole or part. Users
- * may copy or modify Sun RPC without charge, but are not authorized
- * to license or distribute it to anyone else except as part of a product or
- * program developed by the user or with the express written consent of
- * Sun Microsystems, Inc.
- *
- * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
- * WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
- *
- * Sun RPC is provided with no support and without any obligation on the
- * part of Sun Microsystems, Inc. to assist in its use, correction,
- * modification or enhancement.
- *
- * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
- * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC
- * OR ANY PART THEREOF.
- *
- * In no event will Sun Microsystems, Inc. be liable for any lost revenue
- * or profits or other special, indirect and consequential damages, even if
- * Sun has been advised of the possibility of such damages.
- *
- * Sun Microsystems, Inc.
- * 2550 Garcia Avenue
- * Mountain View, California 94043
- */
-
-#ifndef _RPCSVC_NIS_H
-#define _RPCSVC_NIS_H 1
-
-#include <features.h>
-//#include <rpc/rpc.h>
-//#include <rpcsvc/nis_tags.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*
- * nis.h
- *
- * This file is the main include file for NIS clients. It contains
- * both the client library function defines and the various data
- * structures used by the NIS service. It includes the file nis_tags.h
- * which defines the tag values. This allows the tags to change without
- * having to change the nis.x file.
- *
- * NOTE : THIS FILE IS NOT GENERATED WITH RPCGEN ! SO YOU HAVE TO
- * ADD ALL THE CHANGES ON nis_*.x FILES HERE AGAIN !
- *
- * I have removed all the Solaris internal structs and variables,
- * because they are not supported, Sun changed them between various
- * releases and they shouldn't be used in user programs.
- * <kukuk@suse.de>
- */
-
-
-#ifndef __nis_object_h
-#define __nis_object_h
-
-#define NIS_MAXSTRINGLEN 255
-#define NIS_MAXNAMELEN 1024
-#define NIS_MAXATTRNAME 32
-#define NIS_MAXATTRVAL 2048
-#define NIS_MAXCOLUMNS 64
-#define NIS_MAXATTR 16
-#define NIS_MAXPATH 1024
-#define NIS_MAXREPLICAS 128
-#define NIS_MAXLINKS 16
-#define NIS_PK_NONE 0
-#define NIS_PK_DH 1
-#define NIS_PK_RSA 2
-#define NIS_PK_KERB 3
-#define NIS_PK_DHEXT 4
-
-struct nis_attr {
- char *zattr_ndx;
- struct {
- u_int zattr_val_len;
- char *zattr_val_val;
- } zattr_val;
-};
-typedef struct nis_attr nis_attr;
-
-typedef char *nis_name;
-
-enum zotypes {
- BOGUS_OBJ = 0,
- NO_OBJ = 1,
- DIRECTORY_OBJ = 2,
- GROUP_OBJ = 3,
- TABLE_OBJ = 4,
- ENTRY_OBJ = 5,
- LINK_OBJ = 6,
- PRIVATE_OBJ = 7,
- NIS_BOGUS_OBJ = 0,
- NIS_NO_OBJ = 1,
- NIS_DIRECTORY_OBJ = 2,
- NIS_GROUP_OBJ = 3,
- NIS_TABLE_OBJ = 4,
- NIS_ENTRY_OBJ = 5,
- NIS_LINK_OBJ = 6,
- NIS_PRIVATE_OBJ = 7
-};
-typedef enum zotypes zotypes;
-
-enum nstype {
- UNKNOWN = 0,
- NIS = 1,
- SUNYP = 2,
- IVY = 3,
- DNS = 4,
- X500 = 5,
- DNANS = 6,
- XCHS = 7,
- CDS = 8,
-};
-typedef enum nstype nstype;
-
-struct oar_mask {
- uint32_t oa_rights;
- zotypes oa_otype;
-};
-typedef struct oar_mask oar_mask;
-
-struct endpoint {
- char *uaddr;
- char *family;
- char *proto;
-};
-typedef struct endpoint endpoint;
-
-struct nis_server {
- nis_name name;
- struct {
- u_int ep_len;
- endpoint *ep_val;
- } ep;
- uint32_t key_type;
- netobj pkey;
-};
-typedef struct nis_server nis_server;
-
-struct directory_obj {
- nis_name do_name;
- nstype do_type;
- struct {
- u_int do_servers_len;
- nis_server *do_servers_val;
- } do_servers;
- uint32_t do_ttl;
- struct {
- u_int do_armask_len;
- oar_mask *do_armask_val;
- } do_armask;
-};
-typedef struct directory_obj directory_obj;
-
-#define EN_BINARY 1
-#define EN_CRYPT 2
-#define EN_XDR 4
-#define EN_MODIFIED 8
-#define EN_ASN1 64
-
-struct entry_col {
- uint32_t ec_flags;
- struct {
- u_int ec_value_len;
- char *ec_value_val;
- } ec_value;
-};
-typedef struct entry_col entry_col;
-
-struct entry_obj {
- char *en_type;
- struct {
- u_int en_cols_len;
- entry_col *en_cols_val;
- } en_cols;
-};
-typedef struct entry_obj entry_obj;
-
-struct group_obj {
- uint32_t gr_flags;
- struct {
- u_int gr_members_len;
- nis_name *gr_members_val;
- } gr_members;
-};
-typedef struct group_obj group_obj;
-
-struct link_obj {
- zotypes li_rtype;
- struct {
- u_int li_attrs_len;
- nis_attr *li_attrs_val;
- } li_attrs;
- nis_name li_name;
-};
-typedef struct link_obj link_obj;
-
-#define TA_BINARY 1
-#define TA_CRYPT 2
-#define TA_XDR 4
-#define TA_SEARCHABLE 8
-#define TA_CASE 16
-#define TA_MODIFIED 32
-#define TA_ASN1 64
-
-struct table_col {
- char *tc_name;
- uint32_t tc_flags;
- uint32_t tc_rights;
-};
-typedef struct table_col table_col;
-
-struct table_obj {
- char *ta_type;
- int ta_maxcol;
- u_char ta_sep;
- struct {
- u_int ta_cols_len;
- table_col *ta_cols_val;
- } ta_cols;
- char *ta_path;
-};
-typedef struct table_obj table_obj;
-
-struct objdata {
- zotypes zo_type;
- union {
- struct directory_obj di_data;
- struct group_obj gr_data;
- struct table_obj ta_data;
- struct entry_obj en_data;
- struct link_obj li_data;
- struct {
- u_int po_data_len;
- char *po_data_val;
- } po_data;
- } objdata_u;
-};
-typedef struct objdata objdata;
-
-struct nis_oid {
- uint32_t ctime;
- uint32_t mtime;
-};
-typedef struct nis_oid nis_oid;
-
-struct nis_object {
- nis_oid zo_oid;
- nis_name zo_name;
- nis_name zo_owner;
- nis_name zo_group;
- nis_name zo_domain;
- uint32_t zo_access;
- uint32_t zo_ttl;
- objdata zo_data;
-};
-typedef struct nis_object nis_object;
-
-#endif /* if __nis_object_h */
-
-enum nis_error {
- NIS_SUCCESS = 0,
- NIS_S_SUCCESS = 1,
- NIS_NOTFOUND = 2,
- NIS_S_NOTFOUND = 3,
- NIS_CACHEEXPIRED = 4,
- NIS_NAMEUNREACHABLE = 5,
- NIS_UNKNOWNOBJ = 6,
- NIS_TRYAGAIN = 7,
- NIS_SYSTEMERROR = 8,
- NIS_CHAINBROKEN = 9,
- NIS_PERMISSION = 10,
- NIS_NOTOWNER = 11,
- NIS_NOT_ME = 12,
- NIS_NOMEMORY = 13,
- NIS_NAMEEXISTS = 14,
- NIS_NOTMASTER = 15,
- NIS_INVALIDOBJ = 16,
- NIS_BADNAME = 17,
- NIS_NOCALLBACK = 18,
- NIS_CBRESULTS = 19,
- NIS_NOSUCHNAME = 20,
- NIS_NOTUNIQUE = 21,
- NIS_IBMODERROR = 22,
- NIS_NOSUCHTABLE = 23,
- NIS_TYPEMISMATCH = 24,
- NIS_LINKNAMEERROR = 25,
- NIS_PARTIAL = 26,
- NIS_TOOMANYATTRS = 27,
- NIS_RPCERROR = 28,
- NIS_BADATTRIBUTE = 29,
- NIS_NOTSEARCHABLE = 30,
- NIS_CBERROR = 31,
- NIS_FOREIGNNS = 32,
- NIS_BADOBJECT = 33,
- NIS_NOTSAMEOBJ = 34,
- NIS_MODFAIL = 35,
- NIS_BADREQUEST = 36,
- NIS_NOTEMPTY = 37,
- NIS_COLDSTART_ERR = 38,
- NIS_RESYNC = 39,
- NIS_FAIL = 40,
- NIS_UNAVAIL = 41,
- NIS_RES2BIG = 42,
- NIS_SRVAUTH = 43,
- NIS_CLNTAUTH = 44,
- NIS_NOFILESPACE = 45,
- NIS_NOPROC = 46,
- NIS_DUMPLATER = 47,
-};
-typedef enum nis_error nis_error;
-
-struct nis_result {
- nis_error status;
- struct {
- u_int objects_len;
- nis_object *objects_val;
- } objects;
- netobj cookie;
- uint32_t zticks;
- uint32_t dticks;
- uint32_t aticks;
- uint32_t cticks;
-};
-typedef struct nis_result nis_result;
-
-struct ns_request {
- nis_name ns_name;
- struct {
- u_int ns_object_len;
- nis_object *ns_object_val;
- } ns_object;
-};
-typedef struct ns_request ns_request;
-
-struct ib_request {
- nis_name ibr_name;
- struct {
- u_int ibr_srch_len;
- nis_attr *ibr_srch_val;
- } ibr_srch;
- uint32_t ibr_flags;
- struct {
- u_int ibr_obj_len;
- nis_object *ibr_obj_val;
- } ibr_obj;
- struct {
- u_int ibr_cbhost_len;
- nis_server *ibr_cbhost_val;
- } ibr_cbhost;
- u_int ibr_bufsize;
- netobj ibr_cookie;
-};
-typedef struct ib_request ib_request;
-
-struct ping_args {
- nis_name dir;
- uint32_t stamp;
-};
-typedef struct ping_args ping_args;
-
-enum log_entry_t {
- LOG_NOP = 0,
- ADD_NAME = 1,
- REM_NAME = 2,
- MOD_NAME_OLD = 3,
- MOD_NAME_NEW = 4,
- ADD_IBASE = 5,
- REM_IBASE = 6,
- MOD_IBASE = 7,
- UPD_STAMP = 8,
-};
-typedef enum log_entry_t log_entry_t;
-
-struct log_entry {
- uint32_t le_time;
- log_entry_t le_type;
- nis_name le_princp;
- nis_name le_name;
- struct {
- u_int le_attrs_len;
- nis_attr *le_attrs_val;
- } le_attrs;
- nis_object le_object;
-};
-typedef struct log_entry log_entry;
-
-struct log_result {
- nis_error lr_status;
- netobj lr_cookie;
- struct {
- u_int lr_entries_len;
- log_entry *lr_entries_val;
- } lr_entries;
-};
-typedef struct log_result log_result;
-
-struct cp_result {
- nis_error cp_status;
- uint32_t cp_zticks;
- uint32_t cp_dticks;
-};
-typedef struct cp_result cp_result;
-
-struct nis_tag {
- uint32_t tag_type;
- char *tag_val;
-};
-typedef struct nis_tag nis_tag;
-
-struct nis_taglist {
- struct {
- u_int tags_len;
- nis_tag *tags_val;
- } tags;
-};
-typedef struct nis_taglist nis_taglist;
-
-struct dump_args {
- nis_name da_dir;
- uint32_t da_time;
- struct {
- u_int da_cbhost_len;
- nis_server *da_cbhost_val;
- } da_cbhost;
-};
-typedef struct dump_args dump_args;
-
-struct fd_args {
- nis_name dir_name;
- nis_name requester;
-};
-typedef struct fd_args fd_args;
-
-struct fd_result {
- nis_error status;
- nis_name source;
- struct {
- u_int dir_data_len;
- char *dir_data_val;
- } dir_data;
- struct {
- u_int signature_len;
- char *signature_val;
- } signature;
-};
-typedef struct fd_result fd_result;
-
-/* Generic client creating flags */
-#define ZMH_VC 1
-#define ZMH_DG 2
-#define ZMH_AUTH 4
-
-/* Testing Access rights for objects */
-
-#define NIS_READ_ACC 1
-#define NIS_MODIFY_ACC 2
-#define NIS_CREATE_ACC 4
-#define NIS_DESTROY_ACC 8
-/* Test macros. a == access rights, m == desired rights. */
-#define NIS_WORLD(a, m) (((a) & (m)) != 0)
-#define NIS_GROUP(a, m) (((a) & ((m) << 8)) != 0)
-#define NIS_OWNER(a, m) (((a) & ((m) << 16)) != 0)
-#define NIS_NOBODY(a, m) (((a) & ((m) << 24)) != 0)
-/*
- * EOL Alert - The following non-prefixed test macros are
- * here for backward compatability, and will be not be present
- * in future releases - use the NIS_*() macros above.
- */
-#define WORLD(a, m) (((a) & (m)) != 0)
-#define GROUP(a, m) (((a) & ((m) << 8)) != 0)
-#define OWNER(a, m) (((a) & ((m) << 16)) != 0)
-#define NOBODY(a, m) (((a) & ((m) << 24)) != 0)
-
-#define OATYPE(d, n) (((d)->do_armask.do_armask_val+n)->oa_otype)
-#define OARIGHTS(d, n) (((d)->do_armask.do_armask_val+n)->oa_rights)
-#define WORLD_DEFAULT (NIS_READ_ACC)
-#define GROUP_DEFAULT (NIS_READ_ACC << 8)
-#define OWNER_DEFAULT ((NIS_READ_ACC + NIS_MODIFY_ACC + NIS_CREATE_ACC +\
- NIS_DESTROY_ACC) << 16)
-#define DEFAULT_RIGHTS (WORLD_DEFAULT | GROUP_DEFAULT | OWNER_DEFAULT)
-
-/* Result manipulation defines ... */
-#define NIS_RES_NUMOBJ(x) ((x)->objects.objects_len)
-#define NIS_RES_OBJECT(x) ((x)->objects.objects_val)
-#define NIS_RES_COOKIE(x) ((x)->cookie)
-#define NIS_RES_STATUS(x) ((x)->status)
-
-/* These defines make getting at the variant part of the object easier. */
-#define TA_data zo_data.objdata_u.ta_data
-#define EN_data zo_data.objdata_u.en_data
-#define DI_data zo_data.objdata_u.di_data
-#define LI_data zo_data.objdata_u.li_data
-#define GR_data zo_data.objdata_u.gr_data
-
-#define __type_of(o) ((o)->zo_data.zo_type)
-
-/* Declarations for the internal subroutines in nislib.c */
-enum name_pos {SAME_NAME, HIGHER_NAME, LOWER_NAME, NOT_SEQUENTIAL, BAD_NAME};
-typedef enum name_pos name_pos;
-
-/*
- * Defines for getting at column data in entry objects. Because RPCGEN
- * generates some rather wordy structures, we create some defines that
- * collapse the needed keystrokes to access a particular value using
- * these definitions they take an nis_object *, and an int and return
- * a u_char * for Value, and an int for length.
- */
-#define ENTRY_VAL(obj, col) (obj)->EN_data.en_cols.en_cols_val[col].ec_value.ec_value_val
-#define ENTRY_LEN(obj, col) (obj)->EN_data.en_cols.en_cols_val[col].ec_value.ec_value_len
-
-
-/* Prototypes, and extern declarations for the NIS library functions. */
-//#include <rpcsvc/nislib.h>
-#endif
-
-/*
- * nis_3.h
- *
- * This file contains definitions that are only of interest to the actual
- * service daemon and client stubs. Normal users of NIS will not include
- * this file.
- *
- * NOTE : This include file is automatically created by a combination
- * of rpcgen and sed. DO NOT EDIT IT, change the nis.x file instead
- * and then remake this file.
- */
-#ifndef __nis_3_h
-#define __nis_3_h
-
-#define NIS_PROG 100300
-#define NIS_VERSION 3
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* ! _RPCSVC_NIS_H */