mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-09-02 07:35:26 +00:00
Code Issues Releases Wiki Activity

Certain errors caused failure but didn't set the return value.

Browse Source
This commit is contained in:
Brian Wellington
2000-03-14 22:05:08 +00:00
parent c7f88538d4
commit 948716c24c
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
lib/dns/sec/dst/dst_api.c
View File

@@ -17,7 +17,7 @@
/* /*
* Principal Author: Brian Wellington * Principal Author: Brian Wellington
* $Id: dst_api.c,v 1.21 2000/03/06 20:05:58 bwelling Exp $ * $Id: dst_api.c,v 1.22 2000/03/14 22:05:08 bwelling Exp $
*/ */
#include <config.h> #include <config.h>
@@ -951,6 +951,11 @@ read_public_key(const char *name, const isc_uint16_t id, int alg,
goto cleanup; \ goto cleanup; \
} }
#define BADTOKEN() { \
ret = ISC_R_UNEXPECTEDTOKEN; \
goto cleanup; \
}
/* Read the domain name */ /* Read the domain name */
NEXTTOKEN(lex, opt, &token); NEXTTOKEN(lex, opt, &token);
@@ -962,16 +967,16 @@ read_public_key(const char *name, const isc_uint16_t id, int alg,
NEXTTOKEN(lex, opt, &token); NEXTTOKEN(lex, opt, &token);
if (token.type != isc_tokentype_string) if (token.type != isc_tokentype_string)
goto cleanup; BADTOKEN();
if (strcasecmp(token.value.as_pointer, "IN") == 0) if (strcasecmp(token.value.as_pointer, "IN") == 0)
NEXTTOKEN(lex, opt, &token); NEXTTOKEN(lex, opt, &token);
if (token.type != isc_tokentype_string) if (token.type != isc_tokentype_string)
goto cleanup; BADTOKEN();
if (strcasecmp(token.value.as_pointer, "KEY") != 0) if (strcasecmp(token.value.as_pointer, "KEY") != 0)
goto cleanup; BADTOKEN();
isc_buffer_init(&b, rdatabuf, sizeof(rdatabuf), ISC_BUFFERTYPE_BINARY); isc_buffer_init(&b, rdatabuf, sizeof(rdatabuf), ISC_BUFFERTYPE_BINARY);
ret = dns_rdata_fromtext(&rdata, dns_rdataclass_in, dns_rdatatype_key, ret = dns_rdata_fromtext(&rdata, dns_rdataclass_in, dns_rdatatype_key,