mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-22 13:00:06 +00:00
9cfe5381a1
* 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>
201 lines
5.3 KiB
C
201 lines
5.3 KiB
C
/*
|
|
* Copyright (c) 1980, 1993
|
|
* The Regents of the University of California. All rights reserved.
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that the following conditions
|
|
* are met:
|
|
* 1. Redistributions of source code must retain the above copyright
|
|
* notice, this list of conditions and the following disclaimer.
|
|
* 2. 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.
|
|
* 4. Neither the name of the University 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 REGENTS 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 REGENTS 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.
|
|
*/
|
|
|
|
#if defined(LIBC_SCCS) && !defined(lint)
|
|
static char sccsid[] = "@(#)rexec.c 8.1 (Berkeley) 6/4/93";
|
|
#endif /* LIBC_SCCS and not lint */
|
|
|
|
#include <sys/types.h>
|
|
#include <sys/socket.h>
|
|
|
|
#include <netinet/in.h>
|
|
|
|
#include <alloca.h>
|
|
#include <stdio.h>
|
|
#include <netdb.h>
|
|
#include <errno.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
#include <unistd.h>
|
|
#include <sys/uio.h>
|
|
|
|
int rexecoptions;
|
|
libc_freeres_ptr (static char *ahostbuf);
|
|
|
|
int
|
|
rexec_af(ahost, rport, name, pass, cmd, fd2p, af)
|
|
char **ahost;
|
|
int rport;
|
|
const char *name, *pass, *cmd;
|
|
int *fd2p;
|
|
sa_family_t af;
|
|
{
|
|
struct sockaddr_storage sa2, from;
|
|
struct addrinfo hints, *res0;
|
|
const char *orig_name = name;
|
|
const char *orig_pass = pass;
|
|
u_short port = 0;
|
|
int s, timo = 1, s3;
|
|
char c;
|
|
int gai;
|
|
char servbuff[NI_MAXSERV];
|
|
|
|
__snprintf(servbuff, sizeof(servbuff), "%d", ntohs(rport));
|
|
servbuff[sizeof(servbuff) - 1] = '\0';
|
|
|
|
memset(&hints, '\0', sizeof(hints));
|
|
hints.ai_family = af;
|
|
hints.ai_socktype = SOCK_STREAM;
|
|
hints.ai_flags = AI_CANONNAME;
|
|
gai = getaddrinfo(*ahost, servbuff, &hints, &res0);
|
|
if (gai){
|
|
/* XXX: set errno? */
|
|
return -1;
|
|
}
|
|
|
|
if (res0->ai_canonname){
|
|
free (ahostbuf);
|
|
ahostbuf = strdup (res0->ai_canonname);
|
|
if (ahostbuf == NULL) {
|
|
perror ("rexec: strdup");
|
|
return (-1);
|
|
}
|
|
*ahost = ahostbuf;
|
|
} else
|
|
*ahost = NULL;
|
|
ruserpass(res0->ai_canonname, &name, &pass);
|
|
retry:
|
|
s = __socket(res0->ai_family, res0->ai_socktype, 0);
|
|
if (s < 0) {
|
|
perror("rexec: socket");
|
|
return (-1);
|
|
}
|
|
if (__connect(s, res0->ai_addr, res0->ai_addrlen) < 0) {
|
|
if (errno == ECONNREFUSED && timo <= 16) {
|
|
(void) __close(s);
|
|
__sleep(timo);
|
|
timo *= 2;
|
|
goto retry;
|
|
}
|
|
perror(res0->ai_canonname);
|
|
return (-1);
|
|
}
|
|
if (fd2p == 0) {
|
|
(void) __write(s, "", 1);
|
|
port = 0;
|
|
} else {
|
|
char num[32];
|
|
int s2;
|
|
socklen_t sa2len;
|
|
|
|
s2 = __socket(res0->ai_family, res0->ai_socktype, 0);
|
|
if (s2 < 0) {
|
|
(void) __close(s);
|
|
return (-1);
|
|
}
|
|
__listen(s2, 1);
|
|
sa2len = sizeof (sa2);
|
|
if (__getsockname(s2, (struct sockaddr *)&sa2, &sa2len) < 0) {
|
|
perror("getsockname");
|
|
(void) __close(s2);
|
|
goto bad;
|
|
} else if (sa2len != SA_LEN((struct sockaddr *)&sa2)) {
|
|
__set_errno(EINVAL);
|
|
(void) __close(s2);
|
|
goto bad;
|
|
}
|
|
port = 0;
|
|
if (!getnameinfo((struct sockaddr *)&sa2, sa2len,
|
|
NULL, 0, servbuff, sizeof(servbuff),
|
|
NI_NUMERICSERV))
|
|
port = atoi(servbuff);
|
|
(void) sprintf(num, "%u", port);
|
|
(void) __write(s, num, strlen(num)+1);
|
|
{ socklen_t len = sizeof (from);
|
|
s3 = TEMP_FAILURE_RETRY (accept(s2, (struct sockaddr *)&from,
|
|
&len));
|
|
__close(s2);
|
|
if (s3 < 0) {
|
|
perror("accept");
|
|
port = 0;
|
|
goto bad;
|
|
}
|
|
}
|
|
*fd2p = s3;
|
|
}
|
|
|
|
struct iovec iov[3] =
|
|
{
|
|
[0] = { .iov_base = (void *) name, .iov_len = strlen (name) + 1 },
|
|
/* should public key encypt the password here */
|
|
[1] = { .iov_base = (void *) pass, .iov_len = strlen (pass) + 1 },
|
|
[2] = { .iov_base = (void *) cmd, .iov_len = strlen (cmd) + 1 }
|
|
};
|
|
(void) TEMP_FAILURE_RETRY (__writev (s, iov, 3));
|
|
|
|
/* We don't need the memory allocated for the name and the password
|
|
in ruserpass anymore. */
|
|
if (name != orig_name)
|
|
free ((char *) name);
|
|
if (pass != orig_pass)
|
|
free ((char *) pass);
|
|
|
|
if (__read(s, &c, 1) != 1) {
|
|
perror(*ahost);
|
|
goto bad;
|
|
}
|
|
if (c != 0) {
|
|
while (__read(s, &c, 1) == 1) {
|
|
(void) __write(2, &c, 1);
|
|
if (c == '\n')
|
|
break;
|
|
}
|
|
goto bad;
|
|
}
|
|
freeaddrinfo(res0);
|
|
return (s);
|
|
bad:
|
|
if (port)
|
|
(void) __close(*fd2p);
|
|
(void) __close(s);
|
|
freeaddrinfo(res0);
|
|
return (-1);
|
|
}
|
|
libc_hidden_def (rexec_af)
|
|
|
|
int
|
|
rexec(ahost, rport, name, pass, cmd, fd2p)
|
|
char **ahost;
|
|
int rport;
|
|
const char *name, *pass, *cmd;
|
|
int *fd2p;
|
|
{
|
|
return rexec_af(ahost, rport, name, pass, cmd, fd2p, AF_INET);
|
|
}
|