From 0f4d2c02f275ad9f80ccd7435ffb407a8be61e9a Mon Sep 17 00:00:00 2001 From: Tim Rice Date: Tue, 18 Nov 2008 21:26:41 -0800 Subject: - (tim) [addrmatch.c configure.ac] Some platforms do not have sin6_scope_id member of sockaddr_in6. Also reported in Bug 1491 by David Leonard. OK and feedback by djm@ --- addrmatch.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'addrmatch.c') diff --git a/addrmatch.c b/addrmatch.c index 2086afe84..f3c861a1f 100644 --- a/addrmatch.c +++ b/addrmatch.c @@ -97,7 +97,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; -- cgit v1.2.3 From 7375fe2c6d42e62b30a90e7a874f188c891061d5 Mon Sep 17 00:00:00 2001 From: Damien Miller Date: Wed, 28 Jan 2009 16:16:00 +1100 Subject: - stevesk@cvs.openbsd.org 2008/12/10 03:55:20 [addrmatch.c] o cannot be NULL here but use xfree() to be consistent; ok djm@ --- ChangeLog | 5 ++++- addrmatch.c | 5 +++-- 2 files changed, 7 insertions(+), 3 deletions(-) (limited to 'addrmatch.c') diff --git a/ChangeLog b/ChangeLog index 482bd6bed..012a66514 100644 --- a/ChangeLog +++ b/ChangeLog @@ -17,6 +17,9 @@ - stevesk@cvs.openbsd.org 2008/12/09 22:37:33 [clientloop.c] fix typo in error message + - stevesk@cvs.openbsd.org 2008/12/10 03:55:20 + [addrmatch.c] + o cannot be NULL here but use xfree() to be consistent; ok djm@ 20090107 - (djm) [uidswap.c] bz#1412: Support >16 supplemental groups in OS X. @@ -5026,5 +5029,5 @@ OpenServer 6 and add osr5bigcrypt support so when someone migrates passwords between UnixWare and OpenServer they will still work. OK dtucker@ -$Id: ChangeLog,v 1.5164 2009/01/28 05:15:30 djm Exp $ +$Id: ChangeLog,v 1.5165 2009/01/28 05:16:00 djm Exp $ diff --git a/addrmatch.c b/addrmatch.c index f3c861a1f..d39885b7b 100644 --- a/addrmatch.c +++ b/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 @@ -31,6 +31,7 @@ #include "match.h" #include "log.h" +#include "xmalloc.h" struct xaddr { sa_family_t af; @@ -417,7 +418,7 @@ addr_match_list(const char *addr, const char *_list) goto foundit; } } - free(o); + xfree(o); return ret; } -- cgit v1.2.3