summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--addrmatch.c2
-rw-r--r--configure.ac13
3 files changed, 19 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 235c0f2ef..80e9b439d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
120081118
2 - (tim) [addrmatch.c configure.ac] Some platforms do not have sin6_scope_id
3 member of sockaddr_in6. Also reported in Bug 1491 by David Leonard. OK and
4 feedback by djm@
5
120081111 620081111
2 - (dtucker) OpenBSD CVS Sync 7 - (dtucker) OpenBSD CVS Sync
3 - jmc@cvs.openbsd.org 2008/11/05 11:22:54 8 - jmc@cvs.openbsd.org 2008/11/05 11:22:54
@@ -4921,5 +4926,5 @@
4921 OpenServer 6 and add osr5bigcrypt support so when someone migrates 4926 OpenServer 6 and add osr5bigcrypt support so when someone migrates
4922 passwords between UnixWare and OpenServer they will still work. OK dtucker@ 4927 passwords between UnixWare and OpenServer they will still work. OK dtucker@
4923 4928
4924$Id: ChangeLog,v 1.5141 2008/11/19 00:54:24 djm Exp $ 4929$Id: ChangeLog,v 1.5142 2008/11/19 05:26:41 tim Exp $
4925 4930
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)
97 return -1; 97 return -1;
98 xa->af = AF_INET6; 98 xa->af = AF_INET6;
99 memcpy(&xa->v6, &in6->sin6_addr, sizeof(xa->v6)); 99 memcpy(&xa->v6, &in6->sin6_addr, sizeof(xa->v6));
100#ifdef HAVE_STRUCT_SOCKADDR_IN6_SIN6_SCOPE_ID
100 xa->scope_id = in6->sin6_scope_id; 101 xa->scope_id = in6->sin6_scope_id;
102#endif
101 break; 103 break;
102 default: 104 default:
103 return -1; 105 return -1;
diff --git a/configure.ac b/configure.ac
index fcf7e416b..3e0821bae 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
1# $Id: configure.ac,v 1.409 2008/07/09 11:07:19 djm Exp $ 1# $Id: configure.ac,v 1.410 2008/11/19 05:26:42 tim Exp $
2# 2#
3# Copyright (c) 1999-2004 Damien Miller 3# Copyright (c) 1999-2004 Damien Miller
4# 4#
@@ -15,7 +15,7 @@
15# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. 15# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
16 16
17AC_INIT(OpenSSH, Portable, openssh-unix-dev@mindrot.org) 17AC_INIT(OpenSSH, Portable, openssh-unix-dev@mindrot.org)
18AC_REVISION($Revision: 1.409 $) 18AC_REVISION($Revision: 1.410 $)
19AC_CONFIG_SRCDIR([ssh.c]) 19AC_CONFIG_SRCDIR([ssh.c])
20 20
21AC_CONFIG_HEADER(config.h) 21AC_CONFIG_HEADER(config.h)
@@ -2824,6 +2824,15 @@ AC_CACHE_CHECK([for struct in6_addr], ac_cv_have_struct_in6_addr, [
2824if test "x$ac_cv_have_struct_in6_addr" = "xyes" ; then 2824if test "x$ac_cv_have_struct_in6_addr" = "xyes" ; then
2825 AC_DEFINE(HAVE_STRUCT_IN6_ADDR, 1, 2825 AC_DEFINE(HAVE_STRUCT_IN6_ADDR, 1,
2826 [define if you have struct in6_addr data type]) 2826 [define if you have struct in6_addr data type])
2827
2828dnl Now check for sin6_scope_id
2829 AC_CHECK_MEMBERS([struct sockaddr_in6.sin6_scope_id],,,
2830 [
2831#ifdef HAVE_SYS_TYPES_H
2832#include <sys/types.h>
2833#endif
2834#include <netinet/in.h>
2835 ])
2827fi 2836fi
2828 2837
2829AC_CACHE_CHECK([for struct addrinfo], ac_cv_have_struct_addrinfo, [ 2838AC_CACHE_CHECK([for struct addrinfo], ac_cv_have_struct_addrinfo, [