Merge 6.6p1.

* New upstream release (http://www.openssh.com/txt/release-6.6).

1 files changed, 1 insertions, 1 deletions

diff --git a/canohost.c b/canohost.c
index a19a60cda..a61a8c94d 100644
--- a/canohost.c
+++ b/canohost.c
@@ -192,7 +192,7 @@ ipv64_normalise_mapped(struct sockaddr_storage *addr, socklen_t *len)
         memcpy(&inaddr, ((char *)&a6->sin6_addr) + 12, sizeof(inaddr));
         port = a6->sin6_port;
 
-        bzero(a4, sizeof(*a4));
+        memset(a4, 0, sizeof(*a4));
 
         a4->sin_family = AF_INET;
         *len = sizeof(*a4);