summaryrefslogtreecommitdiff
path: root/lib/dns/tkey.c
diff options
context:
space:
mode:
authorInternet Software Consortium, Inc <@isc.org>2012-06-04 09:10:50 -0600
committerInternet Software Consortium, Inc <@isc.org>2012-06-04 09:10:50 -0600
commit38f27ae0bdb4b0b53b00a160a2a4e370a3a1d506 (patch)
tree9f575097a1f052ba70000f2efc79b4949e481b6d /lib/dns/tkey.c
parent539173bbea3b9b25e6c7474a3e3d112f6e4e5cd2 (diff)
downloadbind9-38f27ae0bdb4b0b53b00a160a2a4e370a3a1d506.tar.gz
9.9.1-P1
Diffstat (limited to 'lib/dns/tkey.c')
-rw-r--r--lib/dns/tkey.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/dns/tkey.c b/lib/dns/tkey.c
index f871b628..0112f7ec 100644
--- a/lib/dns/tkey.c
+++ b/lib/dns/tkey.c
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2004-2011 Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2012 Internet Systems Consortium, Inc. ("ISC")
* Copyright (C) 1999-2001, 2003 Internet Software Consortium.
*
* Permission to use, copy, modify, and/or distribute this software for any
@@ -16,7 +16,7 @@
*/
/*
- * $Id: tkey.c,v 1.101 2011-03-11 06:11:24 marka Exp $
+ * $Id$
*/
/*! \file */
#include <config.h>
@@ -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.
*/