pullup:

1002.   [bug]           Log unknown class including file and line.  [RT #1759]

diff --git a/CHANGES b/CHANGES
index 2e08b8512325e133e6fc2c455c6f5ebdb9efeacf..49bdc8fcf94a25178ba0f498b18bd6abeff5b0d3 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,5 @@
 
+
 1013.  [bug]           It was possible to cancel a query twice when marking
                        a server as bogus or by having a blackhole acl.
                        [RT #1776]
@@ -16,6 +17,8 @@
 
 1004.  [port]          Deal with recvfrom() returning EHOSTDOWN. [RT #1770]
 
+1002.  [bug]           Log unknown class including file and line. [RT #1759]
+
 1001.  [bug]           win32 socket code doio_recv was not catching a
                        WSACONNRESET error when a client was timing out
                        the request and closing its socket. [RT #1745]

diff --git a/bin/named/config.c b/bin/named/config.c
index 24bd1495a69eeaf4689a8daf5d6b5683ab852dda..cbe2a58e8c49291b3a27189226f91bbb1d3336aa 100644 (file)
--- a/bin/named/config.c
+++ b/bin/named/config.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: config.c,v 1.11 2001/08/07 01:58:54 marka Exp $ */
+/* $Id: config.c,v 1.11.2.1 2001/09/21 20:30:32 gson Exp $ */
 
 #include <config.h>
 
@@ -181,6 +181,7 @@ ns_config_getclass(cfg_obj_t *classobj, dns_rdataclass_t defclass,
                   dns_rdataclass_t *classp) {
        char *str;
        isc_textregion_t r;
+       isc_result_t result;
 
        if (!cfg_obj_isstring(classobj)) {
                *classp = defclass;
@@ -189,7 +190,11 @@ ns_config_getclass(cfg_obj_t *classobj, dns_rdataclass_t defclass,
        str = cfg_obj_asstring(classobj);
        r.base = str;
        r.length = strlen(str);
-       return (dns_rdataclass_fromtext(classp, &r));
+       result = dns_rdataclass_fromtext(classp, &r);
+       if (result != ISC_R_SUCCESS)
+               cfg_obj_log(classobj, ns_g_lctx, ISC_LOG_ERROR,
+                           "unknown class '%s'", str);
+       return (result);
 }
 
 dns_zonetype_t