Merge branch 'c23'

Author: CendioOssman

librpc/auth_non.c

@@ -61,11 +61,11 @@ static char sccsid[] = "@(#)auth_none.c 1.19 87/08/11 Copyr 1984 Sun Micro";
 /*
  * Authenticator operations routines
  */
-static void	authnone_verf();
-static void	authnone_destroy();
-static bool_t	authnone_marshal();
-static bool_t	authnone_validate();
-static bool_t	authnone_refresh();
+static void	authnone_verf(AUTH *);
+static void	authnone_destroy(AUTH *);
+static bool_t	authnone_marshal(AUTH *, XDR *);
+static bool_t	authnone_validate(AUTH *, struct opaque_auth *);
+static bool_t	authnone_refresh(AUTH *);
 
 static struct auth_ops ops = {
 	authnone_verf,
@@ -123,25 +123,30 @@ authnone_marshal(client, xdrs)
 }
 
 static void 
-authnone_verf()
+authnone_verf(client)
+	AUTH *client;
 {
 }
 
 static bool_t
-authnone_validate()
+authnone_validate(client, verf)
+	AUTH *client;
+	struct opaque_auth *verf;
 {
 
 	return (TRUE);
 }
 
 static bool_t
-authnone_refresh()
+authnone_refresh(client)
+	AUTH *client;
 {
 
 	return (FALSE);
 }
 
 static void
-authnone_destroy()
+authnone_destroy(client)
+	AUTH *client;
 {
 }

librpc/auth_uni.c

@@ -71,11 +71,11 @@ static char sccsid[] = "@(#)auth_unix.c 1.19 87/08/11 Copyr 1984 Sun Micro";
 /*
  * Unix authenticator operations vector
  */
-static void	authunix_nextverf();
-static bool_t	authunix_marshal();
-static bool_t	authunix_validate();
-static bool_t	authunix_refresh();
-static void	authunix_destroy();
+static void	authunix_nextverf(AUTH *);
+static bool_t	authunix_marshal(AUTH *, XDR *);
+static bool_t	authunix_validate(AUTH *, struct opaque_auth *);
+static bool_t	authunix_refresh(AUTH *);
+static void	authunix_destroy(AUTH *);
 
 static struct auth_ops auth_unix_ops = {
 	authunix_nextverf,
@@ -97,7 +97,7 @@ struct audata {
 };
 #define	AUTH_PRIVATE(auth)	((struct audata *)auth->ah_private)
 
-static bool_t marshal_new_auth();
+static bool_t marshal_new_auth(AUTH *);
 
 
 /*
@@ -245,14 +245,14 @@ authunix_marshal(auth, xdrs)
 static bool_t
 authunix_validate(auth, verf)
 	register AUTH *auth;
-	struct opaque_auth verf;
+	struct opaque_auth *verf;
 {
 	register struct audata *au;
 	XDR xdrs;
 
-	if (verf.oa_flavor == AUTH_SHORT) {
+	if (verf->oa_flavor == AUTH_SHORT) {
 		au = AUTH_PRIVATE(auth);
-		xdrmem_create(&xdrs, verf.oa_base, verf.oa_length, XDR_DECODE);
+		xdrmem_create(&xdrs, verf->oa_base, verf->oa_length, XDR_DECODE);
 
 		if (au->au_shcred.oa_base != NULL) {
 			mem_free(au->au_shcred.oa_base,

librpc/authunix.c

@@ -69,7 +69,7 @@ xdr_authunix_parms(xdrs, p)
 	    && xdr_int(xdrs, &(p->aup_uid))
 	    && xdr_int(xdrs, &(p->aup_gid))
 	    && xdr_array(xdrs, (caddr_t *)&(p->aup_gids),
-		    &(p->aup_len), NGRPS, sizeof(int), xdr_int) ) {
+		    &(p->aup_len), NGRPS, sizeof(int), (xdrproc_t)xdr_int) ) {
 		return (TRUE);
 	}
 	return (FALSE);

librpc/clnt_gen.c

@@ -62,8 +62,8 @@ static char sccsid[] = "@(#)clnt_generic.c 1.4 87/08/11 (C) 1987 SMI";
 CLIENT *
 clnt_create(hostname, prog, vers, proto)
 	char *hostname;
-	unsigned prog;
-	unsigned vers;
+	u_long prog;
+	u_long vers;
 	char *proto;
 {
 	struct hostent *h;
@@ -114,7 +114,7 @@ clnt_create(hostname, prog, vers, proto)
 			return (NULL);
 		}
 		tv.tv_sec = 25;
-		clnt_control(client, CLSET_TIMEOUT, &tv);
+		clnt_control(client, CLSET_TIMEOUT, (caddr_t)&tv);
 		break;
 	case IPPROTO_TCP:
 		client = clnttcp_create(&sin, prog, vers, &sock, 0, 0);
@@ -123,7 +123,7 @@ clnt_create(hostname, prog, vers, proto)
 		}
 		tv.tv_sec = 25;
 		tv.tv_usec = 0;
-		clnt_control(client, CLSET_TIMEOUT, &tv);
+		clnt_control(client, CLSET_TIMEOUT, (caddr_t)&tv);
 		break;
 	default:
 		rpc_createerr.cf_stat = RPC_SYSTEMERROR;

librpc/clnt_per.c

@@ -57,13 +57,7 @@ static char sccsid[] = "@(#)clnt_perror.c 1.15 87/10/07 Copyr 1984 Sun Micro";
 #include <rpc/auth.h>
 #include <rpc/clnt.h>
 
-#ifndef WIN32
-extern char *sys_errlist[];
-extern char *sprintf();
-#endif
-static char *auth_errmsg();
-
-extern char *strcpy();
+static char *auth_errmsg(enum auth_stat);
 
 static char *buf;
 
@@ -85,7 +79,7 @@ clnt_sperror(rpch, s)
 	char *s;
 {
 	struct rpc_err e;
-	void clnt_perrno();
+	void clnt_perrno(enum clnt_stat);
 	char *err;
 	char *str = _buf();
 	char *strstart = str;

librpc/clnt_raw.c

@@ -71,12 +71,12 @@ static struct clntraw_private {
 	u_int	mcnt;
 } *clntraw_private;
 
-static enum clnt_stat	clntraw_call();
-static void		clntraw_abort();
-static void		clntraw_geterr();
-static bool_t		clntraw_freeres();
-static bool_t		clntraw_control();
-static void		clntraw_destroy();
+static enum clnt_stat	clntraw_call(CLIENT *, u_long, xdrproc_t, caddr_t, xdrproc_t, caddr_t, struct timeval);
+static void		clntraw_abort(CLIENT *);
+static void		clntraw_geterr(CLIENT *, struct rpc_err *);
+static bool_t		clntraw_freeres(CLIENT *, xdrproc_t, caddr_t);
+static bool_t		clntraw_control(CLIENT *, int, caddr_t);
+static void		clntraw_destroy(CLIENT *);
 
 static struct clnt_ops client_ops = {
 	clntraw_call,
@@ -87,8 +87,6 @@ static struct clnt_ops client_ops = {
 	clntraw_control
 };
 
-void	svc_getreq();
-
 /*
  * Create a client handle for memory based rpc.
  */
@@ -211,7 +209,9 @@ clntraw_call(h, proc, xargs, argsp, xresults, resultsp, timeout)
 }
 
 static void
-clntraw_geterr()
+clntraw_geterr(cl, error)
+	CLIENT *cl;
+	struct rpc_err *error;
 {
 }
 
@@ -236,17 +236,22 @@ clntraw_freeres(cl, xdr_res, res_ptr)
 }
 
 static void
-clntraw_abort()
+clntraw_abort(cl)
+	CLIENT *cl;
 {
 }
 
 static bool_t
-clntraw_control()
+clntraw_control(cl, request, info)
+	CLIENT *cl;
+	int request;
+	char *info;
 {
 	return (FALSE);
 }
 
 static void
-clntraw_destroy()
+clntraw_destroy(cl)
+	CLIENT *cl;
 {
 }

librpc/clnt_tcp.c

@@ -84,15 +84,15 @@ static char sccsid[] = "@(#)clnt_tcp.c 1.37 87/10/05 Copyr 1984 Sun Micro";
 extern int errno;
 #endif
 
-static int	readtcp();
-static int	writetcp();
+static int	readtcp(caddr_t, caddr_t, int);
+static int	writetcp(caddr_t, caddr_t, int);
 
-static enum clnt_stat	clnttcp_call();
-static void		clnttcp_abort();
-static void		clnttcp_geterr();
-static bool_t		clnttcp_freeres();
-static bool_t           clnttcp_control();
-static void		clnttcp_destroy();
+static enum clnt_stat	clnttcp_call(CLIENT *, u_long, xdrproc_t, caddr_t, xdrproc_t, caddr_t, struct timeval);
+static void		clnttcp_abort(CLIENT *);
+static void		clnttcp_geterr(CLIENT *, struct rpc_err *);
+static bool_t		clnttcp_freeres(CLIENT *, xdrproc_t, caddr_t);
+static bool_t		clnttcp_control(CLIENT *, int, caddr_t);
+static void		clnttcp_destroy(CLIENT *);
 
 static struct clnt_ops tcp_ops = {
 	clnttcp_call,
@@ -335,7 +335,7 @@ clnttcp_call(h, proc, xdr_args, args_ptr, xdr_results, results_ptr, timeout)
 	while (TRUE) {
 		reply_msg.acpted_rply.ar_verf = _null_auth;
 		reply_msg.acpted_rply.ar_results.where = NULL;
-		reply_msg.acpted_rply.ar_results.proc = xdr_void;
+		reply_msg.acpted_rply.ar_results.proc = (xdrproc_t) xdr_void;
 		if (! xdrrec_skiprecord(xdrs))
 			return (ct->ct_error.re_status);
 		/* now decode and validate the response header */
@@ -399,7 +399,8 @@ clnttcp_freeres(cl, xdr_res, res_ptr)
 }
 
 static void
-clnttcp_abort()
+clnttcp_abort(cl)
+	CLIENT *cl;
 {
 }
 
@@ -454,11 +455,12 @@ clnttcp_destroy(h)
  * around for the rpc level.
  */
 static int
-readtcp(ct, buf, len)
-	register struct ct_data *ct;
+readtcp(ctp, buf, len)
+	caddr_t ctp;
 	caddr_t buf;
 	register int len;
 {
+	register struct ct_data *ct = (struct ct_data *)ctp;
 #ifdef FD_SETSIZE
 	fd_set mask;
 	fd_set readfds;
@@ -543,12 +545,13 @@ readtcp(ct, buf, len)
 }
 
 static int
-writetcp(ct, buf, len)
-	struct ct_data *ct;
+writetcp(ctp, buf, len)
+	caddr_t ctp;
 	caddr_t buf;
 	int len;
 {
 	register int i, cnt;
+	struct ct_data *ct = (struct ct_data *) ctp;
 
 	for (cnt = len; cnt > 0; cnt -= i, buf += i) {
 #ifdef WIN32

librpc/clnt_udp.c

@@ -71,12 +71,12 @@ extern int errno;
 /*
  * UDP bases client side rpc operations
  */
-static enum clnt_stat	clntudp_call();
-static void		clntudp_abort();
-static void		clntudp_geterr();
-static bool_t		clntudp_freeres();
-static bool_t           clntudp_control();
-static void		clntudp_destroy();
+static enum clnt_stat	clntudp_call(CLIENT *, u_long, xdrproc_t, caddr_t, xdrproc_t, caddr_t, struct timeval);
+static void		clntudp_abort(CLIENT *);
+static void		clntudp_geterr(CLIENT *, struct rpc_err *);
+static bool_t		clntudp_freeres(CLIENT *, xdrproc_t, caddr_t);
+static bool_t		clntudp_control(CLIENT *, int, caddr_t);
+static void		clntudp_destroy(CLIENT *);
 
 static struct clnt_ops udp_ops = {
 	clntudp_call,
@@ -459,8 +459,8 @@ clntudp_freeres(cl, xdr_res, res_ptr)
 }
 
 static void
-clntudp_abort(/*h*/)
-	/*CLIENT *h;*/
+clntudp_abort(cl)
+	CLIENT *cl;
 {
 }
 

librpc/getrpcen.c

@@ -73,7 +73,7 @@ struct rpcdata {
 static void setrpcent(int f);
 static void endrpcent();
 
-static	struct rpcent *interpret();
+static	struct rpcent *interpret(char *, int);
 struct	hostent *gethostent();
 #ifdef WIN32
 #define index(str,ch) strchr(str,ch)

librpc/pmap_cln.c

@@ -58,7 +58,7 @@ static char sccsid[] = "@(#)pmap_clnt.c 1.37 87/08/11 Copyr 1984 Sun Micro";
 static struct timeval timeout = { 5, 0 };
 static struct timeval tottimeout = { 60, 0 };
 
-void clnt_perror();
+void clnt_perror(CLIENT *, char *);
 
 
 /*
@@ -87,7 +87,9 @@ pmap_set(program, version, protocol, port)
 	parms.pm_vers = version;
 	parms.pm_prot = protocol;
 	parms.pm_port = port;
-	if (CLNT_CALL(client, PMAPPROC_SET, xdr_pmap, &parms, xdr_bool, &rslt,
+	if (CLNT_CALL(client, PMAPPROC_SET,
+	    (xdrproc_t)xdr_pmap, (caddr_t)&parms,
+	    (xdrproc_t)xdr_bool, (caddr_t)&rslt,
 	    tottimeout) != RPC_SUCCESS) {
 		clnt_perror(client, "Cannot register service");
 		return (FALSE);
@@ -124,8 +126,9 @@ pmap_unset(program, version)
 	parms.pm_prog = program;
 	parms.pm_vers = version;
 	parms.pm_port = parms.pm_prot = 0;
-	CLNT_CALL(client, PMAPPROC_UNSET, xdr_pmap, &parms, xdr_bool, &rslt,
-	    tottimeout);
+	CLNT_CALL(client, PMAPPROC_UNSET,
+	    (xdrproc_t)xdr_pmap, (caddr_t)&parms,
+	    (xdrproc_t)xdr_bool, (caddr_t)&rslt, tottimeout);
 	CLNT_DESTROY(client);
 #ifdef WIN32
 	(void)closesocket(socket);