diff options
| author | Colin Watson <cjwatson@debian.org> | 2011-01-24 11:46:57 +0000 |
|---|---|---|
| committer | Colin Watson <cjwatson@debian.org> | 2011-01-24 11:46:57 +0000 |
| commit | 0970072c89b079b022538e3c366fbfa2c53fc821 (patch) | |
| tree | b7024712d74234bb5a8b036ccbc9109e2e211296 /canohost.c | |
| parent | 4e8aa4da57000c7bba8e5c49163bc0c0ca383f78 (diff) | |
| parent | 478ff799463ca926a8dfbabf058f4e84aaffc65a (diff) | |
merge 5.7p1
Diffstat (limited to 'canohost.c')
| -rw-r--r-- | canohost.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/canohost.c b/canohost.c index ef94d9155..dabd8a31a 100644 --- a/canohost.c +++ b/canohost.c | |||
| @@ -199,7 +199,7 @@ ipv64_normalise_mapped(struct sockaddr_storage *addr, socklen_t *len) | |||
| 199 | memcpy(&inaddr, ((char *)&a6->sin6_addr) + 12, sizeof(inaddr)); | 199 | memcpy(&inaddr, ((char *)&a6->sin6_addr) + 12, sizeof(inaddr)); |
| 200 | port = a6->sin6_port; | 200 | port = a6->sin6_port; |
| 201 | 201 | ||
| 202 | memset(addr, 0, sizeof(*a4)); | 202 | bzero(a4, sizeof(*a4)); |
| 203 | 203 | ||
| 204 | a4->sin_family = AF_INET; | 204 | a4->sin_family = AF_INET; |
| 205 | *len = sizeof(*a4); | 205 | *len = sizeof(*a4); |