From efd5e9c1a4cf5487be2e0bda5d537defc11a5065 Mon Sep 17 00:00:00 2001 From: Johan Danielsson Date: Mon, 2 Sep 2002 17:03:12 +0000 Subject: [PATCH] (init_context_from_config_file): simplify initialisation of srv_lookup git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@11328 ec53bebd-3082-4978-b11e-865c3cabbd6b --- lib/krb5/context.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/lib/krb5/context.c b/lib/krb5/context.c index 6d5891c82..03a093158 100644 --- a/lib/krb5/context.c +++ b/lib/krb5/context.c @@ -173,14 +173,9 @@ init_context_from_config_file(krb5_context context) INIT_FIELD(context, bool, scan_interfaces, TRUE, "scan_interfaces"); INIT_FIELD(context, int, fcache_vno, 0, "fcache_version"); - INIT_FIELD(context, bool, srv_lookup, TRUE, "dns_lookup_kdc"); - /* srv_lookup backwards compatibility. */ - { - const char **p; - p = krb5_config_get_strings(context, NULL, "libdefaults", "srv_lookup", NULL); - if (p != NULL) - INIT_FIELD(context, bool, srv_lookup, TRUE, "srv_lookup"); - } + /* prefer dns_lookup_kdc over srv_lookup. */ + INIT_FIELD(context, bool, srv_lookup, TRUE, "srv_lookup"); + INIT_FIELD(context, bool, srv_lookup, context->srv_lookup, "dns_lookup_kdc"); return 0; }