From be18eced55bb0d6431f1cd81df8febbc159ddc86 Mon Sep 17 00:00:00 2001
From: Ulrich Drepper <drepper@redhat.com>
Date: Wed, 2 Aug 2000 07:01:41 +0000
Subject: Update.

	Remove incompatible IPv6 extension of RPC.
	* sunrpc/Makefile: Undo changes.
	* sunrpc/rpc_main.c: Likewise.
	* sunrpc/rpc/clnt.h: Likewise.
	* sunrpc/rpc/svc.h: Likewise.
	* sunrpc/bindrsvprt6.c: Removed.
	* sunrpc/clnt_tcp6.c: Removed.
	* sunrpc/clnt_udp6.c: Removed.
	* sunrpc/svc_tcp6.c: Removed.
	* sunrpc/svc_udp6.c: Removed.

	* intl/libintl.h: Don't use __attribute_format_arg__ for gettext,
	dgettext, and dcgettetxt.

	* intl/locale.alias: Update japanese aliases.
---
 sunrpc/rpc/clnt.h | 46 ----------------------------------------------
 sunrpc/rpc/svc.h  | 15 +--------------
 2 files changed, 1 insertion(+), 60 deletions(-)

(limited to 'sunrpc/rpc')

diff --git a/sunrpc/rpc/clnt.h b/sunrpc/rpc/clnt.h
index 39519a8e38..a19fc773bc 100644
--- a/sunrpc/rpc/clnt.h
+++ b/sunrpc/rpc/clnt.h
@@ -341,52 +341,6 @@ extern CLIENT *clntudp_bufcreate (struct sockaddr_in *__raddr,
 				  u_int __sendsz, u_int __recvsz) __THROW;
 
 
-/*
- * TCP/IPv6 based rpc
- * CLIENT *
- * clnttcp6_create(raddr, prog, vers, sockp, sendsz, recvsz)
- *	struct sockaddr_in6 *raddr;
- *	u_long prog;
- *	u_long version;
- *	register int *sockp;
- *	u_int sendsz;
- *	u_int recvsz;
- */
-extern CLIENT *clnttcp6_create __P ((struct sockaddr_in6 *__raddr,
-				    u_long __prog, u_long __version,
-				    int *__sockp, u_int __sendsz,
-				    u_int __recvsz));
-
-/*
- * UDP/IPv6 based rpc.
- * CLIENT *
- * clntudp6_create(raddr, program, version, wait, sockp)
- *	struct sockaddr_in6 *raddr;
- *	u_long program;
- *	u_long version;
- *	struct timeval wait_resend;
- *	int *sockp;
- *
- * Same as above, but you specify max packet sizes.
- * CLIENT *
- * clntudp6_bufcreate(raddr, program, version, wait, sockp, sendsz, recvsz)
- *	struct sockaddr_in6 *raddr;
- *	u_long program;
- *	u_long version;
- *	struct timeval wait_resend;
- *	int *sockp;
- *	u_int sendsz;
- *	u_int recvsz;
- */
-extern CLIENT *clntudp6_create __P ((struct sockaddr_in6 *__raddr,
-				    u_long __program, u_long __version,
-				    struct timeval __wait_resend,
-				    int *__sockp));
-extern CLIENT *clntudp6_bufcreate __P ((struct sockaddr_in6 *__raddr,
-				       u_long __program, u_long __version,
-				       struct timeval __wait_resend,
-				       int *__sockp, u_int __sendsz,
-				       u_int __recvsz));
 
 
 /*
diff --git a/sunrpc/rpc/svc.h b/sunrpc/rpc/svc.h
index cf23129b86..3ffca50bd0 100644
--- a/sunrpc/rpc/svc.h
+++ b/sunrpc/rpc/svc.h
@@ -92,7 +92,7 @@ struct SVCXPRT {
 				/* destroy this struct */
   } *xp_ops;
   int		xp_addrlen;	 /* length of remote address */
-  struct sockaddr_storage xp_raddr;	 /* remote address */
+  struct sockaddr_in xp_raddr;	 /* remote address */
   struct opaque_auth xp_verf;	 /* raw response verifier */
   caddr_t		xp_p1;		 /* private */
   caddr_t		xp_p2;		 /* private */
@@ -304,19 +304,6 @@ extern SVCXPRT *svctcp_create (int __sock, u_int __sendsize, u_int __recvsize)
      __THROW;
 
 
-/*
- * IPv6/Udp based rpc.
- */
-extern SVCXPRT *svcudp6_create (int __sock) __THROW;
-extern SVCXPRT *svcudp6_bufcreate (int __sock, u_int __sendsz,
-				       u_int __recvsz) __THROW;
-
-/*
- * IPv6/Tcp based rpc.
- */
-extern SVCXPRT *svctcp6_create (int __sock, u_int __sendsize,
-  				    u_int __recvsize) __THROW;
-
 /*
  * Unix based rpc.
  */
-- 
cgit v1.2.3