- (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@

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)
         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) {