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

If the hostname contains a dot, assumes it's a FQAN and don't use

Browse Source 
search domains since that might be painfully slow when machine is
disconnected from that network.

Found by Tridge
This commit is contained in:
Love Hornquist Astrand
2010-09-28 22:37:01 -07:00
parent 5410614330
commit f454f45fbf
1 changed files with 25 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
lib/krb5/krbhst.c
View File

@@ -356,9 +356,14 @@ make_hints(struct addrinfo *hints, int proto)
} }
} }
/* /**
* return an `struct addrinfo *' in `ai' corresponding to the information * Return an `struct addrinfo *' for a KDC host.
* in `host'. free:ing is handled by krb5_krbhst_free. *
* Returns an the struct addrinfo in in that corresponds to the
* information in `host'. free:ing is handled by krb5_krbhst_free, so
* the returned ai must not be released.
*
* @ingroup krb5
*/ */
KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
@@ -370,9 +375,25 @@ krb5_krbhst_get_addrinfo(krb5_context context, krb5_krbhst_info *host,
int ret; int ret;
if (host->ai == NULL) { if (host->ai == NULL) {
char *hostname = host->hostname;
/**
* If the hostname contains a dot, assumes it's a FQAN and
* don't use search domains since that might be painfully slow
* when machine is disconnected from that network.
*/
if (strchr(hostname, '.') && hostname[strlen(hostname) - 1] == '.') {
ret = asprintf(&hostname, "%s.", host->hostname);
if (ret < 0 || hostname == NULL)
return ENOMEM;
}
make_hints(&hints, host->proto); make_hints(&hints, host->proto);
snprintf (portstr, sizeof(portstr), "%d", host->port); snprintf (portstr, sizeof(portstr), "%d", host->port);
ret = getaddrinfo(host->hostname, portstr, &hints, &host->ai); ret = getaddrinfo(hostname, portstr, &hints, &host->ai);
if (hostname != host->hostname)
free(hostname);
if (ret) if (ret)
return krb5_eai_to_heim_errno(ret, errno); return krb5_eai_to_heim_errno(ret, errno);
} }