pullup:

 474.   [bug]           The mnemonic of the CHAOS class is CH according to
                        RFC1035, but it was printed and read only as CHAOS.
                        We now accept both forms as input, and print it
                        as CH. [RT #305]

diff --git a/CHANGES b/CHANGES
index 56e4d2c6613a1686775aaf81ccff9bffb540a4a8..4ee3a1d003454d0201dce4029d3d0f4ecff327e1 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,9 @@
 
+ 474.  [bug]           The mnemonic of the CHAOS class is CH according to
+                       RFC1035, but it was printed and read only as CHAOS.
+                       We now accept both forms as input, and print it
+                       as CH. [RT #305]
+
  473.  [bug]           nsupdate overran the end of the list of name servers
                        when no servers could be reached, typically causing 
                        it to print the error message "dns_request_create:

diff --git a/lib/dns/rdata.c b/lib/dns/rdata.c
index baab53978147a1aecce6a946ced01cf6a9f2ff4a..417a1caae63228cdd69b7adc890a5cb0816905c4 100644 (file)
--- a/lib/dns/rdata.c
+++ b/lib/dns/rdata.c
@@ -15,7 +15,7 @@
  * SOFTWARE.
  */
 
-/* $Id: rdata.c,v 1.101.2.2 2000/09/05 22:14:12 explorer Exp $ */
+/* $Id: rdata.c,v 1.101.2.3 2000/09/19 02:02:23 bwelling Exp $ */
 
 #include <config.h>
 #include <ctype.h>
@@ -813,6 +813,12 @@ dns_rdataclass_fromtext(dns_rdataclass_t *classp, isc_textregion_t *source) {
                COMPARE("any", META, dns_rdataclass_any);
                break;
        case 'c':
+               /*
+                * RFC1035 says the mnemonic for the CHAOS class is CH,
+                * but historical BIND practice is to call it CHAOS.
+                * We will accept both forms, but only generate CH.
+                */
+               COMPARE("ch", 0, dns_rdataclass_chaos);
                COMPARE("chaos", 0, dns_rdataclass_chaos);
                break;
        case 'h':
@@ -842,7 +848,7 @@ dns_rdataclass_totext(dns_rdataclass_t rdclass, isc_buffer_t *target) {
        case dns_rdataclass_any:
                return (str_totext("ANY", target));
        case dns_rdataclass_chaos:
-               return (str_totext("CHAOS", target));
+               return (str_totext("CH", target));
        case dns_rdataclass_hs:
                return (str_totext("HS", target));
        case dns_rdataclass_in: