diff options
Diffstat (limited to 'inet/rcmd.c')
| -rw-r--r-- | inet/rcmd.c | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/inet/rcmd.c b/inet/rcmd.c index 5dcbd25568..343e0954db 100644 --- a/inet/rcmd.c +++ b/inet/rcmd.c @@ -112,7 +112,13 @@ rcmd_af(ahost, rport, locuser, remuser, cmd, fd2p, af) { char paddr[INET6_ADDRSTRLEN]; struct addrinfo hints, *res, *ai; - struct sockaddr_storage from; + union + { + struct sockaddr sa; + struct sockaddr_storage ss; + struct sockaddr_in sin; + struct sockaddr_in6 sin6; + } from; struct pollfd pfd[2]; int32_t oldmask; pid_t pid; @@ -274,14 +280,13 @@ poll: protocol failure in circuit setup\n")) >= 0)) (void)__close(s2); goto bad; } - s3 = TEMP_FAILURE_RETRY (accept(s2, (struct sockaddr *)&from, - &len)); - switch (from.ss_family) { + s3 = TEMP_FAILURE_RETRY (accept(s2, &from.sa, &len)); + switch (from.sa.sa_family) { case AF_INET: - rport = ntohs(((struct sockaddr_in *)&from)->sin_port); + rport = ntohs(from.sin.sin_port); break; case AF_INET6: - rport = ntohs(((struct sockaddr_in6 *)&from)->sin6_port); + rport = ntohs(from.sin6.sin6_port); break; default: rport = 0; @@ -605,13 +610,13 @@ iruserok_af (raddr, superuser, ruser, luser, af) memset (&ra, '\0', sizeof(ra)); switch (af){ case AF_INET: - ((struct sockaddr_in *)&ra)->sin_family = AF_INET; + ra.ss_family = AF_INET; memcpy (&(((struct sockaddr_in *)&ra)->sin_addr), raddr, sizeof(struct in_addr)); ralen = sizeof(struct sockaddr_in); break; case AF_INET6: - ((struct sockaddr_in6 *)&ra)->sin6_family = AF_INET6; + ra.ss_family = AF_INET6; memcpy (&(((struct sockaddr_in6 *)&ra)->sin6_addr), raddr, sizeof(struct in6_addr)); ralen = sizeof(struct sockaddr_in6); |