[needs the include/configure.in checkin of a few minutes ago, too]

* localaddr.c (get_lifconf): Define only if "struct lifconf" is available.
(foreach_localaddr): Use get_lifconf only if "struct lifconf" is available.

ticket: 2598

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@16621 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/lib/krb5/os/ChangeLog b/src/lib/krb5/os/ChangeLog
index 760c6601f141e1b28a4621d39589e8f985e1a180..7873efbd47c70e4d29e9eeccd6ce0b3452fbc269 100644 (file)
--- a/src/lib/krb5/os/ChangeLog
+++ b/src/lib/krb5/os/ChangeLog
@@ -1,3 +1,10 @@
+2004-07-22  Ken Raeburn  <raeburn@mit.edu>
+
+       * localaddr.c (get_lifconf): Define only if "struct lifconf" is
+       available.
+       (foreach_localaddr): Use get_lifconf only if "struct lifconf" is
+       available.
+
 2004-07-16  Ken Raeburn  <raeburn@mit.edu>
 
        * genaddrs.c, localaddr.c, lock_file.c, mk_faddr.c: Don't check

diff --git a/src/lib/krb5/os/localaddr.c b/src/lib/krb5/os/localaddr.c
index c5b89dcdf39784e109cb3a3bedf0afb10cc766b9..774929c26849aeb2badd49c187174e32b56863eb 100644 (file)
--- a/src/lib/krb5/os/localaddr.c
+++ b/src/lib/krb5/os/localaddr.c
@@ -280,7 +280,13 @@ get_ifconf (int s, size_t *lenp, /*@out@*/ char *buf)
     return ret;
 }
 
-#ifdef SIOCGLIFCONF /* Solaris */
+/* Solaris uses SIOCGLIFCONF to return struct lifconf which is just
+   an extended version of struct ifconf.
+
+   HP-UX 11 also appears to have SIOCGLIFCONF, but uses struct
+   if_laddrconf, and struct if_laddrreq to be used with
+   SIOCGLIFADDR.  */
+#if defined(SIOCGLIFCONF) && defined(HAVE_STRUCT_LIFCONF)
 static int
 get_lifconf (int af, int s, size_t *lenp, /*@out@*/ char *buf)
     /*@modifies *buf,*lenp@*/
@@ -454,7 +460,7 @@ foreach_localaddr (/*@null@*/ void *data,
     return 0;
 }
 
-#elif defined (SIOCGLIFNUM) /* Solaris 8 and later; Sol 7? */
+#elif defined (SIOCGLIFNUM) && defined(HAVE_STRUCT_LIFCONF) /* Solaris 8 and later; Sol 7? */
 
 int
 foreach_localaddr (/*@null@*/ void *data,