diff options
author | Greg Hudson <ghudson@mit.edu> | 2014-07-03 12:48:53 -0400 |
---|---|---|
committer | Greg Hudson <ghudson@mit.edu> | 2014-07-04 15:14:03 -0400 |
commit | 48a0b16ab1f70b6486a6d7af7ca9e7b376b19956 (patch) | |
tree | f761ac8f8209fca8708f9f55f8fc5c7b13ce8940 /src/lib/krb5/os/localaddr.c | |
parent | 1fde9a67030845d3cae0661595f5737a4db8b9dd (diff) | |
download | krb5-48a0b16ab1f70b6486a6d7af7ca9e7b376b19956.tar.gz krb5-48a0b16ab1f70b6486a6d7af7ca9e7b376b19956.tar.xz krb5-48a0b16ab1f70b6486a6d7af7ca9e7b376b19956.zip |
Avoid using length fields in socket addresses
Remove code to set or reference the length fields of socket addresses
(sa_len/sin_len/sin6_len), since they aren't portable and setting them
is not required. Remove autoconf tests for those fields which are no
longer used or which were never used.
There is one exception: in localaddr.c, we still neeed to reference
sa_len for the definition of ifreq_size on platforms which have
sa_len. Leave that behind, along with the autoconf test which defines
SA_LEN.
Diffstat (limited to 'src/lib/krb5/os/localaddr.c')
-rw-r--r-- | src/lib/krb5/os/localaddr.c | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/src/lib/krb5/os/localaddr.c b/src/lib/krb5/os/localaddr.c index 0e6a05c66..9f7765254 100644 --- a/src/lib/krb5/os/localaddr.c +++ b/src/lib/krb5/os/localaddr.c @@ -243,11 +243,6 @@ addr_eq (const struct sockaddr *s1, const struct sockaddr *s2) { if (s1->sa_family != s2->sa_family) return 0; -#ifdef HAVE_SA_LEN - if (s1->sa_len != s2->sa_len) - return 0; - return !memcmp (s1, s2, s1->sa_len); -#else #define CMPTYPE(T,F) (!memcmp(&((const T*)s1)->F,&((const T*)s2)->F,sizeof(((const T*)s1)->F))) switch (s1->sa_family) { case AF_INET: @@ -258,7 +253,6 @@ addr_eq (const struct sockaddr *s1, const struct sockaddr *s2) /* Err on side of duplicate listings. */ return 0; } -#endif } #endif @@ -1402,9 +1396,6 @@ get_localaddrs (krb5_context context, krb5_address ***addr, int use_profile) struct sockaddr_in *sinp = ss2sin (&ss); sinp->sin_family = AF_INET; addrp = &sinp->sin_addr; -#ifdef HAVE_SA_LEN - sinp->sin_len = sizeof (struct sockaddr_in); -#endif break; } case ADDRTYPE_INET6: @@ -1412,9 +1403,6 @@ get_localaddrs (krb5_context context, krb5_address ***addr, int use_profile) struct sockaddr_in6 *sin6p = ss2sin6 (&ss); sin6p->sin6_family = AF_INET6; addrp = &sin6p->sin6_addr; -#ifdef HAVE_SA_LEN - sin6p->sin6_len = sizeof (struct sockaddr_in6); -#endif break; } default: |