Remove struct cmessage from sys/socket.h and reintroduce the private

definitions.

Requested by: wollman

2 files changed, 9 insertions, 2 deletions

diff --git a/lib/libc/rpc/clnt_vc.c b/lib/libc/rpc/clnt_vc.c
index 433291c..737e3c7 100644
--- a/lib/libc/rpc/clnt_vc.c
+++ b/lib/libc/rpc/clnt_vc.c
@@ -81,6 +81,11 @@ static char sccsid[] = "@(#)clnt_vc.c 1.19 89/03/16 Copyr 1988 Sun Micro";
 
 #define MCALL_MSG_SIZE 24
 
+struct cmessage {
+        struct cmsghdr cmsg;
+        struct cmsgcred cmcred;
+};
+
 static enum clnt_stat clnt_vc_call __P((CLIENT *, rpcproc_t, xdrproc_t, caddr_t,
     xdrproc_t, caddr_t, struct timeval));
 static void clnt_vc_geterr __P((CLIENT *, struct rpc_err *));
diff --git a/lib/libc/rpc/svc_vc.c b/lib/libc/rpc/svc_vc.c
index 0e84d6f..e867bf1 100644
--- a/lib/libc/rpc/svc_vc.c
+++ b/lib/libc/rpc/svc_vc.c
@@ -68,8 +68,10 @@ static char *sccsid = "@(#)svc_tcp.c	2.2 88/08/01 4.0 RPCSRC";
 #include "rpc_com.h"
 #include "un-namespace.h"
 
-#define SOCKCREDSIZE(ngrps) \
-	(sizeof(struct cmsgcred) + (sizeof(gid_t) * ((ngrps) - 1)))
+struct cmessage {
+        struct cmsghdr cmsg;
+        struct cmsgcred cmcred;
+};
 
 static SVCXPRT *makefd_xprt __P((int, u_int, u_int));
 static bool_t rendezvous_request __P((SVCXPRT *, struct rpc_msg *));