diff options
| author | Colin Watson <cjwatson@debian.org> | 2005-05-30 22:13:03 +0000 |
|---|---|---|
| committer | Colin Watson <cjwatson@debian.org> | 2005-05-30 22:13:03 +0000 |
| commit | 4e1e258d1f5745f3dc05ead3cb834c445e6e8818 (patch) | |
| tree | bfbc91107d6bfe7b2a68d8701562e59856116a6a /canohost.c | |
| parent | 4a20a0b23bd0e1db5e69f27c65aaa11a5a2eacd0 (diff) | |
| parent | a55bd782aa819b7f5ae716de000f19f4f531850e (diff) | |
Merge 4.1p1 to the trunk.
Diffstat (limited to 'canohost.c')
| -rw-r--r-- | canohost.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/canohost.c b/canohost.c index 1c22d4770..94d666432 100644 --- a/canohost.c +++ b/canohost.c | |||
| @@ -251,6 +251,8 @@ get_socket_address(int sock, int remote, int flags) | |||
| 251 | if (addr.ss_family == AF_INET6) | 251 | if (addr.ss_family == AF_INET6) |
| 252 | addrlen = sizeof(struct sockaddr_in6); | 252 | addrlen = sizeof(struct sockaddr_in6); |
| 253 | 253 | ||
| 254 | ipv64_normalise_mapped(&addr, &addrlen); | ||
| 255 | |||
| 254 | /* Get the address in ascii. */ | 256 | /* Get the address in ascii. */ |
| 255 | if ((r = getnameinfo((struct sockaddr *)&addr, addrlen, ntop, | 257 | if ((r = getnameinfo((struct sockaddr *)&addr, addrlen, ntop, |
| 256 | sizeof(ntop), NULL, 0, flags)) != 0) { | 258 | sizeof(ntop), NULL, 0, flags)) != 0) { |