82f43dd2d1
Every file that uses libc_hidden_nolink_sunrpc or libnsl_hidden_nolink_def needs to include shlib-compat.h. Currently, most of them are getting it via stdio.h, because libio.h refers to SHLIB_COMPAT when _LIBC is defined, so it includes shlib-compat.h. My experimental patch to not install libio.h breaks that chain; stdio.h no longer pulls in libio.h even for internal users. Accordingly, this patch adds #include <shlib-compat.h> to many files in sunrpc/ and nis/. There are also a small number of really obvious fixups to includes that caught my eye while proofreading the patch - not including headers twice in a row, not worrying about portability to Ultrix anymore, sort of thing. * nis/nis_add.c, nis/nis_addmember.c, nis/nis_call.c * nis/nis_checkpoint.c, nis/nis_clone_dir.c, nis/nis_clone_obj.c * nis/nis_clone_res.c, nis/nis_creategroup.c, nis/nis_defaults.c * nis/nis_destroygroup.c, nis/nis_domain_of.c * nis/nis_domain_of_r.c, nis/nis_error.c, nis/nis_file.c * nis/nis_free.c, nis/nis_getservlist.c, nis/nis_ismember.c * nis/nis_local_names.c, nis/nis_lookup.c, nis/nis_mkdir.c * nis/nis_modify.c, nis/nis_ping.c, nis/nis_print.c * nis/nis_print_group_entry.c, nis/nis_remove.c * nis/nis_removemember.c, nis/nis_rmdir.c, nis/nis_server.c * nis/nis_subr.c, nis/nis_table.c, nis/nis_util.c * nis/nis_verifygroup.c, nis/nis_xdr.c, nis/yp_xdr.c * nis/ypclnt.c, nis/ypupdate_xdr.c, sunrpc/auth_des.c * sunrpc/auth_none.c, sunrpc/auth_unix.c, sunrpc/authdes_prot.c * sunrpc/authuxprot.c, sunrpc/clnt_gen.c, sunrpc/clnt_perr.c * sunrpc/clnt_raw.c, sunrpc/clnt_simp.c, sunrpc/clnt_tcp.c * sunrpc/clnt_udp.c, sunrpc/clnt_unix.c, sunrpc/des_crypt.c * sunrpc/des_soft.c, sunrpc/get_myaddr.c, sunrpc/key_call.c * sunrpc/key_prot.c, sunrpc/netname.c, sunrpc/pm_getmaps.c * sunrpc/pm_getport.c, sunrpc/pmap_clnt.c, sunrpc/pmap_prot.c * sunrpc/pmap_prot2.c, sunrpc/pmap_rmt.c, sunrpc/publickey.c * sunrpc/rpc_cmsg.c, sunrpc/rpc_dtable.c, sunrpc/rpc_prot.c * sunrpc/rpc_thread.c, sunrpc/rtime.c, sunrpc/svc.c * sunrpc/svc_auth.c, sunrpc/svc_raw.c, sunrpc/svc_run.c * sunrpc/svc_tcp.c, sunrpc/svc_udp.c, sunrpc/svc_unix.c * sunrpc/svcauth_des.c, sunrpc/xdr.c, sunrpc/xdr_array.c * sunrpc/xdr_float.c, sunrpc/xdr_intXX_t.c, sunrpc/xdr_mem.c * sunrpc/xdr_rec.c, sunrpc/xdr_ref.c, sunrpc/xdr_sizeof.c * sunrpc/xdr_stdio.c: Include shlib-compat.h. * sunrpc/des_crypt.c, sunrpc/des_soft.c: No need to include abi-versions.h as well as shlib-compat.h. * sunrpc/get_myaddr.c: Remove obsolete comment. * sunrpc/pmap_rmt.c: Remove obsolete comment and #undef. * sunrpc/rpc_thread.c: Include libc-lock.h only once. * resolv/res_libc.c: Include shlib-compat.h only once.
199 lines
6.0 KiB
C
199 lines
6.0 KiB
C
/*
|
|
* rpc_callmsg.c
|
|
*
|
|
* Copyright (c) 2010, Oracle America, Inc.
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that the following conditions are
|
|
* met:
|
|
*
|
|
* * Redistributions of source code must retain the above copyright
|
|
* notice, this list of conditions and the following disclaimer.
|
|
* * Redistributions in binary form must reproduce the above
|
|
* copyright notice, this list of conditions and the following
|
|
* disclaimer in the documentation and/or other materials
|
|
* provided with the distribution.
|
|
* * Neither the name of the "Oracle America, Inc." nor the names of its
|
|
* contributors may be used to endorse or promote products derived
|
|
* from this software without specific prior written permission.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
|
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
|
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
|
|
* FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
|
|
* COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
|
|
* INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
|
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
|
|
* GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
|
|
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
|
|
* WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
|
|
* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
|
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
*/
|
|
|
|
#include <string.h>
|
|
#include <sys/param.h>
|
|
#include <rpc/rpc.h>
|
|
#include <shlib-compat.h>
|
|
|
|
/*
|
|
* XDR a call message
|
|
*/
|
|
bool_t
|
|
xdr_callmsg (XDR *xdrs, struct rpc_msg *cmsg)
|
|
{
|
|
int32_t *buf;
|
|
struct opaque_auth *oa;
|
|
|
|
if (xdrs->x_op == XDR_ENCODE)
|
|
{
|
|
if (cmsg->rm_call.cb_cred.oa_length > MAX_AUTH_BYTES)
|
|
{
|
|
return (FALSE);
|
|
}
|
|
if (cmsg->rm_call.cb_verf.oa_length > MAX_AUTH_BYTES)
|
|
{
|
|
return (FALSE);
|
|
}
|
|
buf = XDR_INLINE (xdrs, 8 * BYTES_PER_XDR_UNIT
|
|
+ RNDUP (cmsg->rm_call.cb_cred.oa_length)
|
|
+ 2 * BYTES_PER_XDR_UNIT
|
|
+ RNDUP (cmsg->rm_call.cb_verf.oa_length));
|
|
if (buf != NULL)
|
|
{
|
|
(void) IXDR_PUT_LONG (buf, cmsg->rm_xid);
|
|
(void) IXDR_PUT_ENUM (buf, cmsg->rm_direction);
|
|
if (cmsg->rm_direction != CALL)
|
|
return FALSE;
|
|
(void) IXDR_PUT_LONG (buf, cmsg->rm_call.cb_rpcvers);
|
|
if (cmsg->rm_call.cb_rpcvers != RPC_MSG_VERSION)
|
|
return FALSE;
|
|
(void) IXDR_PUT_LONG (buf, cmsg->rm_call.cb_prog);
|
|
(void) IXDR_PUT_LONG (buf, cmsg->rm_call.cb_vers);
|
|
(void) IXDR_PUT_LONG (buf, cmsg->rm_call.cb_proc);
|
|
oa = &cmsg->rm_call.cb_cred;
|
|
(void) IXDR_PUT_ENUM (buf, oa->oa_flavor);
|
|
(void) IXDR_PUT_INT32 (buf, oa->oa_length);
|
|
if (oa->oa_length)
|
|
{
|
|
memcpy ((caddr_t) buf, oa->oa_base, oa->oa_length);
|
|
buf = (int32_t *) ((char *) buf + RNDUP (oa->oa_length));
|
|
}
|
|
oa = &cmsg->rm_call.cb_verf;
|
|
(void) IXDR_PUT_ENUM (buf, oa->oa_flavor);
|
|
(void) IXDR_PUT_INT32 (buf, oa->oa_length);
|
|
if (oa->oa_length)
|
|
{
|
|
memcpy ((caddr_t) buf, oa->oa_base, oa->oa_length);
|
|
/* no real need....
|
|
buf = (long *) ((char *) buf + RNDUP(oa->oa_length));
|
|
*/
|
|
}
|
|
return TRUE;
|
|
}
|
|
}
|
|
if (xdrs->x_op == XDR_DECODE)
|
|
{
|
|
buf = XDR_INLINE (xdrs, 8 * BYTES_PER_XDR_UNIT);
|
|
if (buf != NULL)
|
|
{
|
|
cmsg->rm_xid = IXDR_GET_LONG (buf);
|
|
cmsg->rm_direction = IXDR_GET_ENUM (buf, enum msg_type);
|
|
if (cmsg->rm_direction != CALL)
|
|
{
|
|
return FALSE;
|
|
}
|
|
cmsg->rm_call.cb_rpcvers = IXDR_GET_LONG (buf);
|
|
if (cmsg->rm_call.cb_rpcvers != RPC_MSG_VERSION)
|
|
{
|
|
return FALSE;
|
|
}
|
|
cmsg->rm_call.cb_prog = IXDR_GET_LONG (buf);
|
|
cmsg->rm_call.cb_vers = IXDR_GET_LONG (buf);
|
|
cmsg->rm_call.cb_proc = IXDR_GET_LONG (buf);
|
|
oa = &cmsg->rm_call.cb_cred;
|
|
oa->oa_flavor = IXDR_GET_ENUM (buf, enum_t);
|
|
oa->oa_length = IXDR_GET_INT32 (buf);
|
|
if (oa->oa_length)
|
|
{
|
|
if (oa->oa_length > MAX_AUTH_BYTES)
|
|
return FALSE;
|
|
if (oa->oa_base == NULL)
|
|
{
|
|
oa->oa_base = (caddr_t)
|
|
mem_alloc (oa->oa_length);
|
|
}
|
|
buf = XDR_INLINE (xdrs, RNDUP (oa->oa_length));
|
|
if (buf == NULL)
|
|
{
|
|
if (xdr_opaque (xdrs, oa->oa_base,
|
|
oa->oa_length) == FALSE)
|
|
return FALSE;
|
|
}
|
|
else
|
|
{
|
|
memcpy (oa->oa_base, (caddr_t) buf, oa->oa_length);
|
|
/* no real need....
|
|
buf = (long *) ((char *) buf
|
|
+ RNDUP(oa->oa_length));
|
|
*/
|
|
}
|
|
}
|
|
oa = &cmsg->rm_call.cb_verf;
|
|
buf = XDR_INLINE (xdrs, 2 * BYTES_PER_XDR_UNIT);
|
|
if (buf == NULL)
|
|
{
|
|
if (xdr_enum (xdrs, &oa->oa_flavor) == FALSE ||
|
|
xdr_u_int (xdrs, &oa->oa_length) == FALSE)
|
|
{
|
|
return FALSE;
|
|
}
|
|
}
|
|
else
|
|
{
|
|
oa->oa_flavor = IXDR_GET_ENUM (buf, enum_t);
|
|
oa->oa_length = IXDR_GET_INT32 (buf);
|
|
}
|
|
if (oa->oa_length)
|
|
{
|
|
if (oa->oa_length > MAX_AUTH_BYTES)
|
|
return FALSE;
|
|
if (oa->oa_base == NULL)
|
|
{
|
|
oa->oa_base = (caddr_t)
|
|
mem_alloc (oa->oa_length);
|
|
}
|
|
buf = XDR_INLINE (xdrs, RNDUP (oa->oa_length));
|
|
if (buf == NULL)
|
|
{
|
|
if (xdr_opaque (xdrs, oa->oa_base,
|
|
oa->oa_length) == FALSE)
|
|
return FALSE;
|
|
}
|
|
else
|
|
{
|
|
memcpy (oa->oa_base, (caddr_t) buf, oa->oa_length);
|
|
/* no real need...
|
|
buf = (long *) ((char *) buf
|
|
+ RNDUP(oa->oa_length));
|
|
*/
|
|
}
|
|
}
|
|
return TRUE;
|
|
}
|
|
}
|
|
if (
|
|
xdr_u_long (xdrs, &(cmsg->rm_xid)) &&
|
|
xdr_enum (xdrs, (enum_t *) & (cmsg->rm_direction)) &&
|
|
(cmsg->rm_direction == CALL) &&
|
|
xdr_u_long (xdrs, &(cmsg->rm_call.cb_rpcvers)) &&
|
|
(cmsg->rm_call.cb_rpcvers == RPC_MSG_VERSION) &&
|
|
xdr_u_long (xdrs, &(cmsg->rm_call.cb_prog)) &&
|
|
xdr_u_long (xdrs, &(cmsg->rm_call.cb_vers)) &&
|
|
xdr_u_long (xdrs, &(cmsg->rm_call.cb_proc)) &&
|
|
xdr_opaque_auth (xdrs, &(cmsg->rm_call.cb_cred)))
|
|
return xdr_opaque_auth (xdrs, &(cmsg->rm_call.cb_verf));
|
|
return FALSE;
|
|
}
|
|
libc_hidden_nolink_sunrpc (xdr_callmsg, GLIBC_2_0)
|