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

(krb5_get_all_client_addrs): make interaces scanning optional

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@7395 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Assar Westerlund
1999-11-14 16:46:54 +00:00
parent 22c477a1d0
commit c2d47bfa01
1 changed files with 28 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
lib/krb5/get_addrs.c
View File

@@ -89,7 +89,8 @@ gethostname_fallback (krb5_addresses *res)
enum { enum {
LOOP = 1, /* do include loopback interfaces */ LOOP = 1, /* do include loopback interfaces */
LOOP_IF_NONE = 2, /* include loopback if no other if's */ LOOP_IF_NONE = 2, /* include loopback if no other if's */
EXTRA_ADDRESSES = 4 /* include extra addresses */ EXTRA_ADDRESSES = 4, /* include extra addresses */
SCAN_INTERFACES = 8 /* scan interfaces for addresses */
}; };
/* /*
@@ -240,26 +241,30 @@ get_addrs_int (krb5_context context, krb5_addresses *res, int flags)
{ {
krb5_error_code ret = -1; krb5_error_code ret = -1;
if (flags & SCAN_INTERFACES) {
#if defined(AF_INET6) && defined(SIOCGIF6CONF) && defined(SIOCGIF6FLAGS) #if defined(AF_INET6) && defined(SIOCGIF6CONF) && defined(SIOCGIF6FLAGS)
if (ret) if (ret)
ret = find_all_addresses (context, res, flags, ret = find_all_addresses (context, res, flags,
AF_INET6, SIOCGIF6CONF, SIOCGIF6FLAGS, AF_INET6, SIOCGIF6CONF, SIOCGIF6FLAGS,
sizeof(struct in6_ifreq)); sizeof(struct in6_ifreq));
#endif #endif
#if defined(HAVE_IPV6) && defined(SIOCGIFCONF) #if defined(HAVE_IPV6) && defined(SIOCGIFCONF)
if (ret) if (ret)
ret = find_all_addresses (context, res, flags, ret = find_all_addresses (context, res, flags,
AF_INET6, SIOCGIFCONF, SIOCGIFFLAGS, AF_INET6, SIOCGIFCONF, SIOCGIFFLAGS,
sizeof(struct ifreq)); sizeof(struct ifreq));
#endif #endif
#if defined(AF_INET) && defined(SIOCGIFCONF) && defined(SIOCGIFFLAGS) #if defined(AF_INET) && defined(SIOCGIFCONF) && defined(SIOCGIFFLAGS)
if (ret) if (ret)
ret = find_all_addresses (context, res, flags, ret = find_all_addresses (context, res, flags,
AF_INET, SIOCGIFCONF, SIOCGIFFLAGS, AF_INET, SIOCGIFCONF, SIOCGIFFLAGS,
sizeof(struct ifreq)); sizeof(struct ifreq));
if(ret || res->len == 0)
ret = gethostname_fallback (res);
#endif #endif
if(ret || res->len == 0) } else
ret = gethostname_fallback (res); ret == 0;
if(ret == 0 && (flags & EXTRA_ADDRESSES)) { if(ret == 0 && (flags & EXTRA_ADDRESSES)) {
/* append user specified addresses */ /* append user specified addresses */
krb5_addresses a; krb5_addresses a;
@@ -282,14 +287,18 @@ get_addrs_int (krb5_context context, krb5_addresses *res, int flags)
* Try to get all addresses, but return the one corresponding to * Try to get all addresses, but return the one corresponding to
* `hostname' if we fail. * `hostname' if we fail.
* *
* Don't include any loopback addresses. * Only include loopback address if there are no other.
*
*/ */
krb5_error_code krb5_error_code
krb5_get_all_client_addrs (krb5_context context, krb5_addresses *res) krb5_get_all_client_addrs (krb5_context context, krb5_addresses *res)
{ {
return get_addrs_int (context, res, LOOP_IF_NONE | EXTRA_ADDRESSES); int flags = LOOP_IF_NONE | EXTRA_ADDRESSES;
if (context->scan_interfaces)
flags |= SCAN_INTERFACES;
return get_addrs_int (context, res, flags);
} }
/* /*
@@ -300,5 +309,5 @@ krb5_get_all_client_addrs (krb5_context context, krb5_addresses *res)
krb5_error_code krb5_error_code
krb5_get_all_server_addrs (krb5_context context, krb5_addresses *res) krb5_get_all_server_addrs (krb5_context context, krb5_addresses *res)
{ {
return get_addrs_int (context, res, LOOP); return get_addrs_int (context, res, LOOP | SCAN_INTERFACES);
} }