summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/lib/krb5/os/ChangeLog5
-rw-r--r--src/lib/krb5/os/localaddr.c4
2 files changed, 8 insertions, 1 deletions
diff --git a/src/lib/krb5/os/ChangeLog b/src/lib/krb5/os/ChangeLog
index 92e14c5647..c086048a70 100644
--- a/src/lib/krb5/os/ChangeLog
+++ b/src/lib/krb5/os/ChangeLog
@@ -1,5 +1,10 @@
2001-03-05 Ken Raeburn <raeburn@mit.edu>
+ * localaddr.c (krb5_os_localaddr): Don't look for -1 return value
+ from foreach_localaddr.
+ (print_addr): Only process AF_INET6 addresses if AF_INET6 is
+ defined.
+
* gmt_mktime.c (gmt_mktime): Handle years earlier than 1970.
(main) [TEST_LEAP]: New routine, driver for testing.
* Makefile.in (t_mktime): New target.
diff --git a/src/lib/krb5/os/localaddr.c b/src/lib/krb5/os/localaddr.c
index bcb861eb6e..82c5863f98 100644
--- a/src/lib/krb5/os/localaddr.c
+++ b/src/lib/krb5/os/localaddr.c
@@ -499,12 +499,14 @@ static int print_addr (/*@unused@*/ void *dataptr, struct sockaddr *sa)
printf ("addr %s\n",
inet_ntoa (((struct sockaddr_in *)sa)->sin_addr));
break;
+#ifdef AF_INET6
case AF_INET6:
printf ("addr %s\n",
inet_ntop (sa->sa_family,
&((struct sockaddr_in6 *)sa)->sin6_addr,
buf, sizeof (buf)));
break;
+#endif
#ifdef AF_LINK
case AF_LINK:
printf ("linkaddr\n");
@@ -679,7 +681,7 @@ krb5_os_localaddr(context, addr)
krb5_xfree (data.addr_temp[i]);
free (data.addr_temp);
}
- if (r == -1 && data.mem_err)
+ if (data.mem_err)
return ENOMEM;
else
return r;