pullup for Andreas [#443]

diff --git a/CHANGES b/CHANGES
index bfbe6504c6240b2a5421138d7da4305f118ccb3b..53198f05e30aa97b7e32810f469a9ce3918fb3b7 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -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]
 

diff --git a/lib/dns/master.c b/lib/dns/master.c
index ec0141eb7dfd802f3a11a1a44f58b62b6cf3c6c2..6bb6c71f25df8c5480566bca021bf0a02c2fd771 100644 (file)
--- a/lib/dns/master.c
+++ b/lib/dns/master.c
@@ -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