From 2da58c223380e951aafd40287fa3e3890feb2acc Mon Sep 17 00:00:00 2001 From: ume Date: Tue, 1 Mar 2005 10:55:06 +0000 Subject: correct WARNS=6 fix to use cast to (void *). use of struct sockaddr_strage * is thought as not good manner. :) --- libexec/rexecd/rexecd.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'libexec/rexecd') diff --git a/libexec/rexecd/rexecd.c b/libexec/rexecd/rexecd.c index a85c67a..a868720 100644 --- a/libexec/rexecd/rexecd.c +++ b/libexec/rexecd/rexecd.c @@ -83,7 +83,7 @@ struct sockaddr_storage sa; char default_shell[] = _PATH_BSHELL; -static void doit(struct sockaddr_storage *); +static void doit(struct sockaddr *); static void getstr(char *, int, const char *); static void error(const char *fmt, ...); @@ -125,12 +125,12 @@ main(int argc, char *argv[]) realhostname_sa(remote, sizeof(remote) - 1, (struct sockaddr *)&from, fromlen); - doit(&from); + doit((struct sockaddr *)&from); return(0); } static void -doit(struct sockaddr_storage *fromp) +doit(struct sockaddr *fromp) { char cmdbuf[NCARGS+1], *cp; char user[16], pass[16]; @@ -159,25 +159,25 @@ doit(struct sockaddr_storage *fromp) port = port * 10 + c - '0'; } if (port != 0) { - sd = socket(fromp->ss_family, SOCK_STREAM, 0); + sd = socket(fromp->sa_family, SOCK_STREAM, 0); if (sd < 0) exit(1); bzero(&sa, sizeof(sa)); - sa.ss_family = fromp->ss_family; - sa.ss_len = fromp->ss_len; + sa.ss_family = fromp->sa_family; + sa.ss_len = fromp->sa_len; if (bind(sd, (struct sockaddr *)&sa, sa.ss_len) < 0) exit(1); - switch (fromp->ss_family) { + switch (fromp->sa_family) { case AF_INET: - ((struct sockaddr_in *)fromp)->sin_port = htons(port); + ((struct sockaddr_in *)(void *)fromp)->sin_port = htons(port); break; case AF_INET6: - ((struct sockaddr_in6 *)fromp)->sin6_port = htons(port); + ((struct sockaddr_in6 *)(void *)fromp)->sin6_port = htons(port); break; default: exit(1); } - if (connect(sd, (struct sockaddr *)fromp, fromp->ss_len) < 0) + if (connect(sd, fromp, fromp->sa_len) < 0) exit(1); } getstr(user, sizeof(user), "username"); -- cgit v1.1