oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

compat for different IPv6-APIs

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@3485 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Assar Westerlund
1997-09-12 23:29:58 +00:00
parent b09f153c01
commit 0578c01b1f
2 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/krb5/auth_context.c
View File

@@ -152,6 +152,10 @@ sockaddr2krb5_address (struct sockaddr *sa,
if (IN6_IS_ADDR_V4MAPPED(&sin6->sin6_addr)) { if (IN6_IS_ADDR_V4MAPPED(&sin6->sin6_addr)) {
ka->addr_type = AF_INET; ka->addr_type = AF_INET;
ka->address.length = sizeof(struct in_addr); ka->address.length = sizeof(struct in_addr);
#ifndef IN6_ADDR_V6_TO_V4
#define IN6_ADDR_V6_TO_V4(x) (&IN6_EXTRACT_V4ADDR(x))
#endif
ka->address.data = IN6_ADDR_V6_TO_V4(&sin6->sin6_addr); ka->address.data = IN6_ADDR_V6_TO_V4(&sin6->sin6_addr);
} else { } else {
ka->addr_type = AF_INET6; ka->addr_type = AF_INET6;

4
lib/krb5/get_addrs.c
View File

@@ -197,6 +197,10 @@ find_all_addresses (krb5_addresses *res, int loop,
sin6 = &((struct sockaddr_in6 *)(&ifr->ifr_addr))->sin6_addr; sin6 = &((struct sockaddr_in6 *)(&ifr->ifr_addr))->sin6_addr;
#ifndef IN6_IS_ADDR_LOOPBACK
#define IN6_IS_ADDR_LOOPBACK(x) IN6_IS_LOOPBACK(*x)
#endif
if (IN6_IS_ADDR_LOOPBACK(sin6) if (IN6_IS_ADDR_LOOPBACK(sin6)
|| IN6_IS_ADDR_LINKLOCAL(sin6) || IN6_IS_ADDR_LINKLOCAL(sin6)
|| IN6_IS_ADDR_V4COMPAT(sin6)) { || IN6_IS_ADDR_V4COMPAT(sin6)) {