mirror of
https://sourceware.org/git/glibc.git
synced 2025-01-11 20:00:07 +00:00
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.
148 lines
4.5 KiB
C
148 lines
4.5 KiB
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 <alloca.h>
|
|
#include <errno.h>
|
|
#include <string.h>
|
|
#include <rpc/rpc.h>
|
|
#include <sys/socket.h>
|
|
#include <netdb.h>
|
|
#include <shlib-compat.h>
|
|
|
|
/*
|
|
* Generic client creation: takes (hostname, program-number, protocol) and
|
|
* returns client handle. Default options are set, which the user can
|
|
* change using the rpc equivalent of ioctl()'s.
|
|
*/
|
|
CLIENT *
|
|
clnt_create (const char *hostname, u_long prog, u_long vers,
|
|
const char *proto)
|
|
{
|
|
struct protoent protobuf, *p;
|
|
size_t prtbuflen;
|
|
char *prttmpbuf;
|
|
struct sockaddr_in sin;
|
|
struct sockaddr_un sun;
|
|
int sock;
|
|
struct timeval tv;
|
|
CLIENT *client;
|
|
|
|
if (strcmp (proto, "unix") == 0)
|
|
{
|
|
__bzero ((char *)&sun, sizeof (sun));
|
|
sun.sun_family = AF_UNIX;
|
|
strcpy (sun.sun_path, hostname);
|
|
sock = RPC_ANYSOCK;
|
|
client = clntunix_create (&sun, prog, vers, &sock, 0, 0);
|
|
if (client == NULL)
|
|
return NULL;
|
|
#if 0
|
|
/* This is not wanted. This would disable the user from having
|
|
a timeout in the clnt_call() call. Only a call to cnlt_control()
|
|
by the user should set the timeout value. */
|
|
tv.tv_sec = 25;
|
|
tv.tv_usec = 0;
|
|
clnt_control (client, CLSET_TIMEOUT, (char *)&tv);
|
|
#endif
|
|
return client;
|
|
}
|
|
|
|
if (__libc_rpc_gethostbyname (hostname, &sin) != 0)
|
|
return NULL;
|
|
|
|
prtbuflen = 1024;
|
|
prttmpbuf = __alloca (prtbuflen);
|
|
while (__getprotobyname_r (proto, &protobuf, prttmpbuf, prtbuflen, &p) != 0
|
|
|| p == NULL)
|
|
if (errno != ERANGE)
|
|
{
|
|
struct rpc_createerr *ce = &get_rpc_createerr ();
|
|
ce->cf_stat = RPC_UNKNOWNPROTO;
|
|
ce->cf_error.re_errno = EPFNOSUPPORT;
|
|
return NULL;
|
|
}
|
|
else
|
|
{
|
|
/* Enlarge the buffer. */
|
|
prtbuflen *= 2;
|
|
prttmpbuf = __alloca (prtbuflen);
|
|
}
|
|
|
|
sock = RPC_ANYSOCK;
|
|
switch (p->p_proto)
|
|
{
|
|
case IPPROTO_UDP:
|
|
tv.tv_sec = 5;
|
|
tv.tv_usec = 0;
|
|
client = clntudp_create (&sin, prog, vers, tv, &sock);
|
|
if (client == NULL)
|
|
{
|
|
return NULL;
|
|
}
|
|
#if 0
|
|
/* This is not wanted. This would disable the user from having
|
|
a timeout in the clnt_call() call. Only a call to cnlt_control()
|
|
by the user should set the timeout value. */
|
|
tv.tv_sec = 25;
|
|
clnt_control (client, CLSET_TIMEOUT, (char *)&tv);
|
|
#endif
|
|
break;
|
|
case IPPROTO_TCP:
|
|
client = clnttcp_create (&sin, prog, vers, &sock, 0, 0);
|
|
if (client == NULL)
|
|
{
|
|
return NULL;
|
|
}
|
|
#if 0
|
|
/* This is not wanted. This would disable the user from having
|
|
a timeout in the clnt_call() call. Only a call to cnlt_control()
|
|
by the user should set the timeout value. */
|
|
tv.tv_sec = 25;
|
|
tv.tv_usec = 0;
|
|
clnt_control (client, CLSET_TIMEOUT, (char *)&tv);
|
|
#endif
|
|
break;
|
|
default:
|
|
{
|
|
struct rpc_createerr *ce = &get_rpc_createerr ();
|
|
ce->cf_stat = RPC_SYSTEMERROR;
|
|
ce->cf_error.re_errno = EPFNOSUPPORT;
|
|
}
|
|
return (NULL);
|
|
}
|
|
return client;
|
|
}
|
|
#ifdef EXPORT_RPC_SYMBOLS
|
|
libc_hidden_def (clnt_create)
|
|
#else
|
|
libc_hidden_nolink_sunrpc (clnt_create, GLIBC_2_0)
|
|
#endif
|