Apply patches from fedorabaserock/libtirpc-0-2-5

20 files changed, 48 insertions, 57 deletions

diff --git a/man/bindresvport.3t b/man/bindresvport.3t
index 476e678..6724663 100644
--- a/man/bindresvport.3t
+++ b/man/bindresvport.3t
@@ -7,6 +7,8 @@
 .Nm bindresvport ,
 .Nm bindresvport_sa
 .Nd bind a socket to a privileged IP port
+.Sh LIBRARY
+.Lb libc
 .Sh SYNOPSIS
 .In sys/types.h
 .In rpc/rpc.h
@@ -92,11 +94,8 @@ for any of the errors specified for the calls
 .Xr getsockopt 2 ,
 or
 .Xr setsockopt 2 .
-.Sh AVAILABILITY
-The
-.Fn bindresvport
-function is part of libtirpc.
 .Sh SEE ALSO
 .Xr bind 2 ,
 .Xr getsockopt 2 ,
-.Xr setsockopt 2
+.Xr setsockopt 2 ,
+.Xr ip 4
diff --git a/man/des_crypt.3t b/man/des_crypt.3t
index a2be1bd..b708f76 100644
--- a/man/des_crypt.3t
+++ b/man/des_crypt.3t
@@ -6,6 +6,8 @@
 .Sh NAME
 .Nm des_crypt , ecb_crypt , cbc_crypt , des_setparity
 .Nd "fast DES encryption"
+.Sh LIBRARY
+.Lb libc
 .Sh SYNOPSIS
 .In rpc/des_crypt.h
 .Ft int
@@ -116,13 +118,6 @@ Given a result status
 the macro
 .Fn DES_FAILED stat
 is false only for the first two statuses.
-.Sh AVAILABILITY
-The
-.Fn ecb_crypt ,
-.Fn cbc_crypt ,
-and
-.Fn des_setparity
-functions are part of libtirpc.
 .Sh SEE ALSO
 .\" .Xr des 1 ,
 .Xr crypt 3
diff --git a/man/getnetconfig.3t b/man/getnetconfig.3t
index 6682319..fbaa14d 100644
--- a/man/getnetconfig.3t
+++ b/man/getnetconfig.3t
@@ -12,6 +12,8 @@
 .Nm nc_perror ,
 .Nm nc_sperror
 .Nd get network configuration database entry
+.Sh LIBRARY
+.Lb libc
 .Sh SYNOPSIS
 .In netconfig.h
 .Ft "struct netconfig *"
@@ -213,8 +215,6 @@ implemented as thread-specific data.
 .Bl -tag -width /etc/netconfig -compact
 .It Pa /etc/netconfig
 .El
-.Sh AVAILABILITY
-These functions are part of libtirpc.
 .Sh SEE ALSO
 .Xr getnetpath 3 ,
 .Xr netconfig 5
diff --git a/man/getnetpath.3t b/man/getnetpath.3t
index 474acf9..b3712ad 100644
--- a/man/getnetpath.3t
+++ b/man/getnetpath.3t
@@ -12,6 +12,8 @@
 entry corresponding to
 .Ev NETPATH
 component
+.Sh LIBRARY
+.Lb libc
 .Sh SYNOPSIS
 .In netconfig.h
 .Ft "struct netconfig *"
@@ -160,8 +162,6 @@ has been exhausted,
 .Fn getnetpath
 returns
 .Dv NULL .
-.Sh AVAILABILITY
-These functions are part of libtirpc.
 .Sh SEE ALSO
 .Xr getnetconfig 3 ,
 .Xr netconfig 5 ,
diff --git a/man/getrpcent.3t b/man/getrpcent.3t
index 2796de9..261a8f4 100644
--- a/man/getrpcent.3t
+++ b/man/getrpcent.3t
@@ -10,6 +10,8 @@
 .Nm endrpcent ,
 .Nm setrpcent
 .Nd get RPC entry
+.Sh LIBRARY
+.Lb libc
 .Sh SYNOPSIS
 .In rpc/rpc.h
 .Ft struct rpcent *
@@ -87,11 +89,10 @@ program number is found, or until end-of-file is encountered.
 .Bl -tag -width /etc/rpc -compact
 .It Pa /etc/rpc
 .El
-.Sh AVAILABILITY
-These functions are part of libtirpc.
 .Sh SEE ALSO
 .Xr rpc 5 ,
-.Xr rpcinfo 8
+.Xr rpcinfo 8 ,
+.Xr ypserv 8
 .Sh DIAGNOSTICS
 A
 .Dv NULL
diff --git a/man/getrpcport.3t b/man/getrpcport.3t
index 1aa5773..8a072c7 100644
--- a/man/getrpcport.3t
+++ b/man/getrpcport.3t
@@ -6,6 +6,8 @@
 .Sh NAME
 .Nm getrpcport
 .Nd get RPC port number
+.Sh LIBRARY
+.Lb libc
 .Sh SYNOPSIS
 .Ft int
 .Fn getrpcport "char *host" "int prognum" "int versnum" "int proto"
@@ -30,7 +32,3 @@ is registered but not with version
 it will still return a port number (for some version of the program)
 indicating that the program is indeed registered.
 The version mismatch will be detected upon the first call to the service.
-.Sh AVAILABILITY
-The
-.Fn getrpcport
-function is part of libtirpc.
diff --git a/man/rpc.3t b/man/rpc.3t
index 9ff7423..b2927b1 100644
--- a/man/rpc.3t
+++ b/man/rpc.3t
@@ -6,6 +6,8 @@
 .Sh NAME
 .Nm rpc
 .Nd library routines for remote procedure calls
+.Sh LIBRARY
+.Lb libc
 .Sh SYNOPSIS
 .In rpc/rpc.h
 .In netconfig.h
@@ -497,8 +499,6 @@ pages on which they are described:
 .Bl -tag -width /etc/netconfig
 .It Pa /etc/netconfig
 .El
-.Sh AVAILABILITY
-These functions are part of libtirpc.
 .Sh SEE ALSO
 .Xr getnetconfig 3 ,
 .Xr getnetpath 3 ,
diff --git a/man/rpc_clnt_auth.3t b/man/rpc_clnt_auth.3t
index e20f322..ee8fd1d 100644
--- a/man/rpc_clnt_auth.3t
+++ b/man/rpc_clnt_auth.3t
@@ -13,6 +13,8 @@
 .Nm authsys_create ,
 .Nm authsys_create_default
 .Nd library routines for client side remote procedure call authentication
+.Sh LIBRARY
+.Lb libc
 .Sh SYNOPSIS
 .In rpc/rpc.h
 .Ft "void"
@@ -88,8 +90,6 @@ Call
 .Fn authsys_create
 with the appropriate arguments.
 .El
-.Sh AVAILABILITY
-These functions are part of libtirpc.
 .Sh SEE ALSO
 .Xr rpc 3 ,
 .Xr rpc_clnt_calls 3 ,
diff --git a/man/rpc_clnt_calls.3t b/man/rpc_clnt_calls.3t
index 8c3804b..38b29d5 100644
--- a/man/rpc_clnt_calls.3t
+++ b/man/rpc_clnt_calls.3t
@@ -19,6 +19,8 @@
 .Nm rpc_broadcast_exp ,
 .Nm rpc_call
 .Nd library routines for client side calls
+.Sh LIBRARY
+.Lb libc
 .Sh SYNOPSIS
 .In rpc/rpc.h
 .Ft "enum clnt_stat"
@@ -307,8 +309,6 @@ on which it can create a connection.
 You do not have control of timeouts or authentication
 using this routine.
 .El
-.Sh AVAILABILITY
-These functions are part of libtirpc.
 .Sh SEE ALSO
 .Xr printf 3 ,
 .Xr rpc 3 ,
diff --git a/man/rpc_clnt_create.3t b/man/rpc_clnt_create.3t
index 95b6fc8..acdbab4 100644
--- a/man/rpc_clnt_create.3t
+++ b/man/rpc_clnt_create.3t
@@ -27,6 +27,8 @@
 .Nd "library routines for dealing with creation and manipulation of"
 .Vt CLIENT
 handles
+.Sh LIBRARY
+.Lb libc
 .Sh SYNOPSIS
 .In rpc/rpc.h
 .Ft bool_t
@@ -505,8 +507,6 @@ It is used by the routine
 .Fn clnt_pcreateerror
 to print the reason for the failure.
 .El
-.Sh AVAILABILITY
-These functions are part of libtirpc.
 .Sh SEE ALSO
 .Xr rpc 3 ,
 .Xr rpc_clnt_auth 3 ,
diff --git a/man/rpc_secure.3t b/man/rpc_secure.3t
index 7ad6e49..7969a91 100644
--- a/man/rpc_secure.3t
+++ b/man/rpc_secure.3t
@@ -258,11 +258,10 @@ if it succeeds and
 if it fails.
 Inverse of
 .Fn netname2user .
-.Sh AVAILABILITY
-These functions are part of libtirpc.
 .Sh SEE ALSO
 .Xr rpc 3 ,
-.Xr xdr 3
+.Xr xdr 3 ,
+.Xr keyserv 8
 .Pp
 The following manuals:
 .Rs
diff --git a/man/rpc_svc_calls.3t b/man/rpc_svc_calls.3t
index 4b3c08b..582b45d 100644
--- a/man/rpc_svc_calls.3t
+++ b/man/rpc_svc_calls.3t
@@ -21,6 +21,8 @@
 .Nm svc_run ,
 .Nm svc_sendreply
 .Nd library routines for RPC servers
+.Sh LIBRARY
+.Lb libc
 .Sh SYNOPSIS
 .In rpc/rpc.h
 .Ft int
@@ -256,8 +258,6 @@ if it succeeds,
 .Dv FALSE
 otherwise.
 .El
-.Sh AVAILABILITY
-These functions are part of libtirpc.
 .Sh SEE ALSO
 .Xr poll 2 ,
 .Xr select 2 ,
diff --git a/man/rpc_svc_create.3t b/man/rpc_svc_create.3t
index 6e28d2e..d47be2b 100644
--- a/man/rpc_svc_create.3t
+++ b/man/rpc_svc_create.3t
@@ -18,6 +18,8 @@
 .Nm svc_tp_create ,
 .Nm svc_vc_create
 .Nd library routines for the creation of server handles
+.Sh LIBRARY
+.Lb libc
 .Sh SYNOPSIS
 .In rpc/rpc.h
 .Ft bool_t
@@ -327,8 +329,6 @@ The server is not registered with the
 .Xr rpcbind 8
 service.
 .El
-.Sh AVAILABILITY
-These functions are part of libtirpc.
 .Sh SEE ALSO
 .Xr rpc 3 ,
 .Xr rpc_svc_calls 3 ,
diff --git a/man/rpc_svc_err.3t b/man/rpc_svc_err.3t
index ffc7f53..49139cb 100644
--- a/man/rpc_svc_err.3t
+++ b/man/rpc_svc_err.3t
@@ -17,6 +17,8 @@
 .Nm svcerr_systemerr ,
 .Nm svcerr_weakauth
 .Nd library routines for server side remote procedure call errors
+.Sh LIBRARY
+.Lb libc
 .Sh SYNOPSIS
 .In rpc/rpc.h
 .Ft void
@@ -88,8 +90,6 @@ authentication arguments.
 The routine calls
 .Fn svcerr_auth "xprt" "AUTH_TOOWEAK" .
 .El
-.Sh AVAILABILITY
-These functions are part of libtirpc.
 .Sh SEE ALSO
 .Xr rpc 3 ,
 .Xr rpc_svc_calls 3 ,
diff --git a/man/rpc_svc_reg.3t b/man/rpc_svc_reg.3t
index e74f7fc..56dd530 100644
--- a/man/rpc_svc_reg.3t
+++ b/man/rpc_svc_reg.3t
@@ -16,6 +16,8 @@
 .Nm xprt_register ,
 .Nm xprt_unregister
 .Nd library routines for registering servers
+.Sh LIBRARY
+.Lb libc
 .Sh SYNOPSIS
 .In rpc/rpc.h
 .Ft int
@@ -171,8 +173,6 @@ This routine modifies the global variable
 .Xr rpc_svc_calls 3 ) .
 Service implementors usually do not need this routine.
 .El
-.Sh AVAILABILITY
-These functions are part of libtirpc.
 .Sh SEE ALSO
 .Xr select 2 ,
 .Xr rpc 3 ,
diff --git a/man/rpc_xdr.3t b/man/rpc_xdr.3t
index ae3d663..feb708b 100644
--- a/man/rpc_xdr.3t
+++ b/man/rpc_xdr.3t
@@ -15,6 +15,8 @@
 .Nm xdr_rejected_reply ,
 .Nm xdr_replymsg
 .Nd XDR library routines for remote procedure calls
+.Sh LIBRARY
+.Lb libc
 .Sh SYNOPSIS
 .In rpc/rpc.h
 .Ft bool_t
@@ -94,8 +96,6 @@ This reply could be either an acceptance,
 rejection or
 .Dv NULL .
 .El
-.Sh AVAILABILITY
-These functions are part of libtirpc.
 .Sh SEE ALSO
 .Xr rpc 3 ,
 .Xr xdr 3
diff --git a/man/rpcbind.3t b/man/rpcbind.3t
index ec492cc..99b03cf 100644
--- a/man/rpcbind.3t
+++ b/man/rpcbind.3t
@@ -14,6 +14,8 @@
 .Nm rpcb_set ,
 .Nm rpcb_unset
 .Nd library routines for RPC bind service
+.Sh LIBRARY
+.Lb libc
 .Sh SYNOPSIS
 .In rpc/rpc.h
 .Ft "rpcblist *"
@@ -185,8 +187,6 @@ Only the owner of the service or the super-user can destroy the mapping.
 in
 .Xr rpc_svc_calls 3 . )
 .El
-.Sh AVAILABILITY
-These functions are part of libtirpc.
 .Sh SEE ALSO
 .Xr rpc_clnt_calls 3 ,
 .Xr rpc_svc_calls 3 ,
diff --git a/man/rtime.3t b/man/rtime.3t
index bc93af6..6e61350 100644
--- a/man/rtime.3t
+++ b/man/rtime.3t
@@ -7,6 +7,8 @@
 .Sh NAME
 .Nm rtime
 .Nd "get remote time"
+.Sh LIBRARY
+.Lb libc
 .Sh SYNOPSIS
 .In sys/types.h
 .In sys/time.h
@@ -44,7 +46,5 @@ however, the routine will instead use
 and block until a reply is received from the time server.
 .Sh RETURN VALUES
 .Rv -std rtime
-.Sh AVAILABILITY
-The
-.Fn rtime
-function is part of libtirpc.
+.Sh SEE ALSO
+.Xr timed 8
diff --git a/src/mt_misc.c b/src/mt_misc.c
index 093086e..f7267d2 100644
--- a/src/mt_misc.c
+++ b/src/mt_misc.c
@@ -78,12 +78,12 @@ pthread_mutex_t	svcraw_lock = PTHREAD_MUTEX_INITIALIZER;
 pthread_mutex_t	tsd_lock = PTHREAD_MUTEX_INITIALIZER;
 
 /* Library global tsd keys */
-thread_key_t clnt_broadcast_key = KEY_INITIALIZER;
-thread_key_t rpc_call_key = KEY_INITIALIZER;
-thread_key_t tcp_key = KEY_INITIALIZER;
-thread_key_t udp_key = KEY_INITIALIZER;
-thread_key_t nc_key = KEY_INITIALIZER;
-thread_key_t rce_key = KEY_INITIALIZER;
+thread_key_t clnt_broadcast_key;
+thread_key_t rpc_call_key = -1;
+thread_key_t tcp_key = -1;
+thread_key_t udp_key = -1;
+thread_key_t nc_key = -1;
+thread_key_t rce_key = -1;
 
 /* xprtlist (svc_generic.c) */
 pthread_mutex_t	xprtlist_lock = PTHREAD_MUTEX_INITIALIZER;
diff --git a/tirpc/rpc/auth.h b/tirpc/rpc/auth.h
index 7c8f813..4ce11f0 100644
--- a/tirpc/rpc/auth.h
+++ b/tirpc/rpc/auth.h
@@ -399,7 +399,6 @@ struct rpc_msg;
 enum auth_stat _svcauth_none (struct svc_req *, struct rpc_msg *);
 enum auth_stat _svcauth_short (struct svc_req *, struct rpc_msg *);
 enum auth_stat _svcauth_unix (struct svc_req *, struct rpc_msg *);
-enum auth_stat _svcauth_gss (struct svc_req *, struct rpc_msg *, bool_t *);
 __END_DECLS
 
 #define AUTH_NONE	0		/* no authentication */