From 06f13fb3f44e18d039fcbc981a4d1432b2116c90 Mon Sep 17 00:00:00 2001
From: "Pedro F. Giffuni" <pfg@FreeBSD.org>
Date: Thu, 27 Sep 2012 19:10:25 +0000
Subject: [PATCH] Complete revert of r239963:

The attempt to merge changes from the linux libtirpc caused
rpc.lockd to exit after startup under unclear conditions.

After many hours of selective experiments and inconsistent results
the conclusion is that it's better to just revert everything and
restart in a future time with a much smaller subset of the
changes.
____

MFC after:	3 days
Reported by:	David Wolfskill
Tested by:	David Wolfskill
---
 lib/libc/rpc/auth_unix.c     | 10 ++++++----
 lib/libc/rpc/authunix_prot.c |  6 +++---
 lib/libc/rpc/clnt_perror.c   | 19 +++----------------
 lib/libc/rpc/rpc_generic.c   |  9 ++-------
 lib/libc/rpc/rpc_soc.3       |  2 +-
 lib/libc/rpc/rpcb_clnt.c     |  7 -------
 lib/libc/rpc/svc_auth_unix.c |  2 +-
 lib/libc/rpc/svc_run.c       |  5 +++--
 sys/rpc/auth.h               |  9 +++++----
 sys/rpc/rpcb_clnt.c          |  7 -------
 10 files changed, 24 insertions(+), 52 deletions(-)

diff --git a/lib/libc/rpc/auth_unix.c b/lib/libc/rpc/auth_unix.c
index 4d7a89b19112..c0d25483adf2 100644
--- a/lib/libc/rpc/auth_unix.c
+++ b/lib/libc/rpc/auth_unix.c
@@ -94,10 +94,10 @@ struct audata {
 AUTH *
 authunix_create(machname, uid, gid, len, aup_gids)
 	char *machname;
-	uid_t uid;
-	gid_t gid;
+	int uid;
+	int gid;
 	int len;
-	gid_t *aup_gids;
+	int *aup_gids;
 {
 	struct authunix_parms aup;
 	char mymem[MAX_AUTH_BYTES];
@@ -207,7 +207,9 @@ authunix_create_default()
 		abort();
 	if (ngids > NGRPS)
 		ngids = NGRPS;
-	auth = authunix_create(machname, uid, gid, ngids, gids);
+	/* XXX: interface problem; those should all have been unsigned */
+	auth = authunix_create(machname, (int)uid, (int)gid, ngids,
+	    (int *)gids);
 	free(gids);
 	return (auth);
 }
diff --git a/lib/libc/rpc/authunix_prot.c b/lib/libc/rpc/authunix_prot.c
index dd84810c7cf5..7699e28effa7 100644
--- a/lib/libc/rpc/authunix_prot.c
+++ b/lib/libc/rpc/authunix_prot.c
@@ -60,7 +60,7 @@ xdr_authunix_parms(xdrs, p)
 	XDR *xdrs;
 	struct authunix_parms *p;
 {
-	gid_t **paup_gids;
+	int **paup_gids;
 
 	assert(xdrs != NULL);
 	assert(p != NULL);
@@ -69,8 +69,8 @@ xdr_authunix_parms(xdrs, p)
 
 	if (xdr_u_long(xdrs, &(p->aup_time))
 	    && xdr_string(xdrs, &(p->aup_machname), MAX_MACHINE_NAME)
-	    && xdr_u_int(xdrs, &(p->aup_uid))
-	    && xdr_u_int(xdrs, &(p->aup_gid))
+	    && xdr_int(xdrs, &(p->aup_uid))
+	    && xdr_int(xdrs, &(p->aup_gid))
 	    && xdr_array(xdrs, (char **) paup_gids,
 		    &(p->aup_len), NGRPS, sizeof(int), (xdrproc_t)xdr_int) ) {
 		return (TRUE);
diff --git a/lib/libc/rpc/clnt_perror.c b/lib/libc/rpc/clnt_perror.c
index 87ad3c1f1ed1..efe9043c29ab 100644
--- a/lib/libc/rpc/clnt_perror.c
+++ b/lib/libc/rpc/clnt_perror.c
@@ -242,7 +242,7 @@ char *
 clnt_spcreateerror(s)
 	const char *s;
 {
-	char *str, *err;
+	char *str;
 	size_t len, i;
 
 	assert(s != NULL);
@@ -258,21 +258,8 @@ clnt_spcreateerror(s)
 	switch (rpc_createerr.cf_stat) {
 	case RPC_PMAPFAILURE:
 		(void) strncat(str, " - ", len - 1);
-		 err = clnt_sperrno(rpc_createerr.cf_error.re_status);
-		if (err)
-			(void) strncat(str, err+5, len-5);
-		switch(rpc_createerr.cf_error.re_status) {
-		case RPC_CANTSEND:
-		case RPC_CANTRECV:
-			i = strlen(str);
-			len -= i;
-			snprintf(str+i, len, ": errno %d (%s)", 
-				rpc_createerr.cf_error.re_errno,
-				strerror(rpc_createerr.cf_error.re_errno)); 
-			break;
-		default:
-			break;
-		}
+		(void) strncat(str,
+		    clnt_sperrno(rpc_createerr.cf_error.re_status), len - 4);
 		break;
 
 	case RPC_SYSTEMERROR:
diff --git a/lib/libc/rpc/rpc_generic.c b/lib/libc/rpc/rpc_generic.c
index e592878d58cf..ab259d59f30f 100644
--- a/lib/libc/rpc/rpc_generic.c
+++ b/lib/libc/rpc/rpc_generic.c
@@ -269,8 +269,7 @@ __rpc_getconfip(nettype)
 		}
 		while ((nconf = getnetconfig(confighandle)) != NULL) {
 			if (strcmp(nconf->nc_protofmly, NC_INET) == 0) {
-				if (strcmp(nconf->nc_proto, NC_TCP) == 0 &&
-				    netid_tcp == NULL) {
+				if (strcmp(nconf->nc_proto, NC_TCP) == 0) {
 					netid_tcp = strdup(nconf->nc_netid);
 					if (main_thread)
 						netid_tcp_main = netid_tcp;
@@ -278,8 +277,7 @@ __rpc_getconfip(nettype)
 						thr_setspecific(tcp_key,
 							(void *) netid_tcp);
 				} else
-				if (strcmp(nconf->nc_proto, NC_UDP) == 0 &&
-				   netid_udp == NULL) {
+				if (strcmp(nconf->nc_proto, NC_UDP) == 0) {
 					netid_udp = strdup(nconf->nc_netid);
 					if (main_thread)
 						netid_udp_main = netid_udp;
@@ -618,9 +616,6 @@ __rpc_taddr2uaddr_af(int af, const struct netbuf *nbuf)
 #endif
 	u_int16_t port;
 
-	if (nbuf->len <= 0)
-		return NULL;
-
 	switch (af) {
 	case AF_INET:
 		sin = nbuf->buf;
diff --git a/lib/libc/rpc/rpc_soc.3 b/lib/libc/rpc/rpc_soc.3
index a049a839b3ba..8dedaa870046 100644
--- a/lib/libc/rpc/rpc_soc.3
+++ b/lib/libc/rpc/rpc_soc.3
@@ -148,7 +148,7 @@ default authentication used by
 .Ft "AUTH *"
 .Xc
 .It Xo
-.Fn authunix_create "char *host" "uid_t uid" "gid_t gid" "int len" "gid_t *aup_gids"
+.Fn authunix_create "char *host" "int uid" "int gid" "int len" "int *aup_gids"
 .Xc
 .Pp
 Create and return an
diff --git a/lib/libc/rpc/rpcb_clnt.c b/lib/libc/rpc/rpcb_clnt.c
index b123c32edada..afef8061c673 100644
--- a/lib/libc/rpc/rpcb_clnt.c
+++ b/lib/libc/rpc/rpcb_clnt.c
@@ -770,13 +770,6 @@ __rpcb_findaddr_timed(program, version, nconf, host, clpp, tp)
 	}
 
 	parms.r_addr = NULL;
-	parms.r_netid = nconf->nc_netid;
-
-       /*
-	* According to wire captures, the reference implementation
-	* (OpenSolaris) sends a blank string here too.
-	*/
-	parms.r_owner = "";
 
 	/*
 	 * Use default total timeout if no timeout is specified.
diff --git a/lib/libc/rpc/svc_auth_unix.c b/lib/libc/rpc/svc_auth_unix.c
index f889d81fce5e..4d6f1021c814 100644
--- a/lib/libc/rpc/svc_auth_unix.c
+++ b/lib/libc/rpc/svc_auth_unix.c
@@ -68,7 +68,7 @@ _svcauth_unix(rqst, msg)
 	struct area {
 		struct authunix_parms area_aup;
 		char area_machname[MAX_MACHINE_NAME+1];
-		gid_t area_gids[NGRPS];
+		int area_gids[NGRPS];
 	} *area;
 	u_int auth_len;
 	size_t str_len, gid_len;
diff --git a/lib/libc/rpc/svc_run.c b/lib/libc/rpc/svc_run.c
index e6345a6738fc..b4627d65875b 100644
--- a/lib/libc/rpc/svc_run.c
+++ b/lib/libc/rpc/svc_run.c
@@ -60,13 +60,14 @@ svc_run()
 	fd_set readfds, cleanfds;
 	struct timeval timeout;
 
+	timeout.tv_sec = 30;
+	timeout.tv_usec = 0;
+
 	for (;;) {
 		rwlock_rdlock(&svc_fd_lock);
 		readfds = svc_fdset;
 		cleanfds = svc_fdset;
 		rwlock_unlock(&svc_fd_lock);
-		timeout.tv_sec = 30;
-		timeout.tv_usec = 0;
 		switch (_select(svc_maxfd+1, &readfds, NULL, NULL, &timeout)) {
 		case -1:
 			FD_ZERO(&readfds);
diff --git a/sys/rpc/auth.h b/sys/rpc/auth.h
index 5ec85413d1c2..6be08b625601 100644
--- a/sys/rpc/auth.h
+++ b/sys/rpc/auth.h
@@ -234,17 +234,18 @@ __END_DECLS
  * System style authentication
  * AUTH *authunix_create(machname, uid, gid, len, aup_gids)
  *	char *machname;
- *	uid_t uid;
- *	gid_t gid;
+ *	int uid;
+ *	int gid;
  *	int len;
- *	gid_t *aup_gids;
+ *	int *aup_gids;
  */
 __BEGIN_DECLS
 #ifdef _KERNEL
 struct ucred;
 extern AUTH *authunix_create(struct ucred *);
 #else
-extern AUTH *authunix_create(char *, uid_t, gid_t, int, gid_t *);
+extern AUTH *authunix_create(char *, int, int, int,
+    int *);
 extern AUTH *authunix_create_default(void);	/* takes no parameters */
 #endif
 extern AUTH *authnone_create(void);		/* takes no parameters */
diff --git a/sys/rpc/rpcb_clnt.c b/sys/rpc/rpcb_clnt.c
index 4106dfd92427..d484df3bf4f8 100644
--- a/sys/rpc/rpcb_clnt.c
+++ b/sys/rpc/rpcb_clnt.c
@@ -780,13 +780,6 @@ __rpcb_findaddr_timed(program, version, nconf, host, clpp, tp)
 	}
 
 	parms.r_addr = NULL;
-	parms.r_netid = nconf->nc_netid;
-
-       /*
-	* According to wire captures, the reference implementation
-	* (OpenSolaris) sends a blank string here too.
-	*/
-	parms.r_owner = "";
 
 	/*
 	 * Use default total timeout if no timeout is specified.