diff options
author | Ulrich Drepper <drepper@redhat.com> | 2009-04-26 20:12:37 +0000 |
---|---|---|
committer | Ulrich Drepper <drepper@redhat.com> | 2009-04-26 20:12:37 +0000 |
commit | 6cc8844f1dd985360f662e78ff2272039025635f (patch) | |
tree | 6ebb2abaf95bc129ee800558415fdcfac72642ce /inet/rexec.c | |
parent | 5efe86507d871acd6f52d8d25ee437b7394ac6d5 (diff) | |
download | glibc-6cc8844f1dd985360f662e78ff2272039025635f.zip glibc-6cc8844f1dd985360f662e78ff2272039025635f.tar.gz glibc-6cc8844f1dd985360f662e78ff2272039025635f.tar.bz2 |
* sysdeps/unix/sysv/linux/dl-osinfo.h (dl_fatal): Remove inline
from definition.
* sysdeps/x86_64/dl-machine.h (elf_machine_rela): Don't define
label if it is not used.
* elf/dl-profile.c (_dl_start_profile): Define real-type variant
of gmon_hist_hdr and gmon_hdr structures and use them.
* elf/dl-load.c (open_verify): Add temporary variable to avoid
warning.
* nscd/nscd_helper.c (get_mapping): Avoid casts to avoid warnings.
* sunrpc/clnt_raw.c (clntraw_private_s): Use union in definition
to avoid cast.
* inet/rexec.c (rexec_af): Make sa2 a union to avoid warnings.
* inet/rcmd.c (rcmd_af): Make from a union of the various needed types
to avoid warnings.
(iruserok_af): Use ss_family instead of casts.
* gmon/gmon.c (write_hist): Define real-type variant of
gmon_hist_hdr structure and use it.
(write_gmon): Likewise for gmon_hdr.
* sysdeps/unix/sysv/linux/readv.c: Avoid declaration of replacement
function if we are not going to define it.
* sysdeps/unix/sysv/linux/writev.c: Likewise.
* inet/inet6_option.c (optin_alloc): Add temporary variable to
avoid warning.
* libio/strfile.h (struct _IO_streambuf): Use correct type and
name of VTable element.
* libio/iovsprintf.c: Avoid casts to avoid warnings.
* libio/iovsscanf.c: Likewise.
* libio/vasprintf.c: Likewise.
* libio/vsnprintf.c: Likewise.
* stdio-common/isoc99_vsscanf.c: Likewise.
* stdlib/strfmon_l.c: Likewise.
* debug/vasprintf_chk.c: Likewise.
* debug/vsnprintf_chk.c: Likewise.
* debug/vsprintf_chk.c: Likewise.
Diffstat (limited to 'inet/rexec.c')
-rw-r--r-- | inet/rexec.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/inet/rexec.c b/inet/rexec.c index 07ddeea..75bb470 100644 --- a/inet/rexec.c +++ b/inet/rexec.c @@ -56,7 +56,7 @@ rexec_af(ahost, rport, name, pass, cmd, fd2p, af) int *fd2p; sa_family_t af; { - struct sockaddr_storage sa2, from; + struct sockaddr_storage from; struct addrinfo hints, *res0; const char *orig_name = name; const char *orig_pass = pass; @@ -115,6 +115,11 @@ retry: } else { char num[32]; int s2; + union + { + struct sockaddr_storage ss; + struct sockaddr sa; + } sa2; socklen_t sa2len; s2 = __socket(res0->ai_family, res0->ai_socktype, 0); @@ -124,17 +129,17 @@ retry: } __listen(s2, 1); sa2len = sizeof (sa2); - if (__getsockname(s2, (struct sockaddr *)&sa2, &sa2len) < 0) { + if (__getsockname(s2, &sa2.sa, &sa2len) < 0) { perror("getsockname"); (void) __close(s2); goto bad; - } else if (sa2len != SA_LEN((struct sockaddr *)&sa2)) { + } else if (sa2len != SA_LEN(&sa2.sa)) { __set_errno(EINVAL); (void) __close(s2); goto bad; } port = 0; - if (!getnameinfo((struct sockaddr *)&sa2, sa2len, + if (!getnameinfo(&sa2.sa, sa2len, NULL, 0, servbuff, sizeof(servbuff), NI_NUMERICSERV)) port = atoi(servbuff); |