From 08464d020df619e188721232f091dcfbd3d6e674 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Tue, 20 Sep 2005 07:03:47 +0000 Subject: r10337: This grubby little hack is the implementation of a concept discussed on the kerberos mailing lists a couple of weeks ago: Don't use DNS at all for expanding short names into long names. Using the 'override krb5_init_context' code already in the tree, this removes the DNS lag on a kerberos session setup/connection. Andrew Bartlett --- source/heimdal/lib/krb5/context.c | 1 + source/heimdal/lib/krb5/expand_hostname.c | 9 +++++++++ source/heimdal/lib/krb5/krb5.h | 1 + 3 files changed, 11 insertions(+) (limited to 'source/heimdal') diff --git a/source/heimdal/lib/krb5/context.c b/source/heimdal/lib/krb5/context.c index 4d6eae2b24b..3140f1b08f1 100644 --- a/source/heimdal/lib/krb5/context.c +++ b/source/heimdal/lib/krb5/context.c @@ -182,6 +182,7 @@ init_context_from_config_file(krb5_context context) INIT_FIELD(context, bool, srv_lookup, context->srv_lookup, "dns_lookup_kdc"); INIT_FIELD(context, int, large_msg_size, 6000, "large_message_size"); context->default_cc_name = NULL; + INIT_FIELD(context, bool, fdns, TRUE, "fdns"); return 0; } diff --git a/source/heimdal/lib/krb5/expand_hostname.c b/source/heimdal/lib/krb5/expand_hostname.c index 8488119552f..f03bf158071 100644 --- a/source/heimdal/lib/krb5/expand_hostname.c +++ b/source/heimdal/lib/krb5/expand_hostname.c @@ -65,6 +65,10 @@ krb5_expand_hostname (krb5_context context, memset (&hints, 0, sizeof(hints)); hints.ai_flags = AI_CANONNAME; + if (!context->fdns) { + return copy_hostname (context, orig_hostname, new_hostname); + } + error = getaddrinfo (orig_hostname, NULL, &hints, &ai); if (error) return copy_hostname (context, orig_hostname, new_hostname); @@ -124,6 +128,11 @@ krb5_expand_hostname_realms (krb5_context context, int error; krb5_error_code ret = 0; + if (!context->fdns) { + return vanilla_hostname (context, orig_hostname, new_hostname, + realms); + } + memset (&hints, 0, sizeof(hints)); hints.ai_flags = AI_CANONNAME; diff --git a/source/heimdal/lib/krb5/krb5.h b/source/heimdal/lib/krb5/krb5.h index c47c4450f15..90b239cf0d7 100644 --- a/source/heimdal/lib/krb5/krb5.h +++ b/source/heimdal/lib/krb5/krb5.h @@ -443,6 +443,7 @@ typedef struct krb5_context_data { int pkinit_flags; void *mutex; /* protects error_string/error_buf */ int large_msg_size; + krb5_boolean fdns; /* Lookup hostnames to find full name, or send as-is */ } krb5_context_data; enum { -- cgit