3300. [bug] Named could die if gssapi was enabled in named.conf

                        but was not compiled in. [RT #28338]

diff --git a/CHANGES b/CHANGES
index 1143a9258e1efa99a926d7f7d1b273609806fe8d..a9874cb2be93e547ecc24d6f73b04ed87635c29d 100644 (file)
--- 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 c525447028587d35565ae2dae896277fe234c429..0b38417e087f9f9df11ac9b9e8fa01179c880326 100644 (file)
--- a/lib/dns/tkey.c
+++ b/lib/dns/tkey.c
@@ -468,9 +468,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.
         */