diff options
| author | Greg Hudson <ghudson@mit.edu> | 2014-07-03 12:17:25 -0400 |
|---|---|---|
| committer | Greg Hudson <ghudson@mit.edu> | 2014-07-04 15:14:02 -0400 |
| commit | 1fde9a67030845d3cae0661595f5737a4db8b9dd (patch) | |
| tree | 40a98f75bff979d5c681d21ec45a0ce18a1d3d80 /src/lib/apputils/net-server.c | |
| parent | dc04419132e73ec5e38f6680055f1e2e627d42d7 (diff) | |
| download | krb5-1fde9a67030845d3cae0661595f5737a4db8b9dd.tar.gz krb5-1fde9a67030845d3cae0661595f5737a4db8b9dd.tar.xz krb5-1fde9a67030845d3cae0661595f5737a4db8b9dd.zip | |
Don't depend on sa_len sockaddr field
In socket-utils.h, replace the socklen macro with an inline function
sa_socklen which always uses the address family, even on platforms
with the sa_len sockaddr field. This removes the need to set sa_len
in socket addresses we construct.
Diffstat (limited to 'src/lib/apputils/net-server.c')
| -rw-r--r-- | src/lib/apputils/net-server.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/apputils/net-server.c b/src/lib/apputils/net-server.c index 2dd435b76..558eee34c 100644 --- a/src/lib/apputils/net-server.c +++ b/src/lib/apputils/net-server.c @@ -139,7 +139,7 @@ paddr(struct sockaddr *sa) { static char buf[100]; char portbuf[10]; - if (getnameinfo(sa, socklen(sa), + if (getnameinfo(sa, sa_socklen(sa), buf, sizeof(buf), portbuf, sizeof(portbuf), NI_NUMERICHOST|NI_NUMERICSERV)) strlcpy(buf, "<unprintable>", sizeof(buf)); @@ -592,7 +592,7 @@ create_server_socket(struct socksetup *data, struct sockaddr *addr, int type) #endif /* IPV6_V6ONLY */ } - if (bind(sock, addr, socklen(addr)) == -1) { + if (bind(sock, addr, sa_socklen(addr)) == -1) { data->retval = errno; com_err(data->prog, errno, _("Cannot bind server socket on %s"), paddr(addr)); |