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/rpc | |
| 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/rpc')
| -rw-r--r-- | src/lib/rpc/clnt_generic.c | 3 | ||||
| -rw-r--r-- | src/lib/rpc/clnt_simple.c | 3 | ||||
| -rw-r--r-- | src/lib/rpc/getrpcport.c | 3 | ||||
| -rw-r--r-- | src/lib/rpc/svc_tcp.c | 3 | ||||
| -rw-r--r-- | src/lib/rpc/svc_udp.c | 3 |
5 files changed, 0 insertions, 15 deletions
diff --git a/src/lib/rpc/clnt_generic.c b/src/lib/rpc/clnt_generic.c index e2e5b1a83..da3e8e8ba 100644 --- a/src/lib/rpc/clnt_generic.c +++ b/src/lib/rpc/clnt_generic.c @@ -76,9 +76,6 @@ clnt_create( return (NULL); } memset(&sockin, 0, sizeof(sockin)); -#if HAVE_STRUCT_SOCKADDR_IN_SIN_LEN - sockin.sin_len = sizeof(sockin); -#endif sockin.sin_family = h->h_addrtype; sockin.sin_port = 0; memmove((char*)&sockin.sin_addr, h->h_addr, sizeof(sockin.sin_addr)); diff --git a/src/lib/rpc/clnt_simple.c b/src/lib/rpc/clnt_simple.c index c1dc8fee6..df8f246f2 100644 --- a/src/lib/rpc/clnt_simple.c +++ b/src/lib/rpc/clnt_simple.c @@ -107,9 +107,6 @@ callrpc( memset(&server_addr, 0, sizeof(server_addr)); memmove((char *)&server_addr.sin_addr, hp->h_addr, sizeof(server_addr.sin_addr)); -#if HAVE_STRUCT_SOCKADDR_IN_SIN_LEN - server_addr.sin_len = sizeof(server_addr); -#endif server_addr.sin_family = AF_INET; server_addr.sin_port = 0; if ((crp->client = clntudp_create(&server_addr, prognum, diff --git a/src/lib/rpc/getrpcport.c b/src/lib/rpc/getrpcport.c index 8247bb39d..32ff739fd 100644 --- a/src/lib/rpc/getrpcport.c +++ b/src/lib/rpc/getrpcport.c @@ -54,9 +54,6 @@ gssrpc_getrpcport( return (0); memset(&addr, 0, sizeof(addr)); memmove((char *) &addr.sin_addr, hp->h_addr, sizeof(addr.sin_addr)); -#if HAVE_STRUCT_SOCKADDR_IN_SIN_LEN - addr.sin_len = sizeof(addr); -#endif addr.sin_family = AF_INET; addr.sin_port = 0; return (pmap_getport(&addr, prognum, versnum, proto)); diff --git a/src/lib/rpc/svc_tcp.c b/src/lib/rpc/svc_tcp.c index 3d0216481..f05220316 100644 --- a/src/lib/rpc/svc_tcp.c +++ b/src/lib/rpc/svc_tcp.c @@ -161,9 +161,6 @@ svctcp_create( madesock = TRUE; memset(&ss, 0, sizeof(ss)); sa->sa_family = AF_INET; -#ifdef HAVE_SA_LEN - sa->sa_len = sizeof(struct sockaddr_in); -#endif } else { len = sizeof(struct sockaddr_storage); if (getsockname(sock, sa, &len) != 0) { diff --git a/src/lib/rpc/svc_udp.c b/src/lib/rpc/svc_udp.c index 603f56a0b..928006164 100644 --- a/src/lib/rpc/svc_udp.c +++ b/src/lib/rpc/svc_udp.c @@ -132,9 +132,6 @@ svcudp_bufcreate( madesock = TRUE; memset(&ss, 0, sizeof(ss)); sa->sa_family = AF_INET; -#ifdef HAVE_SA_LEN - sa->sa_len = sizeof(struct sockaddr_in); -#endif } else { len = sizeof(struct sockaddr_storage); if (getsockname(sock, sa, &len) < 0) { |