summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--source4/auth/kerberos/kerberos-notes.txt8
-rw-r--r--source4/heimdal/lib/krb5/krbhst.c5
2 files changed, 13 insertions, 0 deletions
diff --git a/source4/auth/kerberos/kerberos-notes.txt b/source4/auth/kerberos/kerberos-notes.txt
index cfbf904bb3c..3b2989eee12 100644
--- a/source4/auth/kerberos/kerberos-notes.txt
+++ b/source4/auth/kerberos/kerberos-notes.txt
@@ -365,4 +365,12 @@ by providing specific, english text-string error messages instead of
just error code translations.
+Short name rules
+----------------
+
+Samba is highly likely to be misconfigured, in many weird and
+interesting ways. As such, we have a patch for Heimdal that avoids
+DNS lookups on names without a . in them. This should avoid some
+delay and root server load.
+
diff --git a/source4/heimdal/lib/krb5/krbhst.c b/source4/heimdal/lib/krb5/krbhst.c
index 49eee08ca5d..98e9cb3f095 100644
--- a/source4/heimdal/lib/krb5/krbhst.c
+++ b/source4/heimdal/lib/krb5/krbhst.c
@@ -634,6 +634,11 @@ common_init(krb5_context context,
return NULL;
}
+ /* For 'realms' without a . do not even think of going to DNS */
+ if (!strchr(realm, '.')) {
+ kd->flags |= KD_CONFIG_EXISTS;
+ }
+
if (flags & KRB5_KRBHST_FLAGS_LARGE_MSG)
kd->flags |= KD_LARGE_MSG;
kd->end = kd->index = &kd->hosts;