From b6e362688c83b0329ad15b48481fd7765bf55dbf Mon Sep 17 00:00:00 2001 From: Assar Westerlund Date: Sat, 24 Jul 1999 19:53:19 +0000 Subject: [PATCH] (find_all_addresses): try to use SA_LEN to step over addresses if there's no `sa_lan' field git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@6537 ec53bebd-3082-4978-b11e-865c3cabbd6b --- lib/krb5/get_addrs.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/lib/krb5/get_addrs.c b/lib/krb5/get_addrs.c index fe2df0c91..649384cbb 100644 --- a/lib/krb5/get_addrs.c +++ b/lib/krb5/get_addrs.c @@ -168,11 +168,9 @@ find_all_addresses (krb5_context context, #ifdef HAVE_STRUCT_SOCKADDR_SA_LEN sz = max(sz, sizeof(ifr->ifr_name) + sa->sa_len); #endif -#ifdef HAVE_IPV6 - if (sa->sa_family == AF_INET6) - sz = max(sz, sizeof(ifr->ifr_name) + sizeof(struct sockaddr_in6)); +#ifdef SA_LEN + sz = max(sz, SA_LEN(sa)); #endif - memcpy (ifreq.ifr_name, ifr->ifr_name, sizeof(ifr->ifr_name)); if (ioctl(fd, siocgifflags, &ifreq) < 0) {