summaryrefslogtreecommitdiff
path: root/canohost.c
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2005-05-03 19:05:32 +1000
committerDarren Tucker <dtucker@zip.com.au>2005-05-03 19:05:32 +1000
commit5b115d4401453a99313996dc48e6b8f3e54c5b54 (patch)
treec2acae7fd2d19746244a58236546747253052044 /canohost.c
parent149da8577e5d494d17e1bd0235b24f4d9f2de49c (diff)
- (dtucker) [canohost.c] normalise socket addresses returned by
get_remote_hostname(). This means that IPv4 addresses in log messages on IPv6 enabled machines will no longer be prefixed by "::ffff:" and AllowUsers, DenyUsers, AllowGroups, DenyGroups will match IPv4-style addresses only for 4-in-6 mapped connections, regardless of whether or not the machine is IPv6 enabled. ok djm@
Diffstat (limited to 'canohost.c')
-rw-r--r--canohost.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/canohost.c b/canohost.c
index 1c22d477..94d66643 100644
--- a/canohost.c
+++ b/canohost.c
@@ -251,6 +251,8 @@ get_socket_address(int sock, int remote, int flags)
if (addr.ss_family == AF_INET6)
addrlen = sizeof(struct sockaddr_in6);
+ ipv64_normalise_mapped(&addr, &addrlen);
+
/* Get the address in ascii. */
if ((r = getnameinfo((struct sockaddr *)&addr, addrlen, ntop,
sizeof(ntop), NULL, 0, flags)) != 0) {