From: Brian Wellington Date: Tue, 19 Sep 2000 02:02:25 +0000 (+0000) Subject: pullup: X-Git-Tag: v9.0.0^2~24 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=517a4a80f4cc79fffa348aaafb6e841988ebbf4a;p=thirdparty%2Fbind9.git 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 56e4d2c6613..4ee3a1d0034 100644 --- 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 baab5397814..417a1caae63 100644 --- 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 #include @@ -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: