s4:heimdal: import lorikeet-heimdal-200903260854 (commit 8f3b61e3fb466bb9dd457ae88ee0...

[metze/samba/wip.git] / source4 / heimdal / lib / krb5 / get_addrs.c

diff --git a/source4/heimdal/lib/krb5/get_addrs.c b/source4/heimdal/lib/krb5/get_addrs.c
index ce167853192ac0c43eda16f1b736c320a9d44ed5..2bef0ae956dbf07c8ed6fef46906d2f96b9e1f00 100644 (file)
--- a/source4/heimdal/lib/krb5/get_addrs.c
+++ b/source4/heimdal/lib/krb5/get_addrs.c
@@ -33,7 +33,7 @@
 
 #include "krb5_locl.h"
 
-RCSID("$Id: get_addrs.c 23815 2008-09-13 09:21:03Z lha $");
+RCSID("$Id$");
 
 #ifdef __osf__
 /* hate */
@@ -43,9 +43,7 @@ struct mbuf;
 #ifdef HAVE_NET_IF_H
 #include <net/if.h>
 #endif
-#ifdef HAVE_IFADDR_H
 #include <ifaddrs.h>
-#endif
 
 static krb5_error_code
 gethostname_fallback (krb5_context context, krb5_addresses *res)
@@ -106,8 +104,6 @@ find_all_addresses (krb5_context context, krb5_addresses *res, int flags)
     unsigned int num, idx;
     krb5_addresses ignore_addresses;
 
-    res->val = NULL;
-
     if (getifaddrs(&ifa0) == -1) {
        ret = errno;
        krb5_set_error_message(context, ret, "getifaddrs: %s", strerror(ret));
@@ -232,13 +228,14 @@ get_addrs_int (krb5_context context, krb5_addresses *res, int flags)
 {
     krb5_error_code ret = -1;
 
+    res->len = 0;
+    res->val = NULL;
+
     if (flags & SCAN_INTERFACES) {
        ret = find_all_addresses (context, res, flags);
        if(ret || res->len == 0)
            ret = gethostname_fallback (context, res);
     } else {
-       res->len = 0;
-       res->val = NULL;
        ret = 0;
     }