glibc/nis/nis_callback.c
Roland McGrath 9cfe5381a1 [BZ #284, BZ #721]
* intl/dcigettext.c (_nl_find_msg): Add a cast.
	* nis/nis_clone_dir.c (nis_clone_directory): Use char * for ADDR.
	* nis/nis_clone_obj.c (nis_clone_object): Likewise.
	* nis/nis_clone_res.c (nis_clone_result): Likewise.

	* resolv/nss_dns/dns-network.c (getanswer_r): Use const unsigned char *
	for END_OF_MESSAGE and CP.

	* resolv/res_send.c (send_dg): Add else branch for case impossible
	unless `poll' is buggy.

	* crypt/crypt_util.c (__setkey_r): Add a cast.

	* locale/programs/linereader.c (get_toplvl_escape): Use size_t for
	NBYTES, and unsigned char * for BYTES.

	* locale/programs/charmap.c (charmap_new_char): Use size_t and
	unsighed char * for NBYTES, BYTES parameters.

	* sysdeps/generic/dl-hash.h (_dl_elf_hash): Take const char * argument
	and cast it.
	* sysdeps/i386/i686/dl-hash.h (_dl_elf_hash): Likewise.

	* sunrpc/create_xid.c (_create_xid): Don't use unsigned long for RES.

	* sunrpc/svcauth_des.c (_svcauth_des): Fix cast type.

	* sunrpc/auth_des.c (authdes_create): Don't use u_char for PKEY_DATA.
	(authdes_marshal): Don't use unsigned int for LEN.
	* sunrpc/xdr.c (xdr_hyper): Don't use unsigned long for T2.
	(xdr_u_hyper): Likewise.
	(xdr_u_short): Don't use u_long for L.
	* sunrpc/xdr_intXX_t.c (xdr_int64_t): Don't use uint32_t for T2.

	* inet/rexec.c (rexec_af): Use socklen_t.
	* sunrpc/key_call.c (getkeyserv_handle): Likewise.
	* sunrpc/rtime.c (rtime): Likewise.
	* resolv/res_send.c (send_vc, send_dg): Likewise.
	* nis/nis_callback.c (__nis_create_callback): Likewise.

	* sysdeps/generic/libc-start.c: Use unsigned int for nthreads ptr.

	* sysdeps/posix/getaddrinfo.c (gaih_inet): Fix type of ADDR local.

	* libio/libio.h (_IO_BE): Add parenthesis around EXPR.

	* intl/dcigettext.c (INTVARDEF, INTUSE): Macros removed.
	(_nl_default_dirname): Use libc_hidden_data_def instead of INTVARDEF.
	(libc_freeres_fn, DCIGETTEXT): Don't use INTUSE.
	* intl/bindtextdom.c (INTUSE): Macro removed.
	(_nl_default_dirname): Use libc_hidden_proto.
	(set_binding_values): Don't use INTUSE.
	* include/libintl.h (_libc_intl_domainname_internal): Decl removed.
	(_libc_intl_domainname): Use libc_hidden_proto.
	* posix/regex_internal.h (gettext): Remove INTUSE on it.
	* locale/SYS_libc.c (_libc_intl_domainname): Use libc_hidden_data_def
	rather than INTDEF.
	* include/libintl.h (_): Don't use *_internal name.

	* ctype/ctype-extn.c (__ctype_tolower, __ctype_toupper): Use int32_t,
	not uint32_t.
	* locale/lc-ctype.c (_nl_postload_ctype): Likewise for assignments.

	* iconv/gconv_open.c (__gconv_open): Remove useless cast.

	[BZ #721]
	* sysdeps/i386/dl-machine.h (ELF_MACHINE_NO_RELA): Define this outside
	of [RESOLVE_MAP].
	* sysdeps/sh/dl-machine.h (ELF_MACHINE_NO_REL): Likewise.
	* sysdeps/powerpc/powerpc32/dl-machine.h
	(elf_machine_rel, elf_machine_rel_relative): Removed.
	* sysdeps/powerpc/powerpc64/dl-machine.h
	(elf_machine_rel, elf_machine_rel_relative): Removed.

2005-02-03  Alexandre Oliva  <aoliva@redhat.com>

	[BZ #721]
	* elf/dynamic-link.h: Don't declare nested auto functions that are
	not going to be defined.

2004-07-23  Jakub Jelinek  <jakub@redhat.com>

	[BZ #284]
	* include/features.h (_POSIX_SOURCE, _POSIX_C_SOURCE): Define
	if _XOPEN_SOURCE >= 500 even if __STRICT_ANSI__ is defined.

2005-02-16  Roland McGrath  <roland@redhat.com>
2005-02-17 01:19:55 +00:00

387 lines
10 KiB
C

/* Copyright (C) 1997, 1998, 1999, 2000, 2005 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Thorsten Kukuk <kukuk@suse.de>, 1997.
The GNU C Library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.
The GNU C Library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with the GNU C Library; if not, write to the Free
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
02111-1307 USA. */
#include <errno.h>
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
#include <libintl.h>
#include <rpc/rpc.h>
#include <rpc/pmap_clnt.h>
#include <string.h>
#include <memory.h>
#include <syslog.h>
#include <sys/poll.h>
#include <sys/socket.h>
#include <netinet/in.h>
#include <arpa/inet.h>
#include <rpc/key_prot.h>
#include <rpcsvc/nis.h>
#include <rpcsvc/nis_callback.h>
#include <bits/libc-lock.h>
#include "nis_xdr.h"
#include "nis_intern.h"
/* Sorry, we are not able to make this threadsafe. Stupid. But some
functions doesn't send us a nis_result obj, so we don't have a
cookie. Maybe we could use keys for threads ? Have to learn more
about pthreads -- kukuk@vt.uni-paderborn.de */
static nis_cb *data;
__libc_lock_define_initialized (static, callback)
#if 0
static char *
__nis_getpkey(const char *sname)
{
char buf[(strlen (sname) + 1) * 2 + 40];
char pkey[HEXKEYBYTES + 1];
char *cp, *domain;
nis_result *res;
unsigned int len = 0;
domain = strchr (sname, '.');
if (domain == NULL)
return NULL;
/* Remove prefixing dot */
++domain;
cp = stpcpy (buf, "[cname=");
cp = stpcpy (cp, sname);
cp = stpcpy (cp, ",auth_type=DES],cred.org_dir.");
cp = stpcpy (cp, domain);
res = nis_list (buf, USE_DGRAM|NO_AUTHINFO|FOLLOW_LINKS|FOLLOW_PATH,
NULL, NULL);
if (res == NULL)
return NULL;
if (NIS_RES_STATUS (res) != NIS_SUCCESS)
{
nis_freeresult (res);
return NULL;
}
len = ENTRY_LEN(NIS_RES_OBJECT(res), 3);
strncpy (pkey, ENTRY_VAL(NIS_RES_OBJECT(res), 3), len);
pkey[len] = '\0';
cp = strchr (pkey, ':');
if (cp != NULL)
*cp = '\0';
nis_freeresult (res);
return strdup (pkey);
}
#endif
static void
cb_prog_1 (struct svc_req *rqstp, SVCXPRT *transp)
{
union
{
cback_data cbproc_receive_1_arg;
nis_error cbproc_error_1_arg;
}
argument;
char *result;
xdrproc_t xdr_argument, xdr_result;
bool_t bool_result;
switch (rqstp->rq_proc)
{
case NULLPROC:
svc_sendreply (transp, (xdrproc_t) xdr_void, (char *) NULL);
return;
case CBPROC_RECEIVE:
{
unsigned int i;
xdr_argument = (xdrproc_t) xdr_cback_data;
xdr_result = (xdrproc_t) xdr_bool;
memset (&argument, 0, sizeof (argument));
if (!svc_getargs (transp, xdr_argument, (caddr_t) & argument))
{
svcerr_decode (transp);
return;
}
bool_result = FALSE;
for (i = 0; i < argument.cbproc_receive_1_arg.entries.entries_len; ++i)
{
#define cbproc_entry(a) argument.cbproc_receive_1_arg.entries.entries_val[a]
char name[strlen (cbproc_entry(i)->zo_name) +
strlen (cbproc_entry(i)->zo_domain) + 3];
char *cp;
cp = stpcpy (name, cbproc_entry(i)->zo_name);
*cp++ = '.';
cp = stpcpy (cp, cbproc_entry(i)->zo_domain);
if ((data->callback) (name, cbproc_entry(i), data->userdata))
{
bool_result = TRUE;
data->nomore = 1;
data->result = NIS_SUCCESS;
break;
}
}
result = (char *) &bool_result;
}
break;
case CBPROC_FINISH:
xdr_argument = (xdrproc_t) xdr_void;
xdr_result = (xdrproc_t) xdr_void;
memset (&argument, 0, sizeof (argument));
if (!svc_getargs (transp, xdr_argument, (caddr_t) & argument))
{
svcerr_decode (transp);
return;
}
data->nomore = 1;
data->result = NIS_SUCCESS;
bool_result = TRUE; /* to make gcc happy, not necessary */
result = (char *) &bool_result;
break;
case CBPROC_ERROR:
xdr_argument = (xdrproc_t) _xdr_nis_error;
xdr_result = (xdrproc_t) xdr_void;
memset (&argument, 0, sizeof (argument));
if (!svc_getargs (transp, xdr_argument, (caddr_t) & argument))
{
svcerr_decode (transp);
return;
}
data->nomore = 1;
data->result = argument.cbproc_error_1_arg;
bool_result = TRUE; /* to make gcc happy, not necessary */
result = (char *) &bool_result;
break;
default:
svcerr_noproc (transp);
return;
}
if (result != NULL && !svc_sendreply (transp, xdr_result, result))
svcerr_systemerr (transp);
if (!svc_freeargs (transp, xdr_argument, (caddr_t) & argument))
{
fputs (_ ("unable to free arguments"), stderr);
exit (1);
}
return;
}
static nis_error
internal_nis_do_callback (struct dir_binding *bptr, netobj *cookie,
struct nis_cb *cb)
{
struct timeval TIMEOUT = {25, 0};
bool_t cb_is_running = FALSE;
data = cb;
for (;;)
{
struct pollfd *my_pollfd;
int i;
if (svc_max_pollfd == 0 && svc_pollfd == NULL)
return NIS_CBERROR;
my_pollfd = malloc (sizeof (struct pollfd) * svc_max_pollfd);
if (__builtin_expect (my_pollfd == NULL, 0))
return NIS_NOMEMORY;
for (i = 0; i < svc_max_pollfd; ++i)
{
my_pollfd[i].fd = svc_pollfd[i].fd;
my_pollfd[i].events = svc_pollfd[i].events;
my_pollfd[i].revents = 0;
}
switch (i = __poll (my_pollfd, svc_max_pollfd, 25*1000))
{
case -1:
free (my_pollfd);
if (errno == EINTR)
continue;
return NIS_CBERROR;
case 0:
free (my_pollfd);
/* See if callback 'thread' in the server is still alive. */
memset ((char *) &cb_is_running, 0, sizeof (cb_is_running));
if (clnt_call (bptr->clnt, NIS_CALLBACK, (xdrproc_t) xdr_netobj,
(caddr_t) cookie, (xdrproc_t) xdr_bool,
(caddr_t) & cb_is_running, TIMEOUT) != RPC_SUCCESS)
cb_is_running = FALSE;
if (cb_is_running == FALSE)
{
syslog (LOG_ERR, "NIS+: callback timed out");
return NIS_CBERROR;
}
break;
default:
svc_getreq_poll (my_pollfd, i);
free (my_pollfd);
if (data->nomore)
return data->result;
}
}
}
nis_error
__nis_do_callback (struct dir_binding *bptr, netobj *cookie,
struct nis_cb *cb)
{
nis_error result;
__libc_lock_lock (callback);
result = internal_nis_do_callback (bptr, cookie, cb);
__libc_lock_unlock (callback);
return result;
}
struct nis_cb *
__nis_create_callback (int (*callback) (const_nis_name, const nis_object *,
const void *),
const void *userdata, unsigned int flags)
{
struct nis_cb *cb;
int sock = RPC_ANYSOCK;
struct sockaddr_in sin;
socklen_t len = sizeof (struct sockaddr_in);
char addr[NIS_MAXNAMELEN + 1];
unsigned short port;
cb = (struct nis_cb *) calloc (1, sizeof (struct nis_cb));
if (__builtin_expect (cb == NULL, 0))
goto failed;
cb->serv = (nis_server *) calloc (1, sizeof (nis_server));
if (__builtin_expect (cb->serv == NULL, 0))
goto failed;
cb->serv->name = strdup (nis_local_principal ());
if (__builtin_expect (cb->serv->name == NULL, 0))
goto failed;
cb->serv->ep.ep_val = (endpoint *) calloc (2, sizeof (endpoint));
if (__builtin_expect (cb->serv->ep.ep_val == NULL, 0))
goto failed;
cb->serv->ep.ep_len = 1;
cb->serv->ep.ep_val[0].family = strdup ("inet");
if (__builtin_expect (cb->serv->ep.ep_val[0].family == NULL, 0))
goto failed;
cb->callback = callback;
cb->userdata = userdata;
if ((flags & NO_AUTHINFO) || !key_secretkey_is_set ())
{
cb->serv->key_type = NIS_PK_NONE;
cb->serv->pkey.n_bytes = NULL;
cb->serv->pkey.n_len = 0;
}
else
{
#if 0
if ((cb->serv->pkey.n_bytes = __nis_getpkey (cb->serv->name)) == NULL)
{
cb->serv->pkey.n_len = 0;
cb->serv->key_type = NIS_PK_NONE;
}
else
{
cb->serv->key_type = NIS_PK_DH;
cb->serv->pkey.n_len = strlen(cb->serv->pkey.n_bytes);
}
#else
cb->serv->pkey.n_len =0;
cb->serv->pkey.n_bytes = NULL;
cb->serv->key_type = NIS_PK_NONE;
#endif
}
cb->serv->ep.ep_val[0].proto = strdup ((flags & USE_DGRAM) ? "udp" : "tcp");
if (__builtin_expect (cb->serv->ep.ep_val[0].proto == NULL, 0))
goto failed;
cb->xprt = (flags & USE_DGRAM) ? svcudp_bufcreate (sock, 100, 8192) :
svctcp_create (sock, 100, 8192);
cb->sock = cb->xprt->xp_sock;
if (!svc_register (cb->xprt, CB_PROG, CB_VERS, cb_prog_1, 0))
{
xprt_unregister (cb->xprt);
svc_destroy (cb->xprt);
xdr_free ((xdrproc_t) _xdr_nis_server, (char *) cb->serv);
free (cb->serv);
free (cb);
syslog (LOG_ERR, "NIS+: failed to register callback dispatcher");
return NULL;
}
if (getsockname (cb->sock, (struct sockaddr *) &sin, &len) == -1)
{
xprt_unregister (cb->xprt);
svc_destroy (cb->xprt);
xdr_free ((xdrproc_t) _xdr_nis_server, (char *) cb->serv);
free (cb->serv);
free (cb);
syslog (LOG_ERR, "NIS+: failed to read local socket info");
return NULL;
}
port = ntohs (sin.sin_port);
get_myaddress (&sin);
snprintf (addr, sizeof (addr), "%s.%d.%d", inet_ntoa (sin.sin_addr),
(port & 0xFF00) >> 8, port & 0x00FF);
cb->serv->ep.ep_val[0].uaddr = strdup (addr);
return cb;
failed:
if (cb)
{
if (cb->serv)
{
xdr_free ((xdrproc_t) _xdr_nis_server, (char *) cb->serv);
free (cb->serv);
}
free (cb);
}
syslog (LOG_ERR, "NIS+: out of memory allocating callback");
return NULL;
}
nis_error
__nis_destroy_callback (struct nis_cb *cb)
{
xprt_unregister (cb->xprt);
svc_destroy (cb->xprt);
close (cb->sock);
xdr_free ((xdrproc_t) _xdr_nis_server, (char *) cb->serv);
free (cb->serv);
free (cb);
return NIS_SUCCESS;
}