From 46fbcf04a041f6993c9d9f391d27b4ff022a2d21 Mon Sep 17 00:00:00 2001 From: Mark Andrews Date: Thu, 29 Mar 2012 09:52:44 +1100 Subject: [PATCH] 3300. [bug] Named could die if gssapi was enabled in named.conf but was not compiled in. [RT #28338] --- CHANGES | 3 +++ lib/dns/tkey.c | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CHANGES b/CHANGES index bae6fd8eca..adbc3b9dbc 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,6 @@ +3300. [bug] Named could die if gssapi was enabled in named.conf + but was not compiled in. [RT #28338] + 3299. [bug] Make SDB handle errors from database drivers better. [RT #28534] diff --git a/lib/dns/tkey.c b/lib/dns/tkey.c index bfc8e8b257..0112f7ec76 100644 --- a/lib/dns/tkey.c +++ b/lib/dns/tkey.c @@ -485,9 +485,9 @@ process_gsstkey(dns_name_t *name, dns_rdata_tkey_t *tkeyin, tkeyout->error = dns_tsigerror_badkey; tkey_log("process_gsstkey(): dns_tsigerror_badkey"); /* XXXSRA */ return (ISC_R_SUCCESS); - } else if (result == ISC_R_FAILURE) + } + if (result != DNS_R_CONTINUE && result != ISC_R_SUCCESS) goto failure; - ENSURE(result == DNS_R_CONTINUE || result == ISC_R_SUCCESS); /* * XXXDCL Section 4.1.3: Limit GSS_S_CONTINUE_NEEDED to 10 times. */