1998-07-28 18:26:04 +02:00
|
|
|
/*
|
|
|
|
* Sun RPC is a product of Sun Microsystems, Inc. and is provided for
|
|
|
|
* unrestricted use provided that this legend is included on all tape
|
|
|
|
* media and as a part of the software program in whole or part. Users
|
|
|
|
* may copy or modify Sun RPC without charge, but are not authorized
|
|
|
|
* to license or distribute it to anyone else except as part of a product or
|
|
|
|
* program developed by the user.
|
|
|
|
*
|
|
|
|
* SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
|
|
|
|
* WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
|
|
|
|
* PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
|
|
|
|
*
|
|
|
|
* Sun RPC is provided with no support and without any obligation on the
|
|
|
|
* part of Sun Microsystems, Inc. to assist in its use, correction,
|
|
|
|
* modification or enhancement.
|
|
|
|
*
|
|
|
|
* SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
|
|
|
|
* INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC
|
|
|
|
* OR ANY PART THEREOF.
|
|
|
|
*
|
|
|
|
* In no event will Sun Microsystems, Inc. be liable for any lost revenue
|
|
|
|
* or profits or other special, indirect and consequential damages, even if
|
|
|
|
* Sun has been advised of the possibility of such damages.
|
|
|
|
*
|
|
|
|
* Sun Microsystems, Inc.
|
|
|
|
* 2550 Garcia Avenue
|
|
|
|
* Mountain View, California 94043
|
|
|
|
*/
|
|
|
|
|
|
|
|
/*
|
|
|
|
* clnt_unix.c, Implements a TCP/IP based, client side RPC.
|
|
|
|
*
|
|
|
|
* Copyright (C) 1984, Sun Microsystems, Inc.
|
|
|
|
*
|
|
|
|
* TCP based RPC supports 'batched calls'.
|
|
|
|
* A sequence of calls may be batched-up in a send buffer. The rpc call
|
|
|
|
* return immediately to the client even though the call was not necessarily
|
|
|
|
* sent. The batching occurs if the results' xdr routine is NULL (0) AND
|
|
|
|
* the rpc timeout value is zero (see clnt.h, rpc).
|
|
|
|
*
|
|
|
|
* Clients should NOT casually batch calls that in fact return results; that is,
|
|
|
|
* the server side should be aware that a call is batched and not produce any
|
|
|
|
* return message. Batched calls that produce many result messages can
|
|
|
|
* deadlock (netlock) the client and the server....
|
|
|
|
*
|
|
|
|
* Now go hang yourself.
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include <netdb.h>
|
|
|
|
#include <errno.h>
|
|
|
|
#include <stdio.h>
|
|
|
|
#include <unistd.h>
|
1999-06-19 11:58:37 +02:00
|
|
|
#include <libintl.h>
|
1998-07-28 18:26:04 +02:00
|
|
|
#include <rpc/rpc.h>
|
|
|
|
#include <sys/uio.h>
|
|
|
|
#include <sys/poll.h>
|
|
|
|
#include <sys/socket.h>
|
|
|
|
#include <rpc/pmap_clnt.h>
|
2001-08-17 06:49:12 +02:00
|
|
|
#ifdef USE_IN_LIBIO
|
|
|
|
# include <wchar.h>
|
|
|
|
#endif
|
1998-07-28 18:26:04 +02:00
|
|
|
|
1998-11-18 12:05:09 +01:00
|
|
|
extern u_long _create_xid (void);
|
|
|
|
|
1998-07-28 18:26:04 +02:00
|
|
|
#define MCALL_MSG_SIZE 24
|
|
|
|
|
|
|
|
struct ct_data
|
|
|
|
{
|
|
|
|
int ct_sock;
|
|
|
|
bool_t ct_closeit;
|
|
|
|
struct timeval ct_wait;
|
|
|
|
bool_t ct_waitset; /* wait set by clnt_control? */
|
|
|
|
struct sockaddr_un ct_addr;
|
|
|
|
struct rpc_err ct_error;
|
|
|
|
char ct_mcall[MCALL_MSG_SIZE]; /* marshalled callmsg */
|
|
|
|
u_int ct_mpos; /* pos after marshal */
|
|
|
|
XDR ct_xdrs;
|
|
|
|
};
|
|
|
|
|
|
|
|
static int readunix (char *, char *, int);
|
|
|
|
static int writeunix (char *, char *, int);
|
|
|
|
|
|
|
|
static enum clnt_stat clntunix_call (CLIENT *, u_long, xdrproc_t, caddr_t,
|
|
|
|
xdrproc_t, caddr_t, struct timeval);
|
|
|
|
static void clntunix_abort (void);
|
|
|
|
static void clntunix_geterr (CLIENT *, struct rpc_err *);
|
|
|
|
static bool_t clntunix_freeres (CLIENT *, xdrproc_t, caddr_t);
|
|
|
|
static bool_t clntunix_control (CLIENT *, int, char *);
|
|
|
|
static void clntunix_destroy (CLIENT *);
|
|
|
|
|
2004-12-22 21:10:10 +01:00
|
|
|
static struct clnt_ops unix_ops =
|
1998-07-28 18:26:04 +02:00
|
|
|
{
|
|
|
|
clntunix_call,
|
|
|
|
clntunix_abort,
|
|
|
|
clntunix_geterr,
|
|
|
|
clntunix_freeres,
|
|
|
|
clntunix_destroy,
|
|
|
|
clntunix_control
|
|
|
|
};
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Create a client handle for a tcp/ip connection.
|
|
|
|
* If *sockp<0, *sockp is set to a newly created TCP socket and it is
|
|
|
|
* connected to raddr. If *sockp non-negative then
|
|
|
|
* raddr is ignored. The rpc/tcp package does buffering
|
|
|
|
* similar to stdio, so the client must pick send and receive buffer sizes,];
|
|
|
|
* 0 => use the default.
|
|
|
|
* If raddr->sin_port is 0, then a binder on the remote machine is
|
|
|
|
* consulted for the right port number.
|
|
|
|
* NB: *sockp is copied into a private area.
|
|
|
|
* NB: It is the clients responsibility to close *sockp.
|
|
|
|
* NB: The rpch->cl_auth is set null authentication. Caller may wish to set this
|
|
|
|
* something more useful.
|
|
|
|
*/
|
|
|
|
CLIENT *
|
|
|
|
clntunix_create (struct sockaddr_un *raddr, u_long prog, u_long vers,
|
|
|
|
int *sockp, u_int sendsz, u_int recvsz)
|
|
|
|
{
|
|
|
|
CLIENT *h;
|
|
|
|
struct ct_data *ct = (struct ct_data *) mem_alloc (sizeof (*ct));
|
|
|
|
struct rpc_msg call_msg;
|
|
|
|
int len;
|
|
|
|
|
|
|
|
h = (CLIENT *) mem_alloc (sizeof (*h));
|
2001-08-17 06:49:12 +02:00
|
|
|
if (h == NULL || ct == NULL)
|
1998-07-28 18:26:04 +02:00
|
|
|
{
|
Update.
Add changes which were in this form in the original patch by
Eric Norum <eric.norum@usask.ca>.
* include/rpc/rpc.h: Remove svc_fdset, rpc_createerr, svc_pollfd, and
svc_max_pollfd.
* sunrpc/rpc/rpc.h: Declare __rpc_thread_svc_fdset,
__rpc_thread_createerr, __rpc_thread_svc_pollfd, and
__rpc_thread_svc_max_pollfd.
Define svc_fdset, get_rpc_createerr, svc_pollfd, and
svc_max_pollfd.
* sunrpc/rpc_thread.c: Handle first thread special, it uses the
global variables.
Define __rpc_thread_svc_fdset, __rpc_thread_createerr,
__rpc_thread_svc_pollfd, and __rpc_thread_svc_max_pollfd.
* sunrpc/Versions [libc] (GLIBC_2.2.3): Export __rpc_thread_svc_fdset,
__rpc_thread_createerr, __rpc_thread_svc_pollfd, and
__rpc_thread_svc_max_pollfd.
* sunrpc/clnt_gen.c: Replace use of rpc_createerr by call to
get_rpc_createerr.
* sunrpc/clnt_perr.c: Likewise.
* sunrpc/clnt_simp.c: Likewise.
* sunrpc/clnt_tcp.c: Likewise.
* sunrpc/clnt_udp.c: Likewise.
* sunrpc/clnt_unix.c: Likewise.
* sunrpc/pm_getport.c: Likewise.
2001-03-26 07:17:47 +02:00
|
|
|
struct rpc_createerr *ce = &get_rpc_createerr ();
|
2005-07-20 19:51:14 +02:00
|
|
|
(void) __fxprintf (NULL, "%s", _("clntunix_create: out of memory\n"));
|
Update.
Add changes which were in this form in the original patch by
Eric Norum <eric.norum@usask.ca>.
* include/rpc/rpc.h: Remove svc_fdset, rpc_createerr, svc_pollfd, and
svc_max_pollfd.
* sunrpc/rpc/rpc.h: Declare __rpc_thread_svc_fdset,
__rpc_thread_createerr, __rpc_thread_svc_pollfd, and
__rpc_thread_svc_max_pollfd.
Define svc_fdset, get_rpc_createerr, svc_pollfd, and
svc_max_pollfd.
* sunrpc/rpc_thread.c: Handle first thread special, it uses the
global variables.
Define __rpc_thread_svc_fdset, __rpc_thread_createerr,
__rpc_thread_svc_pollfd, and __rpc_thread_svc_max_pollfd.
* sunrpc/Versions [libc] (GLIBC_2.2.3): Export __rpc_thread_svc_fdset,
__rpc_thread_createerr, __rpc_thread_svc_pollfd, and
__rpc_thread_svc_max_pollfd.
* sunrpc/clnt_gen.c: Replace use of rpc_createerr by call to
get_rpc_createerr.
* sunrpc/clnt_perr.c: Likewise.
* sunrpc/clnt_simp.c: Likewise.
* sunrpc/clnt_tcp.c: Likewise.
* sunrpc/clnt_udp.c: Likewise.
* sunrpc/clnt_unix.c: Likewise.
* sunrpc/pm_getport.c: Likewise.
2001-03-26 07:17:47 +02:00
|
|
|
ce->cf_stat = RPC_SYSTEMERROR;
|
2001-08-17 06:49:12 +02:00
|
|
|
ce->cf_error.re_errno = ENOMEM;
|
1998-07-28 18:26:04 +02:00
|
|
|
goto fooy;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* If no socket given, open one
|
|
|
|
*/
|
|
|
|
if (*sockp < 0)
|
|
|
|
{
|
|
|
|
*sockp = __socket (AF_UNIX, SOCK_STREAM, 0);
|
|
|
|
len = strlen (raddr->sun_path) + sizeof (raddr->sun_family) + 1;
|
|
|
|
if (*sockp < 0
|
|
|
|
|| __connect (*sockp, (struct sockaddr *) raddr, len) < 0)
|
|
|
|
{
|
Update.
Add changes which were in this form in the original patch by
Eric Norum <eric.norum@usask.ca>.
* include/rpc/rpc.h: Remove svc_fdset, rpc_createerr, svc_pollfd, and
svc_max_pollfd.
* sunrpc/rpc/rpc.h: Declare __rpc_thread_svc_fdset,
__rpc_thread_createerr, __rpc_thread_svc_pollfd, and
__rpc_thread_svc_max_pollfd.
Define svc_fdset, get_rpc_createerr, svc_pollfd, and
svc_max_pollfd.
* sunrpc/rpc_thread.c: Handle first thread special, it uses the
global variables.
Define __rpc_thread_svc_fdset, __rpc_thread_createerr,
__rpc_thread_svc_pollfd, and __rpc_thread_svc_max_pollfd.
* sunrpc/Versions [libc] (GLIBC_2.2.3): Export __rpc_thread_svc_fdset,
__rpc_thread_createerr, __rpc_thread_svc_pollfd, and
__rpc_thread_svc_max_pollfd.
* sunrpc/clnt_gen.c: Replace use of rpc_createerr by call to
get_rpc_createerr.
* sunrpc/clnt_perr.c: Likewise.
* sunrpc/clnt_simp.c: Likewise.
* sunrpc/clnt_tcp.c: Likewise.
* sunrpc/clnt_udp.c: Likewise.
* sunrpc/clnt_unix.c: Likewise.
* sunrpc/pm_getport.c: Likewise.
2001-03-26 07:17:47 +02:00
|
|
|
struct rpc_createerr *ce = &get_rpc_createerr ();
|
|
|
|
ce->cf_stat = RPC_SYSTEMERROR;
|
|
|
|
ce->cf_error.re_errno = errno;
|
1998-07-28 18:26:04 +02:00
|
|
|
if (*sockp != -1)
|
|
|
|
__close (*sockp);
|
|
|
|
goto fooy;
|
|
|
|
}
|
|
|
|
ct->ct_closeit = TRUE;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
ct->ct_closeit = FALSE;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Set up private data struct
|
|
|
|
*/
|
|
|
|
ct->ct_sock = *sockp;
|
|
|
|
ct->ct_wait.tv_usec = 0;
|
|
|
|
ct->ct_waitset = FALSE;
|
|
|
|
ct->ct_addr = *raddr;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Initialize call message
|
|
|
|
*/
|
1998-11-18 12:05:09 +01:00
|
|
|
call_msg.rm_xid = _create_xid ();
|
1998-07-28 18:26:04 +02:00
|
|
|
call_msg.rm_direction = CALL;
|
|
|
|
call_msg.rm_call.cb_rpcvers = RPC_MSG_VERSION;
|
|
|
|
call_msg.rm_call.cb_prog = prog;
|
|
|
|
call_msg.rm_call.cb_vers = vers;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* pre-serialize the static part of the call msg and stash it away
|
|
|
|
*/
|
2002-02-26 02:45:59 +01:00
|
|
|
INTUSE(xdrmem_create) (&(ct->ct_xdrs), ct->ct_mcall, MCALL_MSG_SIZE,
|
|
|
|
XDR_ENCODE);
|
|
|
|
if (!INTUSE(xdr_callhdr) (&(ct->ct_xdrs), &call_msg))
|
1998-07-28 18:26:04 +02:00
|
|
|
{
|
|
|
|
if (ct->ct_closeit)
|
|
|
|
__close (*sockp);
|
|
|
|
goto fooy;
|
|
|
|
}
|
|
|
|
ct->ct_mpos = XDR_GETPOS (&(ct->ct_xdrs));
|
|
|
|
XDR_DESTROY (&(ct->ct_xdrs));
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Create a client handle which uses xdrrec for serialization
|
|
|
|
* and authnone for authentication.
|
|
|
|
*/
|
2002-02-26 02:45:59 +01:00
|
|
|
INTUSE(xdrrec_create) (&(ct->ct_xdrs), sendsz, recvsz,
|
|
|
|
(caddr_t) ct, readunix, writeunix);
|
2004-12-22 21:10:10 +01:00
|
|
|
h->cl_ops = &unix_ops;
|
1998-07-28 18:26:04 +02:00
|
|
|
h->cl_private = (caddr_t) ct;
|
Update.
2002-05-11 Jakub Jelinek <jakub@redhat.com>
* include/netinet/in.h (bindresvport_internal): Add prototype.
* include/rpc/auth.h (authunix_create_internal,
authunix_create_default_internal, authnone_create_internal,
authdes_pk_create_internal): Add prototypes.
* include/rpc/clnt.h (clnt_create_internal, clnttcp_create_internal,
clntudp_create_internal, clntudp_bufcreate_internal,
clntunix_create_internal): Add prototypes.
* include/rpc/svc.h (svc_sendreply_internal, svcerr_decode_internal,
svc_getreq_internal, svc_getreq_common_internal,
svc_getreqset_internal, svc_getreq_poll_internal,
svc_register_internal, svc_unregister_internal,
svcudp_create_internal, svcudp_bufcreate_internal): Add prototypes.
* include/rpc/svc_auth.h (_authenticate_internal): Add prototype.
* include/sys/socket.h (__sendto, __recvfrom, __sendmsg, __recvmsg,
__setsockopt, __getsockname, __bind, __listen): Add prototypes.
* inet/rexec.c (rexec_af): Use __listen and __getsockname.
* inet/rcmd.c (rcmd_af): Use __listen.
(rresvport_af): Use __bind.
* sunrpc/clnt_udp.c: Use INTUSE calls to bindresvport,
authunix_create, authunix_create_default, authnone_create,
authdes_pk_create, clnt_create, clnttcp_create, clntudp_create,
clntudp_bufcreate, clntunix_create svc_sendreply, svcerr_decode,
svc_getreq, svc_getreq_common, svc_getreqset, svc_getreq_poll,
svc_register, svc_unregister, svcudp_create, svcudp_bufcreate,
_authenticate, add INTDEF after such function definitions.
Use __listen, __bind, __sendto, __recvfrom, __sendmsg, __recvmsg,
__setsockopt, __getsockname instead of non-__ variants.
* sunrpc/pmap_rmt.c: Likewise.
* sunrpc/rtime.c: Likewise.
* sunrpc/svc_udp.c: Likewise.
* sunrpc/clnt_unix.c: Likewise.
* sunrpc/svc_unix.c: Likewise.
* sunrpc/bindrsvprt.c: Likewise.
* sunrpc/svc_tcp.c: Likewise.
* sunrpc/auth_none.c: Likewise.
* sunrpc/clnt_raw.c: Likewise.
* sunrpc/clnt_tcp.c: Likewise.
* sunrpc/auth_unix.c: Likewise.
* sunrpc/key_call.c: Likewise.
* sunrpc/clnt_gen.c: Likewise.
* sunrpc/pm_getmaps.c: Likewise.
* sunrpc/clnt_simp.c: Likewise.
* sunrpc/pmap_clnt.c: Likewise.
* sunrpc/svc_run.c: Likewise.
* sunrpc/svc.c: Likewise.
* sunrpc/svc_simple.c: Likewise.
* sunrpc/pm_getport.c: Likewise.
* sunrpc/auth_des.c: Likewise.
* sunrpc/svc_auth.c: Likewise.
* sysdeps/generic/unwind-dw2-fde.c (__register_frame_info_bases,
__register_frame_info_table_bases, __deregister_frame_info_bases):
Add INTDEF.
(__register_frame_info_bases_internal,
__register_frame_info_table_bases_internal,
__deregister_frame_info_bases_internal): Add prototypes.
(__register_frame_info, __register_frame): Use INTUSE in call to
__register_frame_info_bases.
(__register_frame_info_table): Similarly.
(__deregister_frame_info, __deregister_frame): Similarly.
* sysdeps/generic/sendto.c (__sendto): Renamed from sendto, add
sendto as weak alias.
* sysdeps/mach/hurd/sendto.c: Likewise.
* sysdeps/generic/recvfrom.c (__recvfrom): Renamed from recvfrom, add
recvfrom as weak alias.
* sysdeps/mach/hurd/recvfrom.c: Likewise.
* sysdeps/unix/sysv/aix/recvfrom.c: Likewise.
* sysdeps/generic/recvmsg.c (__recvmsg): Renamed from recvmsg, add
recvmsg as weak alias.
* sysdeps/unix/sysv/aix/recvmsg.c: Likewise.
* sysdeps/generic/sendmsg.c (__sendmsg): Renamed from sendmsg, add
sendmsg as weak alias.
* sysdeps/unix/sysv/aix/sendmsg.c: Likewise.
* sysdeps/generic/setsockopt.c (__setsockopt): Renamed from
setsockopt, add setsockopt as weak alias.
* sysdeps/mach/hurd/setsockopt.c: Likewise.
* sysdeps/generic/bind.c (__bind): Renamed from bind, add bind as
weak alias.
* sysdeps/mach/hurd/bind.c: Likewise.
* sysdeps/generic/listen.c (__listen): Renamed from listen, add listen
as weak alias.
* sysdeps/mach/hurd/listen.c: Likewise.
* sysdeps/generic/getsockname.c (__getsockname): Renamed from
getsockname, add getsockname as weak alias.
* sysdeps/mach/hurd/getsockname.c: Likewise.
* sysdeps/unix/sysv/aix/getsockname.c: Likewise.
* sysdeps/mach/hurd/recvmsg.c (__recvmsg): Add weak alias.
* sysdeps/mach/hurd/sendmsg.c (__sendmsg): Add weak alias.
* sysdeps/unix/inet/syscalls.list (__bind, __listen, __recvmsg,
__recvfrom, __sendmsg, __sendto, __setsockopt): Add aliases.
* sysdeps/unix/sysv/linux/alpha/syscalls.list (__recvmsg, __sendmsg):
Add aliases.
* sysdeps/unix/sysv/linux/ia64/syscalls.list: Likewise.
* sysdeps/unix/sysv/linux/s390/s390-64/syscalls.list: Likewise.
* sysdeps/unix/sysv/linux/hppa/syscalls.list: Likewise.
* sysdeps/unix/sysv/linux/x86_64/syscalls.list: Likewise.
* sysdeps/unix/sysv/linux/recvfrom.S (__recvfrom): Add weak alias.
* sysdeps/unix/sysv/linux/recvmsg.S (__recvmsg): Likewise.
* sysdeps/unix/sysv/linux/sendmsg.S (__sendmsg): Likewise.
* sysdeps/unix/sysv/linux/sendto.S (__sendto): Likewise.
* sysdeps/unix/sysv/linux/setsockopt.S (__setsockopt): Likewise.
* sysdeps/unix/sysv/linux/bind.S (__bind): Likewise.
* sysdeps/unix/sysv/linux/listen.S (__listen): Likewise.
* sysdeps/unix/sysv/linux/getsockname.S (__getsockname): Likewise.
2002-05-10 Jakub Jelinek <jakub@redhat.com>
* locale/programs/localedef.h (show_archive_content): Add verbose
argument.
* locale/programs/localedef.c (main): Adjust caller.
* locale/programs/locarchive.c (struct nameent, struct dataent): New.
(nameentcmp, dataentcmp): New functions.
(xstrcmp): Remove.
(show_archive_content): Print verbose listing with --list-archive -v.
* locale/programs/locarchive.c (open_archive): Take extra argument
readonly. If true open file with O_RDONLY and don't create the
archive if it doesn't exist.
Adapt all callers.
(close_archive): Don't do anything if fd element is -1.
* locale/programs/localedef.h (open_archive): Adjust prototype.
* locale/programs/locfile.c (write_all_categories): Adjust open_archive
call.
* malloc/malloc.c (__posix_memalign): Correct check for size of
alignment value [PR libc/3444].
2002-05-15 02:22:23 +02:00
|
|
|
h->cl_auth = INTUSE(authnone_create) ();
|
1998-07-28 18:26:04 +02:00
|
|
|
return h;
|
|
|
|
|
|
|
|
fooy:
|
|
|
|
/*
|
|
|
|
* Something goofed, free stuff and barf
|
|
|
|
*/
|
|
|
|
mem_free ((caddr_t) ct, sizeof (struct ct_data));
|
|
|
|
mem_free ((caddr_t) h, sizeof (CLIENT));
|
|
|
|
return (CLIENT *) NULL;
|
|
|
|
}
|
Update.
2002-05-11 Jakub Jelinek <jakub@redhat.com>
* include/netinet/in.h (bindresvport_internal): Add prototype.
* include/rpc/auth.h (authunix_create_internal,
authunix_create_default_internal, authnone_create_internal,
authdes_pk_create_internal): Add prototypes.
* include/rpc/clnt.h (clnt_create_internal, clnttcp_create_internal,
clntudp_create_internal, clntudp_bufcreate_internal,
clntunix_create_internal): Add prototypes.
* include/rpc/svc.h (svc_sendreply_internal, svcerr_decode_internal,
svc_getreq_internal, svc_getreq_common_internal,
svc_getreqset_internal, svc_getreq_poll_internal,
svc_register_internal, svc_unregister_internal,
svcudp_create_internal, svcudp_bufcreate_internal): Add prototypes.
* include/rpc/svc_auth.h (_authenticate_internal): Add prototype.
* include/sys/socket.h (__sendto, __recvfrom, __sendmsg, __recvmsg,
__setsockopt, __getsockname, __bind, __listen): Add prototypes.
* inet/rexec.c (rexec_af): Use __listen and __getsockname.
* inet/rcmd.c (rcmd_af): Use __listen.
(rresvport_af): Use __bind.
* sunrpc/clnt_udp.c: Use INTUSE calls to bindresvport,
authunix_create, authunix_create_default, authnone_create,
authdes_pk_create, clnt_create, clnttcp_create, clntudp_create,
clntudp_bufcreate, clntunix_create svc_sendreply, svcerr_decode,
svc_getreq, svc_getreq_common, svc_getreqset, svc_getreq_poll,
svc_register, svc_unregister, svcudp_create, svcudp_bufcreate,
_authenticate, add INTDEF after such function definitions.
Use __listen, __bind, __sendto, __recvfrom, __sendmsg, __recvmsg,
__setsockopt, __getsockname instead of non-__ variants.
* sunrpc/pmap_rmt.c: Likewise.
* sunrpc/rtime.c: Likewise.
* sunrpc/svc_udp.c: Likewise.
* sunrpc/clnt_unix.c: Likewise.
* sunrpc/svc_unix.c: Likewise.
* sunrpc/bindrsvprt.c: Likewise.
* sunrpc/svc_tcp.c: Likewise.
* sunrpc/auth_none.c: Likewise.
* sunrpc/clnt_raw.c: Likewise.
* sunrpc/clnt_tcp.c: Likewise.
* sunrpc/auth_unix.c: Likewise.
* sunrpc/key_call.c: Likewise.
* sunrpc/clnt_gen.c: Likewise.
* sunrpc/pm_getmaps.c: Likewise.
* sunrpc/clnt_simp.c: Likewise.
* sunrpc/pmap_clnt.c: Likewise.
* sunrpc/svc_run.c: Likewise.
* sunrpc/svc.c: Likewise.
* sunrpc/svc_simple.c: Likewise.
* sunrpc/pm_getport.c: Likewise.
* sunrpc/auth_des.c: Likewise.
* sunrpc/svc_auth.c: Likewise.
* sysdeps/generic/unwind-dw2-fde.c (__register_frame_info_bases,
__register_frame_info_table_bases, __deregister_frame_info_bases):
Add INTDEF.
(__register_frame_info_bases_internal,
__register_frame_info_table_bases_internal,
__deregister_frame_info_bases_internal): Add prototypes.
(__register_frame_info, __register_frame): Use INTUSE in call to
__register_frame_info_bases.
(__register_frame_info_table): Similarly.
(__deregister_frame_info, __deregister_frame): Similarly.
* sysdeps/generic/sendto.c (__sendto): Renamed from sendto, add
sendto as weak alias.
* sysdeps/mach/hurd/sendto.c: Likewise.
* sysdeps/generic/recvfrom.c (__recvfrom): Renamed from recvfrom, add
recvfrom as weak alias.
* sysdeps/mach/hurd/recvfrom.c: Likewise.
* sysdeps/unix/sysv/aix/recvfrom.c: Likewise.
* sysdeps/generic/recvmsg.c (__recvmsg): Renamed from recvmsg, add
recvmsg as weak alias.
* sysdeps/unix/sysv/aix/recvmsg.c: Likewise.
* sysdeps/generic/sendmsg.c (__sendmsg): Renamed from sendmsg, add
sendmsg as weak alias.
* sysdeps/unix/sysv/aix/sendmsg.c: Likewise.
* sysdeps/generic/setsockopt.c (__setsockopt): Renamed from
setsockopt, add setsockopt as weak alias.
* sysdeps/mach/hurd/setsockopt.c: Likewise.
* sysdeps/generic/bind.c (__bind): Renamed from bind, add bind as
weak alias.
* sysdeps/mach/hurd/bind.c: Likewise.
* sysdeps/generic/listen.c (__listen): Renamed from listen, add listen
as weak alias.
* sysdeps/mach/hurd/listen.c: Likewise.
* sysdeps/generic/getsockname.c (__getsockname): Renamed from
getsockname, add getsockname as weak alias.
* sysdeps/mach/hurd/getsockname.c: Likewise.
* sysdeps/unix/sysv/aix/getsockname.c: Likewise.
* sysdeps/mach/hurd/recvmsg.c (__recvmsg): Add weak alias.
* sysdeps/mach/hurd/sendmsg.c (__sendmsg): Add weak alias.
* sysdeps/unix/inet/syscalls.list (__bind, __listen, __recvmsg,
__recvfrom, __sendmsg, __sendto, __setsockopt): Add aliases.
* sysdeps/unix/sysv/linux/alpha/syscalls.list (__recvmsg, __sendmsg):
Add aliases.
* sysdeps/unix/sysv/linux/ia64/syscalls.list: Likewise.
* sysdeps/unix/sysv/linux/s390/s390-64/syscalls.list: Likewise.
* sysdeps/unix/sysv/linux/hppa/syscalls.list: Likewise.
* sysdeps/unix/sysv/linux/x86_64/syscalls.list: Likewise.
* sysdeps/unix/sysv/linux/recvfrom.S (__recvfrom): Add weak alias.
* sysdeps/unix/sysv/linux/recvmsg.S (__recvmsg): Likewise.
* sysdeps/unix/sysv/linux/sendmsg.S (__sendmsg): Likewise.
* sysdeps/unix/sysv/linux/sendto.S (__sendto): Likewise.
* sysdeps/unix/sysv/linux/setsockopt.S (__setsockopt): Likewise.
* sysdeps/unix/sysv/linux/bind.S (__bind): Likewise.
* sysdeps/unix/sysv/linux/listen.S (__listen): Likewise.
* sysdeps/unix/sysv/linux/getsockname.S (__getsockname): Likewise.
2002-05-10 Jakub Jelinek <jakub@redhat.com>
* locale/programs/localedef.h (show_archive_content): Add verbose
argument.
* locale/programs/localedef.c (main): Adjust caller.
* locale/programs/locarchive.c (struct nameent, struct dataent): New.
(nameentcmp, dataentcmp): New functions.
(xstrcmp): Remove.
(show_archive_content): Print verbose listing with --list-archive -v.
* locale/programs/locarchive.c (open_archive): Take extra argument
readonly. If true open file with O_RDONLY and don't create the
archive if it doesn't exist.
Adapt all callers.
(close_archive): Don't do anything if fd element is -1.
* locale/programs/localedef.h (open_archive): Adjust prototype.
* locale/programs/locfile.c (write_all_categories): Adjust open_archive
call.
* malloc/malloc.c (__posix_memalign): Correct check for size of
alignment value [PR libc/3444].
2002-05-15 02:22:23 +02:00
|
|
|
INTDEF (clntunix_create)
|
1998-07-28 18:26:04 +02:00
|
|
|
|
|
|
|
static enum clnt_stat
|
|
|
|
clntunix_call (h, proc, xdr_args, args_ptr, xdr_results, results_ptr, timeout)
|
|
|
|
CLIENT *h;
|
|
|
|
u_long proc;
|
|
|
|
xdrproc_t xdr_args;
|
|
|
|
caddr_t args_ptr;
|
|
|
|
xdrproc_t xdr_results;
|
|
|
|
caddr_t results_ptr;
|
|
|
|
struct timeval timeout;
|
|
|
|
{
|
|
|
|
struct ct_data *ct = (struct ct_data *) h->cl_private;
|
|
|
|
XDR *xdrs = &(ct->ct_xdrs);
|
|
|
|
struct rpc_msg reply_msg;
|
|
|
|
u_long x_id;
|
|
|
|
u_int32_t *msg_x_id = (u_int32_t *) (ct->ct_mcall); /* yuk */
|
|
|
|
bool_t shipnow;
|
|
|
|
int refreshes = 2;
|
|
|
|
|
|
|
|
if (!ct->ct_waitset)
|
|
|
|
{
|
|
|
|
ct->ct_wait = timeout;
|
|
|
|
}
|
|
|
|
|
|
|
|
shipnow =
|
2000-11-01 10:06:22 +01:00
|
|
|
(xdr_results == (xdrproc_t) 0 && ct->ct_wait.tv_sec == 0
|
|
|
|
&& ct->ct_wait.tv_usec == 0) ? FALSE : TRUE;
|
1998-07-28 18:26:04 +02:00
|
|
|
|
|
|
|
call_again:
|
|
|
|
xdrs->x_op = XDR_ENCODE;
|
|
|
|
ct->ct_error.re_status = RPC_SUCCESS;
|
|
|
|
x_id = ntohl (--(*msg_x_id));
|
|
|
|
if ((!XDR_PUTBYTES (xdrs, ct->ct_mcall, ct->ct_mpos)) ||
|
|
|
|
(!XDR_PUTLONG (xdrs, (long *) &proc)) ||
|
|
|
|
(!AUTH_MARSHALL (h->cl_auth, xdrs)) ||
|
|
|
|
(!(*xdr_args) (xdrs, args_ptr)))
|
|
|
|
{
|
|
|
|
if (ct->ct_error.re_status == RPC_SUCCESS)
|
|
|
|
ct->ct_error.re_status = RPC_CANTENCODEARGS;
|
2002-02-26 02:45:59 +01:00
|
|
|
(void) INTUSE(xdrrec_endofrecord) (xdrs, TRUE);
|
1998-07-28 18:26:04 +02:00
|
|
|
return ct->ct_error.re_status;
|
|
|
|
}
|
2002-02-26 02:45:59 +01:00
|
|
|
if (!INTUSE(xdrrec_endofrecord) (xdrs, shipnow))
|
1998-07-28 18:26:04 +02:00
|
|
|
return ct->ct_error.re_status = RPC_CANTSEND;
|
|
|
|
if (!shipnow)
|
|
|
|
return RPC_SUCCESS;
|
|
|
|
/*
|
|
|
|
* Hack to provide rpc-based message passing
|
|
|
|
*/
|
2000-11-01 10:06:22 +01:00
|
|
|
if (ct->ct_wait.tv_sec == 0 && ct->ct_wait.tv_usec == 0)
|
1998-07-28 18:26:04 +02:00
|
|
|
return ct->ct_error.re_status = RPC_TIMEDOUT;
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Keep receiving until we get a valid transaction id
|
|
|
|
*/
|
|
|
|
xdrs->x_op = XDR_DECODE;
|
|
|
|
while (TRUE)
|
|
|
|
{
|
|
|
|
reply_msg.acpted_rply.ar_verf = _null_auth;
|
|
|
|
reply_msg.acpted_rply.ar_results.where = NULL;
|
2002-02-26 02:45:59 +01:00
|
|
|
reply_msg.acpted_rply.ar_results.proc = (xdrproc_t)INTUSE(xdr_void);
|
|
|
|
if (!INTUSE(xdrrec_skiprecord) (xdrs))
|
1998-07-28 18:26:04 +02:00
|
|
|
return ct->ct_error.re_status;
|
|
|
|
/* now decode and validate the response header */
|
2002-02-26 02:45:59 +01:00
|
|
|
if (!INTUSE(xdr_replymsg) (xdrs, &reply_msg))
|
1998-07-28 18:26:04 +02:00
|
|
|
{
|
|
|
|
if (ct->ct_error.re_status == RPC_SUCCESS)
|
|
|
|
continue;
|
|
|
|
return ct->ct_error.re_status;
|
|
|
|
}
|
|
|
|
if (reply_msg.rm_xid == x_id)
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* process header
|
|
|
|
*/
|
|
|
|
_seterr_reply (&reply_msg, &(ct->ct_error));
|
|
|
|
if (ct->ct_error.re_status == RPC_SUCCESS)
|
|
|
|
{
|
|
|
|
if (!AUTH_VALIDATE (h->cl_auth, &reply_msg.acpted_rply.ar_verf))
|
|
|
|
{
|
|
|
|
ct->ct_error.re_status = RPC_AUTHERROR;
|
|
|
|
ct->ct_error.re_why = AUTH_INVALIDRESP;
|
|
|
|
}
|
|
|
|
else if (!(*xdr_results) (xdrs, results_ptr))
|
|
|
|
{
|
|
|
|
if (ct->ct_error.re_status == RPC_SUCCESS)
|
|
|
|
ct->ct_error.re_status = RPC_CANTDECODERES;
|
|
|
|
}
|
|
|
|
/* free verifier ... */
|
|
|
|
if (reply_msg.acpted_rply.ar_verf.oa_base != NULL)
|
|
|
|
{
|
|
|
|
xdrs->x_op = XDR_FREE;
|
2002-02-26 02:45:59 +01:00
|
|
|
(void) INTUSE(xdr_opaque_auth) (xdrs,
|
|
|
|
&(reply_msg.acpted_rply.ar_verf));
|
1998-07-28 18:26:04 +02:00
|
|
|
}
|
|
|
|
} /* end successful completion */
|
|
|
|
else
|
|
|
|
{
|
|
|
|
/* maybe our credentials need to be refreshed ... */
|
|
|
|
if (refreshes-- && AUTH_REFRESH (h->cl_auth))
|
|
|
|
goto call_again;
|
|
|
|
} /* end of unsuccessful completion */
|
|
|
|
return ct->ct_error.re_status;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
clntunix_geterr (CLIENT *h, struct rpc_err *errp)
|
|
|
|
{
|
|
|
|
struct ct_data *ct = (struct ct_data *) h->cl_private;
|
|
|
|
|
|
|
|
*errp = ct->ct_error;
|
|
|
|
}
|
|
|
|
|
|
|
|
static bool_t
|
|
|
|
clntunix_freeres (cl, xdr_res, res_ptr)
|
|
|
|
CLIENT *cl;
|
|
|
|
xdrproc_t xdr_res;
|
|
|
|
caddr_t res_ptr;
|
|
|
|
{
|
|
|
|
struct ct_data *ct = (struct ct_data *) cl->cl_private;
|
|
|
|
XDR *xdrs = &(ct->ct_xdrs);
|
|
|
|
|
|
|
|
xdrs->x_op = XDR_FREE;
|
|
|
|
return (*xdr_res) (xdrs, res_ptr);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
clntunix_abort ()
|
|
|
|
{
|
|
|
|
}
|
|
|
|
|
|
|
|
static bool_t
|
|
|
|
clntunix_control (CLIENT *cl, int request, char *info)
|
|
|
|
{
|
|
|
|
struct ct_data *ct = (struct ct_data *) cl->cl_private;
|
|
|
|
|
|
|
|
|
|
|
|
switch (request)
|
|
|
|
{
|
|
|
|
case CLSET_FD_CLOSE:
|
|
|
|
ct->ct_closeit = TRUE;
|
|
|
|
break;
|
|
|
|
case CLSET_FD_NCLOSE:
|
|
|
|
ct->ct_closeit = FALSE;
|
|
|
|
break;
|
|
|
|
case CLSET_TIMEOUT:
|
|
|
|
ct->ct_wait = *(struct timeval *) info;
|
|
|
|
break;
|
|
|
|
case CLGET_TIMEOUT:
|
|
|
|
*(struct timeval *) info = ct->ct_wait;
|
|
|
|
break;
|
|
|
|
case CLGET_SERVER_ADDR:
|
|
|
|
*(struct sockaddr_un *) info = ct->ct_addr;
|
|
|
|
break;
|
|
|
|
case CLGET_FD:
|
|
|
|
*(int *)info = ct->ct_sock;
|
|
|
|
break;
|
|
|
|
case CLGET_XID:
|
|
|
|
/*
|
|
|
|
* use the knowledge that xid is the
|
|
|
|
* first element in the call structure *.
|
|
|
|
* This will get the xid of the PREVIOUS call
|
|
|
|
*/
|
|
|
|
*(u_long *) info = ntohl (*(u_long *)ct->ct_mcall);
|
|
|
|
break;
|
|
|
|
case CLSET_XID:
|
|
|
|
/* This will set the xid of the NEXT call */
|
|
|
|
*(u_long *) ct->ct_mcall = htonl (*(u_long *)info - 1);
|
|
|
|
/* decrement by 1 as clntunix_call() increments once */
|
|
|
|
case CLGET_VERS:
|
|
|
|
/*
|
|
|
|
* This RELIES on the information that, in the call body,
|
|
|
|
* the version number field is the fifth field from the
|
|
|
|
* begining of the RPC header. MUST be changed if the
|
|
|
|
* call_struct is changed
|
|
|
|
*/
|
|
|
|
*(u_long *) info = ntohl (*(u_long *) (ct->ct_mcall
|
|
|
|
+ 4 * BYTES_PER_XDR_UNIT));
|
|
|
|
break;
|
|
|
|
case CLSET_VERS:
|
|
|
|
*(u_long *) (ct->ct_mcall + 4 * BYTES_PER_XDR_UNIT)
|
|
|
|
= htonl (*(u_long *) info);
|
|
|
|
break;
|
|
|
|
case CLGET_PROG:
|
|
|
|
/*
|
|
|
|
* This RELIES on the information that, in the call body,
|
|
|
|
* the program number field is the field from the
|
|
|
|
* begining of the RPC header. MUST be changed if the
|
|
|
|
* call_struct is changed
|
|
|
|
*/
|
|
|
|
*(u_long *) info = ntohl (*(u_long *) (ct->ct_mcall
|
|
|
|
+ 3 * BYTES_PER_XDR_UNIT));
|
|
|
|
break;
|
|
|
|
case CLSET_PROG:
|
|
|
|
*(u_long *) (ct->ct_mcall + 3 * BYTES_PER_XDR_UNIT)
|
|
|
|
= htonl(*(u_long *) info);
|
|
|
|
break;
|
|
|
|
/* The following are only possible with TI-RPC */
|
|
|
|
case CLGET_RETRY_TIMEOUT:
|
|
|
|
case CLSET_RETRY_TIMEOUT:
|
|
|
|
case CLGET_SVC_ADDR:
|
|
|
|
case CLSET_SVC_ADDR:
|
|
|
|
case CLSET_PUSH_TIMOD:
|
|
|
|
case CLSET_POP_TIMOD:
|
|
|
|
default:
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
clntunix_destroy (CLIENT *h)
|
|
|
|
{
|
|
|
|
struct ct_data *ct =
|
|
|
|
(struct ct_data *) h->cl_private;
|
|
|
|
|
|
|
|
if (ct->ct_closeit)
|
|
|
|
{
|
1998-12-17 14:58:32 +01:00
|
|
|
(void) __close (ct->ct_sock);
|
1998-07-28 18:26:04 +02:00
|
|
|
}
|
|
|
|
XDR_DESTROY (&(ct->ct_xdrs));
|
|
|
|
mem_free ((caddr_t) ct, sizeof (struct ct_data));
|
|
|
|
mem_free ((caddr_t) h, sizeof (CLIENT));
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
1999-03-19 03:01:36 +01:00
|
|
|
__msgread (int sock, void *data, size_t cnt)
|
1998-07-28 18:26:04 +02:00
|
|
|
{
|
1999-03-19 03:01:36 +01:00
|
|
|
struct iovec iov;
|
1998-07-28 18:26:04 +02:00
|
|
|
struct msghdr msg;
|
1998-12-20 11:24:39 +01:00
|
|
|
#ifdef SCM_CREDENTIALS
|
1999-03-19 03:01:36 +01:00
|
|
|
static char cm[CMSG_SPACE(sizeof (struct ucred))];
|
1998-12-20 11:24:39 +01:00
|
|
|
#endif
|
1999-03-19 03:01:36 +01:00
|
|
|
int len;
|
1998-07-28 18:26:04 +02:00
|
|
|
|
1999-03-19 03:01:36 +01:00
|
|
|
iov.iov_base = data;
|
|
|
|
iov.iov_len = cnt;
|
1998-07-28 18:26:04 +02:00
|
|
|
|
1999-03-19 03:01:36 +01:00
|
|
|
msg.msg_iov = &iov;
|
1998-07-28 18:26:04 +02:00
|
|
|
msg.msg_iovlen = 1;
|
|
|
|
msg.msg_name = NULL;
|
|
|
|
msg.msg_namelen = 0;
|
1998-12-20 11:24:39 +01:00
|
|
|
#ifdef SCM_CREDENTIALS
|
1999-03-19 03:01:36 +01:00
|
|
|
msg.msg_control = (caddr_t) &cm;
|
|
|
|
msg.msg_controllen = CMSG_SPACE(sizeof (struct ucred));
|
1998-12-20 11:24:39 +01:00
|
|
|
#endif
|
1998-07-28 18:26:04 +02:00
|
|
|
msg.msg_flags = 0;
|
|
|
|
|
1998-08-03 18:47:01 +02:00
|
|
|
#ifdef SO_PASSCRED
|
1998-11-29 12:17:25 +01:00
|
|
|
{
|
|
|
|
int on = 1;
|
Update.
2002-05-11 Jakub Jelinek <jakub@redhat.com>
* include/netinet/in.h (bindresvport_internal): Add prototype.
* include/rpc/auth.h (authunix_create_internal,
authunix_create_default_internal, authnone_create_internal,
authdes_pk_create_internal): Add prototypes.
* include/rpc/clnt.h (clnt_create_internal, clnttcp_create_internal,
clntudp_create_internal, clntudp_bufcreate_internal,
clntunix_create_internal): Add prototypes.
* include/rpc/svc.h (svc_sendreply_internal, svcerr_decode_internal,
svc_getreq_internal, svc_getreq_common_internal,
svc_getreqset_internal, svc_getreq_poll_internal,
svc_register_internal, svc_unregister_internal,
svcudp_create_internal, svcudp_bufcreate_internal): Add prototypes.
* include/rpc/svc_auth.h (_authenticate_internal): Add prototype.
* include/sys/socket.h (__sendto, __recvfrom, __sendmsg, __recvmsg,
__setsockopt, __getsockname, __bind, __listen): Add prototypes.
* inet/rexec.c (rexec_af): Use __listen and __getsockname.
* inet/rcmd.c (rcmd_af): Use __listen.
(rresvport_af): Use __bind.
* sunrpc/clnt_udp.c: Use INTUSE calls to bindresvport,
authunix_create, authunix_create_default, authnone_create,
authdes_pk_create, clnt_create, clnttcp_create, clntudp_create,
clntudp_bufcreate, clntunix_create svc_sendreply, svcerr_decode,
svc_getreq, svc_getreq_common, svc_getreqset, svc_getreq_poll,
svc_register, svc_unregister, svcudp_create, svcudp_bufcreate,
_authenticate, add INTDEF after such function definitions.
Use __listen, __bind, __sendto, __recvfrom, __sendmsg, __recvmsg,
__setsockopt, __getsockname instead of non-__ variants.
* sunrpc/pmap_rmt.c: Likewise.
* sunrpc/rtime.c: Likewise.
* sunrpc/svc_udp.c: Likewise.
* sunrpc/clnt_unix.c: Likewise.
* sunrpc/svc_unix.c: Likewise.
* sunrpc/bindrsvprt.c: Likewise.
* sunrpc/svc_tcp.c: Likewise.
* sunrpc/auth_none.c: Likewise.
* sunrpc/clnt_raw.c: Likewise.
* sunrpc/clnt_tcp.c: Likewise.
* sunrpc/auth_unix.c: Likewise.
* sunrpc/key_call.c: Likewise.
* sunrpc/clnt_gen.c: Likewise.
* sunrpc/pm_getmaps.c: Likewise.
* sunrpc/clnt_simp.c: Likewise.
* sunrpc/pmap_clnt.c: Likewise.
* sunrpc/svc_run.c: Likewise.
* sunrpc/svc.c: Likewise.
* sunrpc/svc_simple.c: Likewise.
* sunrpc/pm_getport.c: Likewise.
* sunrpc/auth_des.c: Likewise.
* sunrpc/svc_auth.c: Likewise.
* sysdeps/generic/unwind-dw2-fde.c (__register_frame_info_bases,
__register_frame_info_table_bases, __deregister_frame_info_bases):
Add INTDEF.
(__register_frame_info_bases_internal,
__register_frame_info_table_bases_internal,
__deregister_frame_info_bases_internal): Add prototypes.
(__register_frame_info, __register_frame): Use INTUSE in call to
__register_frame_info_bases.
(__register_frame_info_table): Similarly.
(__deregister_frame_info, __deregister_frame): Similarly.
* sysdeps/generic/sendto.c (__sendto): Renamed from sendto, add
sendto as weak alias.
* sysdeps/mach/hurd/sendto.c: Likewise.
* sysdeps/generic/recvfrom.c (__recvfrom): Renamed from recvfrom, add
recvfrom as weak alias.
* sysdeps/mach/hurd/recvfrom.c: Likewise.
* sysdeps/unix/sysv/aix/recvfrom.c: Likewise.
* sysdeps/generic/recvmsg.c (__recvmsg): Renamed from recvmsg, add
recvmsg as weak alias.
* sysdeps/unix/sysv/aix/recvmsg.c: Likewise.
* sysdeps/generic/sendmsg.c (__sendmsg): Renamed from sendmsg, add
sendmsg as weak alias.
* sysdeps/unix/sysv/aix/sendmsg.c: Likewise.
* sysdeps/generic/setsockopt.c (__setsockopt): Renamed from
setsockopt, add setsockopt as weak alias.
* sysdeps/mach/hurd/setsockopt.c: Likewise.
* sysdeps/generic/bind.c (__bind): Renamed from bind, add bind as
weak alias.
* sysdeps/mach/hurd/bind.c: Likewise.
* sysdeps/generic/listen.c (__listen): Renamed from listen, add listen
as weak alias.
* sysdeps/mach/hurd/listen.c: Likewise.
* sysdeps/generic/getsockname.c (__getsockname): Renamed from
getsockname, add getsockname as weak alias.
* sysdeps/mach/hurd/getsockname.c: Likewise.
* sysdeps/unix/sysv/aix/getsockname.c: Likewise.
* sysdeps/mach/hurd/recvmsg.c (__recvmsg): Add weak alias.
* sysdeps/mach/hurd/sendmsg.c (__sendmsg): Add weak alias.
* sysdeps/unix/inet/syscalls.list (__bind, __listen, __recvmsg,
__recvfrom, __sendmsg, __sendto, __setsockopt): Add aliases.
* sysdeps/unix/sysv/linux/alpha/syscalls.list (__recvmsg, __sendmsg):
Add aliases.
* sysdeps/unix/sysv/linux/ia64/syscalls.list: Likewise.
* sysdeps/unix/sysv/linux/s390/s390-64/syscalls.list: Likewise.
* sysdeps/unix/sysv/linux/hppa/syscalls.list: Likewise.
* sysdeps/unix/sysv/linux/x86_64/syscalls.list: Likewise.
* sysdeps/unix/sysv/linux/recvfrom.S (__recvfrom): Add weak alias.
* sysdeps/unix/sysv/linux/recvmsg.S (__recvmsg): Likewise.
* sysdeps/unix/sysv/linux/sendmsg.S (__sendmsg): Likewise.
* sysdeps/unix/sysv/linux/sendto.S (__sendto): Likewise.
* sysdeps/unix/sysv/linux/setsockopt.S (__setsockopt): Likewise.
* sysdeps/unix/sysv/linux/bind.S (__bind): Likewise.
* sysdeps/unix/sysv/linux/listen.S (__listen): Likewise.
* sysdeps/unix/sysv/linux/getsockname.S (__getsockname): Likewise.
2002-05-10 Jakub Jelinek <jakub@redhat.com>
* locale/programs/localedef.h (show_archive_content): Add verbose
argument.
* locale/programs/localedef.c (main): Adjust caller.
* locale/programs/locarchive.c (struct nameent, struct dataent): New.
(nameentcmp, dataentcmp): New functions.
(xstrcmp): Remove.
(show_archive_content): Print verbose listing with --list-archive -v.
* locale/programs/locarchive.c (open_archive): Take extra argument
readonly. If true open file with O_RDONLY and don't create the
archive if it doesn't exist.
Adapt all callers.
(close_archive): Don't do anything if fd element is -1.
* locale/programs/localedef.h (open_archive): Adjust prototype.
* locale/programs/locfile.c (write_all_categories): Adjust open_archive
call.
* malloc/malloc.c (__posix_memalign): Correct check for size of
alignment value [PR libc/3444].
2002-05-15 02:22:23 +02:00
|
|
|
if (__setsockopt (sock, SOL_SOCKET, SO_PASSCRED, &on, sizeof (on)))
|
1998-11-29 12:17:25 +01:00
|
|
|
return -1;
|
|
|
|
}
|
1998-08-03 18:47:01 +02:00
|
|
|
#endif
|
1998-07-28 18:26:04 +02:00
|
|
|
|
1999-03-19 03:01:36 +01:00
|
|
|
restart:
|
Update.
2002-05-11 Jakub Jelinek <jakub@redhat.com>
* include/netinet/in.h (bindresvport_internal): Add prototype.
* include/rpc/auth.h (authunix_create_internal,
authunix_create_default_internal, authnone_create_internal,
authdes_pk_create_internal): Add prototypes.
* include/rpc/clnt.h (clnt_create_internal, clnttcp_create_internal,
clntudp_create_internal, clntudp_bufcreate_internal,
clntunix_create_internal): Add prototypes.
* include/rpc/svc.h (svc_sendreply_internal, svcerr_decode_internal,
svc_getreq_internal, svc_getreq_common_internal,
svc_getreqset_internal, svc_getreq_poll_internal,
svc_register_internal, svc_unregister_internal,
svcudp_create_internal, svcudp_bufcreate_internal): Add prototypes.
* include/rpc/svc_auth.h (_authenticate_internal): Add prototype.
* include/sys/socket.h (__sendto, __recvfrom, __sendmsg, __recvmsg,
__setsockopt, __getsockname, __bind, __listen): Add prototypes.
* inet/rexec.c (rexec_af): Use __listen and __getsockname.
* inet/rcmd.c (rcmd_af): Use __listen.
(rresvport_af): Use __bind.
* sunrpc/clnt_udp.c: Use INTUSE calls to bindresvport,
authunix_create, authunix_create_default, authnone_create,
authdes_pk_create, clnt_create, clnttcp_create, clntudp_create,
clntudp_bufcreate, clntunix_create svc_sendreply, svcerr_decode,
svc_getreq, svc_getreq_common, svc_getreqset, svc_getreq_poll,
svc_register, svc_unregister, svcudp_create, svcudp_bufcreate,
_authenticate, add INTDEF after such function definitions.
Use __listen, __bind, __sendto, __recvfrom, __sendmsg, __recvmsg,
__setsockopt, __getsockname instead of non-__ variants.
* sunrpc/pmap_rmt.c: Likewise.
* sunrpc/rtime.c: Likewise.
* sunrpc/svc_udp.c: Likewise.
* sunrpc/clnt_unix.c: Likewise.
* sunrpc/svc_unix.c: Likewise.
* sunrpc/bindrsvprt.c: Likewise.
* sunrpc/svc_tcp.c: Likewise.
* sunrpc/auth_none.c: Likewise.
* sunrpc/clnt_raw.c: Likewise.
* sunrpc/clnt_tcp.c: Likewise.
* sunrpc/auth_unix.c: Likewise.
* sunrpc/key_call.c: Likewise.
* sunrpc/clnt_gen.c: Likewise.
* sunrpc/pm_getmaps.c: Likewise.
* sunrpc/clnt_simp.c: Likewise.
* sunrpc/pmap_clnt.c: Likewise.
* sunrpc/svc_run.c: Likewise.
* sunrpc/svc.c: Likewise.
* sunrpc/svc_simple.c: Likewise.
* sunrpc/pm_getport.c: Likewise.
* sunrpc/auth_des.c: Likewise.
* sunrpc/svc_auth.c: Likewise.
* sysdeps/generic/unwind-dw2-fde.c (__register_frame_info_bases,
__register_frame_info_table_bases, __deregister_frame_info_bases):
Add INTDEF.
(__register_frame_info_bases_internal,
__register_frame_info_table_bases_internal,
__deregister_frame_info_bases_internal): Add prototypes.
(__register_frame_info, __register_frame): Use INTUSE in call to
__register_frame_info_bases.
(__register_frame_info_table): Similarly.
(__deregister_frame_info, __deregister_frame): Similarly.
* sysdeps/generic/sendto.c (__sendto): Renamed from sendto, add
sendto as weak alias.
* sysdeps/mach/hurd/sendto.c: Likewise.
* sysdeps/generic/recvfrom.c (__recvfrom): Renamed from recvfrom, add
recvfrom as weak alias.
* sysdeps/mach/hurd/recvfrom.c: Likewise.
* sysdeps/unix/sysv/aix/recvfrom.c: Likewise.
* sysdeps/generic/recvmsg.c (__recvmsg): Renamed from recvmsg, add
recvmsg as weak alias.
* sysdeps/unix/sysv/aix/recvmsg.c: Likewise.
* sysdeps/generic/sendmsg.c (__sendmsg): Renamed from sendmsg, add
sendmsg as weak alias.
* sysdeps/unix/sysv/aix/sendmsg.c: Likewise.
* sysdeps/generic/setsockopt.c (__setsockopt): Renamed from
setsockopt, add setsockopt as weak alias.
* sysdeps/mach/hurd/setsockopt.c: Likewise.
* sysdeps/generic/bind.c (__bind): Renamed from bind, add bind as
weak alias.
* sysdeps/mach/hurd/bind.c: Likewise.
* sysdeps/generic/listen.c (__listen): Renamed from listen, add listen
as weak alias.
* sysdeps/mach/hurd/listen.c: Likewise.
* sysdeps/generic/getsockname.c (__getsockname): Renamed from
getsockname, add getsockname as weak alias.
* sysdeps/mach/hurd/getsockname.c: Likewise.
* sysdeps/unix/sysv/aix/getsockname.c: Likewise.
* sysdeps/mach/hurd/recvmsg.c (__recvmsg): Add weak alias.
* sysdeps/mach/hurd/sendmsg.c (__sendmsg): Add weak alias.
* sysdeps/unix/inet/syscalls.list (__bind, __listen, __recvmsg,
__recvfrom, __sendmsg, __sendto, __setsockopt): Add aliases.
* sysdeps/unix/sysv/linux/alpha/syscalls.list (__recvmsg, __sendmsg):
Add aliases.
* sysdeps/unix/sysv/linux/ia64/syscalls.list: Likewise.
* sysdeps/unix/sysv/linux/s390/s390-64/syscalls.list: Likewise.
* sysdeps/unix/sysv/linux/hppa/syscalls.list: Likewise.
* sysdeps/unix/sysv/linux/x86_64/syscalls.list: Likewise.
* sysdeps/unix/sysv/linux/recvfrom.S (__recvfrom): Add weak alias.
* sysdeps/unix/sysv/linux/recvmsg.S (__recvmsg): Likewise.
* sysdeps/unix/sysv/linux/sendmsg.S (__sendmsg): Likewise.
* sysdeps/unix/sysv/linux/sendto.S (__sendto): Likewise.
* sysdeps/unix/sysv/linux/setsockopt.S (__setsockopt): Likewise.
* sysdeps/unix/sysv/linux/bind.S (__bind): Likewise.
* sysdeps/unix/sysv/linux/listen.S (__listen): Likewise.
* sysdeps/unix/sysv/linux/getsockname.S (__getsockname): Likewise.
2002-05-10 Jakub Jelinek <jakub@redhat.com>
* locale/programs/localedef.h (show_archive_content): Add verbose
argument.
* locale/programs/localedef.c (main): Adjust caller.
* locale/programs/locarchive.c (struct nameent, struct dataent): New.
(nameentcmp, dataentcmp): New functions.
(xstrcmp): Remove.
(show_archive_content): Print verbose listing with --list-archive -v.
* locale/programs/locarchive.c (open_archive): Take extra argument
readonly. If true open file with O_RDONLY and don't create the
archive if it doesn't exist.
Adapt all callers.
(close_archive): Don't do anything if fd element is -1.
* locale/programs/localedef.h (open_archive): Adjust prototype.
* locale/programs/locfile.c (write_all_categories): Adjust open_archive
call.
* malloc/malloc.c (__posix_memalign): Correct check for size of
alignment value [PR libc/3444].
2002-05-15 02:22:23 +02:00
|
|
|
len = __recvmsg (sock, &msg, 0);
|
1999-03-19 03:01:36 +01:00
|
|
|
if (len >= 0)
|
|
|
|
{
|
|
|
|
if (msg.msg_flags & MSG_CTRUNC || len == 0)
|
|
|
|
return 0;
|
|
|
|
else
|
|
|
|
return len;
|
|
|
|
}
|
|
|
|
if (errno == EINTR)
|
|
|
|
goto restart;
|
|
|
|
return -1;
|
1998-07-28 18:26:04 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
1999-03-19 03:01:36 +01:00
|
|
|
__msgwrite (int sock, void *data, size_t cnt)
|
1998-07-28 18:26:04 +02:00
|
|
|
{
|
1998-08-08 22:02:34 +02:00
|
|
|
#ifndef SCM_CREDENTIALS
|
1998-07-28 18:26:04 +02:00
|
|
|
/* We cannot implement this reliably. */
|
|
|
|
__set_errno (ENOSYS);
|
1998-07-29 16:52:00 +02:00
|
|
|
return -1;
|
1998-07-28 18:26:04 +02:00
|
|
|
#else
|
1999-03-19 03:01:36 +01:00
|
|
|
struct iovec iov;
|
1998-07-28 18:26:04 +02:00
|
|
|
struct msghdr msg;
|
1999-03-19 03:01:36 +01:00
|
|
|
struct cmsghdr *cmsg = alloca (CMSG_SPACE(sizeof (struct ucred)));
|
|
|
|
struct ucred cred;
|
|
|
|
int len;
|
1998-07-28 18:26:04 +02:00
|
|
|
|
|
|
|
/* XXX I'm not sure, if gete?id() is always correct, or if we should use
|
|
|
|
get?id(). But since keyserv needs geteuid(), we have no other chance.
|
|
|
|
It would be much better, if the kernel could pass both to the server. */
|
1999-03-19 03:01:36 +01:00
|
|
|
cred.pid = __getpid ();
|
|
|
|
cred.uid = __geteuid ();
|
|
|
|
cred.gid = __getegid ();
|
|
|
|
|
|
|
|
memcpy (CMSG_DATA(cmsg), &cred, sizeof (struct ucred));
|
|
|
|
cmsg->cmsg_level = SOL_SOCKET;
|
|
|
|
cmsg->cmsg_type = SCM_CREDENTIALS;
|
|
|
|
cmsg->cmsg_len = sizeof(*cmsg) + sizeof(struct ucred);
|
1998-07-28 18:26:04 +02:00
|
|
|
|
1999-03-19 03:01:36 +01:00
|
|
|
iov.iov_base = data;
|
|
|
|
iov.iov_len = cnt;
|
|
|
|
|
|
|
|
msg.msg_iov = &iov;
|
1998-07-28 18:26:04 +02:00
|
|
|
msg.msg_iovlen = 1;
|
|
|
|
msg.msg_name = NULL;
|
|
|
|
msg.msg_namelen = 0;
|
1999-03-19 03:01:36 +01:00
|
|
|
msg.msg_control = cmsg;
|
|
|
|
msg.msg_controllen = CMSG_ALIGN(cmsg->cmsg_len);
|
1998-07-28 18:26:04 +02:00
|
|
|
msg.msg_flags = 0;
|
|
|
|
|
1999-03-19 03:01:36 +01:00
|
|
|
restart:
|
Update.
2002-05-11 Jakub Jelinek <jakub@redhat.com>
* include/netinet/in.h (bindresvport_internal): Add prototype.
* include/rpc/auth.h (authunix_create_internal,
authunix_create_default_internal, authnone_create_internal,
authdes_pk_create_internal): Add prototypes.
* include/rpc/clnt.h (clnt_create_internal, clnttcp_create_internal,
clntudp_create_internal, clntudp_bufcreate_internal,
clntunix_create_internal): Add prototypes.
* include/rpc/svc.h (svc_sendreply_internal, svcerr_decode_internal,
svc_getreq_internal, svc_getreq_common_internal,
svc_getreqset_internal, svc_getreq_poll_internal,
svc_register_internal, svc_unregister_internal,
svcudp_create_internal, svcudp_bufcreate_internal): Add prototypes.
* include/rpc/svc_auth.h (_authenticate_internal): Add prototype.
* include/sys/socket.h (__sendto, __recvfrom, __sendmsg, __recvmsg,
__setsockopt, __getsockname, __bind, __listen): Add prototypes.
* inet/rexec.c (rexec_af): Use __listen and __getsockname.
* inet/rcmd.c (rcmd_af): Use __listen.
(rresvport_af): Use __bind.
* sunrpc/clnt_udp.c: Use INTUSE calls to bindresvport,
authunix_create, authunix_create_default, authnone_create,
authdes_pk_create, clnt_create, clnttcp_create, clntudp_create,
clntudp_bufcreate, clntunix_create svc_sendreply, svcerr_decode,
svc_getreq, svc_getreq_common, svc_getreqset, svc_getreq_poll,
svc_register, svc_unregister, svcudp_create, svcudp_bufcreate,
_authenticate, add INTDEF after such function definitions.
Use __listen, __bind, __sendto, __recvfrom, __sendmsg, __recvmsg,
__setsockopt, __getsockname instead of non-__ variants.
* sunrpc/pmap_rmt.c: Likewise.
* sunrpc/rtime.c: Likewise.
* sunrpc/svc_udp.c: Likewise.
* sunrpc/clnt_unix.c: Likewise.
* sunrpc/svc_unix.c: Likewise.
* sunrpc/bindrsvprt.c: Likewise.
* sunrpc/svc_tcp.c: Likewise.
* sunrpc/auth_none.c: Likewise.
* sunrpc/clnt_raw.c: Likewise.
* sunrpc/clnt_tcp.c: Likewise.
* sunrpc/auth_unix.c: Likewise.
* sunrpc/key_call.c: Likewise.
* sunrpc/clnt_gen.c: Likewise.
* sunrpc/pm_getmaps.c: Likewise.
* sunrpc/clnt_simp.c: Likewise.
* sunrpc/pmap_clnt.c: Likewise.
* sunrpc/svc_run.c: Likewise.
* sunrpc/svc.c: Likewise.
* sunrpc/svc_simple.c: Likewise.
* sunrpc/pm_getport.c: Likewise.
* sunrpc/auth_des.c: Likewise.
* sunrpc/svc_auth.c: Likewise.
* sysdeps/generic/unwind-dw2-fde.c (__register_frame_info_bases,
__register_frame_info_table_bases, __deregister_frame_info_bases):
Add INTDEF.
(__register_frame_info_bases_internal,
__register_frame_info_table_bases_internal,
__deregister_frame_info_bases_internal): Add prototypes.
(__register_frame_info, __register_frame): Use INTUSE in call to
__register_frame_info_bases.
(__register_frame_info_table): Similarly.
(__deregister_frame_info, __deregister_frame): Similarly.
* sysdeps/generic/sendto.c (__sendto): Renamed from sendto, add
sendto as weak alias.
* sysdeps/mach/hurd/sendto.c: Likewise.
* sysdeps/generic/recvfrom.c (__recvfrom): Renamed from recvfrom, add
recvfrom as weak alias.
* sysdeps/mach/hurd/recvfrom.c: Likewise.
* sysdeps/unix/sysv/aix/recvfrom.c: Likewise.
* sysdeps/generic/recvmsg.c (__recvmsg): Renamed from recvmsg, add
recvmsg as weak alias.
* sysdeps/unix/sysv/aix/recvmsg.c: Likewise.
* sysdeps/generic/sendmsg.c (__sendmsg): Renamed from sendmsg, add
sendmsg as weak alias.
* sysdeps/unix/sysv/aix/sendmsg.c: Likewise.
* sysdeps/generic/setsockopt.c (__setsockopt): Renamed from
setsockopt, add setsockopt as weak alias.
* sysdeps/mach/hurd/setsockopt.c: Likewise.
* sysdeps/generic/bind.c (__bind): Renamed from bind, add bind as
weak alias.
* sysdeps/mach/hurd/bind.c: Likewise.
* sysdeps/generic/listen.c (__listen): Renamed from listen, add listen
as weak alias.
* sysdeps/mach/hurd/listen.c: Likewise.
* sysdeps/generic/getsockname.c (__getsockname): Renamed from
getsockname, add getsockname as weak alias.
* sysdeps/mach/hurd/getsockname.c: Likewise.
* sysdeps/unix/sysv/aix/getsockname.c: Likewise.
* sysdeps/mach/hurd/recvmsg.c (__recvmsg): Add weak alias.
* sysdeps/mach/hurd/sendmsg.c (__sendmsg): Add weak alias.
* sysdeps/unix/inet/syscalls.list (__bind, __listen, __recvmsg,
__recvfrom, __sendmsg, __sendto, __setsockopt): Add aliases.
* sysdeps/unix/sysv/linux/alpha/syscalls.list (__recvmsg, __sendmsg):
Add aliases.
* sysdeps/unix/sysv/linux/ia64/syscalls.list: Likewise.
* sysdeps/unix/sysv/linux/s390/s390-64/syscalls.list: Likewise.
* sysdeps/unix/sysv/linux/hppa/syscalls.list: Likewise.
* sysdeps/unix/sysv/linux/x86_64/syscalls.list: Likewise.
* sysdeps/unix/sysv/linux/recvfrom.S (__recvfrom): Add weak alias.
* sysdeps/unix/sysv/linux/recvmsg.S (__recvmsg): Likewise.
* sysdeps/unix/sysv/linux/sendmsg.S (__sendmsg): Likewise.
* sysdeps/unix/sysv/linux/sendto.S (__sendto): Likewise.
* sysdeps/unix/sysv/linux/setsockopt.S (__setsockopt): Likewise.
* sysdeps/unix/sysv/linux/bind.S (__bind): Likewise.
* sysdeps/unix/sysv/linux/listen.S (__listen): Likewise.
* sysdeps/unix/sysv/linux/getsockname.S (__getsockname): Likewise.
2002-05-10 Jakub Jelinek <jakub@redhat.com>
* locale/programs/localedef.h (show_archive_content): Add verbose
argument.
* locale/programs/localedef.c (main): Adjust caller.
* locale/programs/locarchive.c (struct nameent, struct dataent): New.
(nameentcmp, dataentcmp): New functions.
(xstrcmp): Remove.
(show_archive_content): Print verbose listing with --list-archive -v.
* locale/programs/locarchive.c (open_archive): Take extra argument
readonly. If true open file with O_RDONLY and don't create the
archive if it doesn't exist.
Adapt all callers.
(close_archive): Don't do anything if fd element is -1.
* locale/programs/localedef.h (open_archive): Adjust prototype.
* locale/programs/locfile.c (write_all_categories): Adjust open_archive
call.
* malloc/malloc.c (__posix_memalign): Correct check for size of
alignment value [PR libc/3444].
2002-05-15 02:22:23 +02:00
|
|
|
len = __sendmsg (sock, &msg, 0);
|
1999-03-19 03:01:36 +01:00
|
|
|
if (len >= 0)
|
|
|
|
return len;
|
|
|
|
if (errno == EINTR)
|
|
|
|
goto restart;
|
|
|
|
return -1;
|
|
|
|
|
1998-07-28 18:26:04 +02:00
|
|
|
#endif
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Interface between xdr serializer and unix connection.
|
|
|
|
* Behaves like the system calls, read & write, but keeps some error state
|
|
|
|
* around for the rpc level.
|
|
|
|
*/
|
|
|
|
static int
|
|
|
|
readunix (char *ctptr, char *buf, int len)
|
|
|
|
{
|
|
|
|
struct ct_data *ct = (struct ct_data *) ctptr;
|
|
|
|
struct pollfd fd;
|
|
|
|
int milliseconds = ((ct->ct_wait.tv_sec * 1000)
|
|
|
|
+ (ct->ct_wait.tv_usec / 1000));
|
|
|
|
|
|
|
|
if (len == 0)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
fd.fd = ct->ct_sock;
|
|
|
|
fd.events = POLLIN;
|
|
|
|
while (TRUE)
|
|
|
|
{
|
|
|
|
switch (__poll (&fd, 1, milliseconds))
|
|
|
|
{
|
|
|
|
case 0:
|
|
|
|
ct->ct_error.re_status = RPC_TIMEDOUT;
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
case -1:
|
|
|
|
if (errno == EINTR)
|
|
|
|
continue;
|
|
|
|
ct->ct_error.re_status = RPC_CANTRECV;
|
|
|
|
ct->ct_error.re_errno = errno;
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
switch (len = __msgread (ct->ct_sock, buf, len))
|
|
|
|
{
|
|
|
|
|
|
|
|
case 0:
|
|
|
|
/* premature eof */
|
|
|
|
ct->ct_error.re_errno = ECONNRESET;
|
|
|
|
ct->ct_error.re_status = RPC_CANTRECV;
|
|
|
|
len = -1; /* it's really an error */
|
|
|
|
break;
|
|
|
|
|
|
|
|
case -1:
|
|
|
|
ct->ct_error.re_errno = errno;
|
|
|
|
ct->ct_error.re_status = RPC_CANTRECV;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
return len;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
|
|
|
writeunix (char *ctptr, char *buf, int len)
|
|
|
|
{
|
|
|
|
int i, cnt;
|
|
|
|
struct ct_data *ct = (struct ct_data *) ctptr;
|
|
|
|
|
|
|
|
for (cnt = len; cnt > 0; cnt -= i, buf += i)
|
|
|
|
{
|
|
|
|
if ((i = __msgwrite (ct->ct_sock, buf, cnt)) == -1)
|
|
|
|
{
|
|
|
|
ct->ct_error.re_errno = errno;
|
|
|
|
ct->ct_error.re_status = RPC_CANTSEND;
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return len;
|
|
|
|
}
|