diff options
| author | des <des@FreeBSD.org> | 2009-05-22 18:46:28 +0000 |
|---|---|---|
| committer | des <des@FreeBSD.org> | 2009-05-22 18:46:28 +0000 |
| commit | 8bf56a9772e08d79d1a808bb69be82ca688afc76 (patch) | |
| tree | d3b23c04145e95d8d26c4e6efa1cd05fa34fd795 /crypto/openssh/addrmatch.c | |
| parent | 56fa0af6738b5c4466957197aaa372d30e74440b (diff) | |
| parent | f4c3a2131f559534b5693fd15df8d89049db7cbb (diff) | |
| download | FreeBSD-src-8bf56a9772e08d79d1a808bb69be82ca688afc76.zip FreeBSD-src-8bf56a9772e08d79d1a808bb69be82ca688afc76.tar.gz | |
Upgrade to OpenSSH 5.2p1.
MFC after: 3 months
Diffstat (limited to 'crypto/openssh/addrmatch.c')
| -rw-r--r-- | crypto/openssh/addrmatch.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/crypto/openssh/addrmatch.c b/crypto/openssh/addrmatch.c index 2086afe..d39885b 100644 --- a/crypto/openssh/addrmatch.c +++ b/crypto/openssh/addrmatch.c @@ -1,4 +1,4 @@ -/* $OpenBSD: addrmatch.c,v 1.3 2008/06/10 23:06:19 djm Exp $ */ +/* $OpenBSD: addrmatch.c,v 1.4 2008/12/10 03:55:20 stevesk Exp $ */ /* * Copyright (c) 2004-2008 Damien Miller <djm@mindrot.org> @@ -31,6 +31,7 @@ #include "match.h" #include "log.h" +#include "xmalloc.h" struct xaddr { sa_family_t af; @@ -97,7 +98,9 @@ addr_sa_to_xaddr(struct sockaddr *sa, socklen_t slen, struct xaddr *xa) return -1; xa->af = AF_INET6; memcpy(&xa->v6, &in6->sin6_addr, sizeof(xa->v6)); +#ifdef HAVE_STRUCT_SOCKADDR_IN6_SIN6_SCOPE_ID xa->scope_id = in6->sin6_scope_id; +#endif break; default: return -1; @@ -415,7 +418,7 @@ addr_match_list(const char *addr, const char *_list) goto foundit; } } - free(o); + xfree(o); return ret; } |
