From 03fbfc5b1fa5b72d1cf82b47ae66e6fd28d087d5 Mon Sep 17 00:00:00 2001 From: Steve Dickson Date: Tue, 28 Oct 2008 15:32:14 +0000 Subject: [PATCH] Fixed some incorrect function declarations (bz468815) --- libtirpc-0.1.9-warnings-01.patch | 50 ++++++++++++++++++++++++++++++++ libtirpc.spec | 8 ++++- 2 files changed, 57 insertions(+), 1 deletion(-) create mode 100644 libtirpc-0.1.9-warnings-01.patch diff --git a/libtirpc-0.1.9-warnings-01.patch b/libtirpc-0.1.9-warnings-01.patch new file mode 100644 index 0000000..9e609b2 --- /dev/null +++ b/libtirpc-0.1.9-warnings-01.patch @@ -0,0 +1,50 @@ +commit 92cf0dde310ca341a2f29ff66b19eeb9994a649a +Author: Ian Kent +Date: Tue Oct 28 11:19:07 2008 -0400 + + Fixed a warings the IPV6 client routines + + Signed-off-by: Steve Dickson + +diff --git a/src/clnt_raw.c b/src/clnt_raw.c +index f184066..8b1650e 100644 +--- a/src/clnt_raw.c ++++ b/src/clnt_raw.c +@@ -165,7 +165,7 @@ call_again: + XDR_SETPOS(xdrs, 0); + clp->u.mashl_rpcmsg.rm_xid ++ ; + if ((! XDR_PUTBYTES(xdrs, clp->u.mashl_callmsg, clp->mcnt)) || +- (! XDR_PUTINT32(xdrs, &proc)) || ++ (! XDR_PUTINT32(xdrs, (int32_t *)&proc)) || + (! AUTH_MARSHALL(h->cl_auth, xdrs)) || + (! (*xargs)(xdrs, argsp))) { + return (RPC_CANTENCODEARGS); +diff --git a/src/clnt_vc.c b/src/clnt_vc.c +index 4ee6c20..1dcc976 100644 +--- a/src/clnt_vc.c ++++ b/src/clnt_vc.c +@@ -363,7 +363,7 @@ call_again: + x_id = ntohl(--(*msg_x_id)); + + if ((! XDR_PUTBYTES(xdrs, ct->ct_u.ct_mcallc, ct->ct_mpos)) || +- (! XDR_PUTINT32(xdrs, &proc)) || ++ (! XDR_PUTINT32(xdrs, (int32_t *)&proc)) || + (! AUTH_MARSHALL(cl->cl_auth, xdrs)) || + (! (*xdr_args)(xdrs, args_ptr))) { + if (ct->ct_error.re_status == RPC_SUCCESS) +diff --git a/tirpc/rpc/clnt_soc.h b/tirpc/rpc/clnt_soc.h +index f43d2ee..0f49a2e 100644 +--- a/tirpc/rpc/clnt_soc.h ++++ b/tirpc/rpc/clnt_soc.h +@@ -112,9 +112,9 @@ extern CLIENT *clntudp_create(struct sockaddr_in *, u_long, u_long, + extern CLIENT *clntudp_bufcreate(struct sockaddr_in *, u_long, u_long, + struct timeval, int *, u_int, u_int); + #ifdef INET6 +-extern CLIENT *clntudp6_create(struct sockaddr_in *, u_long, u_long, ++extern CLIENT *clntudp6_create(struct sockaddr_in6 *, u_long, u_long, + struct timeval, int *); +-extern CLIENT *clntudp6_bufcreate(struct sockaddr_in *, u_long, u_long, ++extern CLIENT *clntudp6_bufcreate(struct sockaddr_in6 *, u_long, u_long, + struct timeval, int *, u_int, u_int); + #endif + __END_DECLS diff --git a/libtirpc.spec b/libtirpc.spec index bf16654..bac7948 100644 --- a/libtirpc.spec +++ b/libtirpc.spec @@ -1,6 +1,6 @@ Name: libtirpc Version: 0.1.9 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Transport Independent RPC Library Group: System Environment/Libraries License: SISSL @@ -35,6 +35,7 @@ Patch02: libtirpc-0.1.9-ipv6-socket.patch Patch03: libtirpc-0.1.9-taddr2addr-typo.patch Patch04: libtirpc-0.1.9-warnings.patch Patch05: libtirpc-0.1.7-taddr2uaddr-segflt.patch +Patch06: libtirpc-0.1.9-warnings-01.patch Patch100: libtirpc-0.1.7-compile.patch @@ -51,6 +52,8 @@ developing programs which use the tirpc library. %patch04 -p1 # 468014: rpcbind DoS in the taddr2uaddr XDR_DECODE %patch05 -p1 +# 468815: Incorrect declaration in header file +%patch06 -p1 %patch100 -p1 @@ -149,6 +152,9 @@ rm -rf %{buildroot} %{_mandir}/*/* %changelog +* Tue Oct 28 2008 Steve Dickson 0.1.8-7 +- Fixed some incorrect function declarations (bz468815) + * Mon Oct 27 2008 Steve Dickson 0.1.8-6 - Fix bad assumption taddr2uaddr processing that caused a segfault (bz468014)