diff options
author | Colin Watson <cjwatson@debian.org> | 2014-02-10 00:18:28 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2014-02-10 00:18:28 +0000 |
commit | 9a975a9faed7c4f334e8c8490db3e77e102f2b21 (patch) | |
tree | 764a885ec9a963f6a8b15de6e1765f16b9ac4738 /addrmatch.c | |
parent | ee196dab7c5f97f0b80c8099343a375bead92010 (diff) | |
parent | cdb6c90811caa5df2df856be9b0b16db020fe31d (diff) |
Import openssh_6.5p1.orig.tar.gz
Diffstat (limited to 'addrmatch.c')
-rw-r--r-- | addrmatch.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/addrmatch.c b/addrmatch.c index fb6de92e7..c44314632 100644 --- a/addrmatch.c +++ b/addrmatch.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: addrmatch.c,v 1.7 2013/05/17 00:13:13 djm Exp $ */ | 1 | /* $OpenBSD: addrmatch.c,v 1.9 2014/01/19 11:21:51 dtucker Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Copyright (c) 2004-2008 Damien Miller <djm@mindrot.org> | 4 | * Copyright (c) 2004-2008 Damien Miller <djm@mindrot.org> |
@@ -88,13 +88,13 @@ addr_sa_to_xaddr(struct sockaddr *sa, socklen_t slen, struct xaddr *xa) | |||
88 | 88 | ||
89 | switch (sa->sa_family) { | 89 | switch (sa->sa_family) { |
90 | case AF_INET: | 90 | case AF_INET: |
91 | if (slen < sizeof(*in4)) | 91 | if (slen < (socklen_t)sizeof(*in4)) |
92 | return -1; | 92 | return -1; |
93 | xa->af = AF_INET; | 93 | xa->af = AF_INET; |
94 | memcpy(&xa->v4, &in4->sin_addr, sizeof(xa->v4)); | 94 | memcpy(&xa->v4, &in4->sin_addr, sizeof(xa->v4)); |
95 | break; | 95 | break; |
96 | case AF_INET6: | 96 | case AF_INET6: |
97 | if (slen < sizeof(*in6)) | 97 | if (slen < (socklen_t)sizeof(*in6)) |
98 | return -1; | 98 | return -1; |
99 | xa->af = AF_INET6; | 99 | xa->af = AF_INET6; |
100 | memcpy(&xa->v6, &in6->sin6_addr, sizeof(xa->v6)); | 100 | memcpy(&xa->v6, &in6->sin6_addr, sizeof(xa->v6)); |