[src/netbsd-1-5]: src/lib/libwrap Pull up revision 1.7 (requested by itojun):

[he <he%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/b99ee17a153c
branches:  netbsd-1-5
changeset: 490812:b99ee17a153c
user:      he <he%NetBSD.org@localhost>
date:      Sun Mar 11 20:19:13 2001 +0000

description:
Pull up revision 1.7 (requested by itojun):
  Correct type casting bug.

diffstat:

 lib/libwrap/rfc931.c |  12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diffs (47 lines):

diff -r 67872fa82a08 -r b99ee17a153c lib/libwrap/rfc931.c
--- a/lib/libwrap/rfc931.c      Sun Mar 11 19:21:07 2001 +0000
+++ b/lib/libwrap/rfc931.c      Sun Mar 11 20:19:13 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: rfc931.c,v 1.6 1999/08/31 13:58:58 itojun Exp $        */
+/*     $NetBSD: rfc931.c,v 1.6.8.1 2001/03/11 20:19:13 he Exp $        */
 
  /*
   * rfc931() speaks a common subset of the RFC 931, AUTH, TAP, IDENT and RFC
@@ -16,7 +16,7 @@
 #if 0
 static char sccsid[] = "@(#) rfc931.c 1.10 95/01/02 16:11:34";
 #else
-__RCSID("$NetBSD: rfc931.c,v 1.6 1999/08/31 13:58:58 itojun Exp $");
+__RCSID("$NetBSD: rfc931.c,v 1.6.8.1 2001/03/11 20:19:13 he Exp $");
 #endif
 #endif
 
@@ -105,12 +105,12 @@
     switch (rmt_sin->sa_family) {
     case AF_INET:
        salen = sizeof(struct sockaddr_in);
-       rmt_portp = &((struct sockaddr_in *)&rmt_sin)->sin_port;
+       rmt_portp = &(((struct sockaddr_in *)rmt_sin)->sin_port);
        break;
 #ifdef INET6
     case AF_INET6:
        salen = sizeof(struct sockaddr_in6);
-       rmt_portp = &((struct sockaddr_in6 *)&rmt_sin)->sin6_port;
+       rmt_portp = &(((struct sockaddr_in6 *)rmt_sin)->sin6_port);
        break;
 #endif
     default:
@@ -119,11 +119,11 @@
     }
     switch (our_sin->sa_family) {
     case AF_INET:
-       our_portp = &((struct sockaddr_in *)&our_sin)->sin_port;
+       our_portp = &(((struct sockaddr_in *)our_sin)->sin_port);
        break;
 #ifdef INET6
     case AF_INET6:
-       our_portp = &((struct sockaddr_in6 *)&our_sin)->sin6_port;
+       our_portp = &(((struct sockaddr_in6 *)our_sin)->sin6_port);
        break;
 #endif
     default: