pullup for Andreas [#443]

This commit is contained in:
Michael Graff
2000-09-12 19:19:25 +00:00
parent ec2d44c7cd
commit 4c5ca92d07
2 changed files with 15 additions and 2 deletions

View File

@@ -1,3 +1,8 @@
443. [bug] When loading a master file failed because of an
unrecognized RR type name, the error message
did not include the file name and line number.
[RT #285]
442. [bug] TSIG signed messages that did not match any view
crashed the server. [RT #290]

View File

@@ -15,7 +15,7 @@
* SOFTWARE.
*/
/* $Id: master.c,v 1.54.2.4 2000/08/02 21:22:27 gson Exp $ */
/* $Id: master.c,v 1.54.2.5 2000/09/12 19:19:25 explorer Exp $ */
#include <config.h>
@@ -646,8 +646,16 @@ load(isc_lex_t *lex, dns_name_t *top, dns_name_t *origin,
result = dns_rdatatype_fromtext(&type,
&token.value.as_textregion);
if (result != ISC_R_SUCCESS)
if (result != ISC_R_SUCCESS) {
(*callbacks->warn)(callbacks,
"%s: %s:%lu: unknown RR type '%.*s'",
"dns_master_load",
isc_lex_getsourcename(ctx->lex),
isc_lex_getsourceline(ctx->lex),
token.value.as_textregion.length,
token.value.as_textregion.base);
goto cleanup;
}
/*
* If the class specified does not match the zone's class