clean up result codes that are never used

the following result codes are obsolete and have been removed
from result.h and result.c:

        - ISC_R_NOTHREADS
        - ISC_R_BOUND
        - ISC_R_NOTBOUND
        - ISC_R_NOTDIRECTORY
        - ISC_R_EMPTY
        - ISC_R_NOTBLOCKING
        - ISC_R_INPROGRESS
        - ISC_R_WOULDBLOCK

        - DNS_R_TOOMANYHOPS
        - DNS_R_NOREDATA
        - DNS_R_BADCKSUM
        - DNS_R_MOREDATA
        - DNS_R_NOVALIDDS
        - DNS_R_UNKNOWNOPT
        - DNS_R_NOVALIDKEY
        - DNS_R_NTACOVERED

        - DST_R_COMPUTESECRETFAILURE
        - DST_R_NORANDOMNESS
        - DST_R_NOCRYPTO

diff --git a/lib/dns/include/dns/message.h b/lib/dns/include/dns/message.h
index 283c9b947a2a36a6ada8a481e7746aad75a6c76c..aceab6cd743e95e011d2f605587981b3d15da6d8 100644 (file)
--- a/lib/dns/include/dns/message.h
+++ b/lib/dns/include/dns/message.h
@@ -698,8 +698,6 @@ dns_message_rendersection(dns_message_t *msg, dns_section_t section,
  *                                no more records for this section.
  *\li  #ISC_R_NOSPACE          -- Not enough room in the buffer to write
  *                                all records requested.
- *\li  #DNS_R_MOREDATA         -- All requested records written, and there
- *                                are records remaining for this section.
  */
 
 void

diff --git a/lib/dns/result.c b/lib/dns/result.c
index bdf0b079a5ab6d78ebc410f04d1949d786bccda2..34ac3b4e2fb37aa0e74d20f4f24fbbaf9980ddbc 100644 (file)
--- a/lib/dns/result.c
+++ b/lib/dns/result.c
@@ -31,7 +31,6 @@ dns_result_torcode(isc_result_t result) {
        case ISC_R_RANGE:
        case ISC_R_UNEXPECTEDEND:
        case DNS_R_BADAAAA:
-       case DNS_R_BADCKSUM:
        case DNS_R_BADCLASS:
        case DNS_R_BADLABELTYPE:
        case DNS_R_BADPOINTER:
@@ -39,10 +38,8 @@ dns_result_torcode(isc_result_t result) {
        case DNS_R_BADZONE:
        case DNS_R_EXTRADATA:
        case DNS_R_LABELTOOLONG:
-       case DNS_R_NOREDATA:
        case DNS_R_SYNTAX:
        case DNS_R_TEXTTOOLONG:
-       case DNS_R_TOOMANYHOPS:
        case DNS_R_TSIGERRORSET:
        case DNS_R_UNKNOWN:
        case DNS_R_NAMETOOLONG:

diff --git a/lib/isc/include/isc/result.h b/lib/isc/include/isc/result.h
index e93c002ad4817e30abe7cc8ca12b11d09c068025..734f74205007db2ac513f6eab43bdbbb219ae142 100644 (file)
--- a/lib/isc/include/isc/result.h
+++ b/lib/isc/include/isc/result.h
@@ -21,7 +21,6 @@ typedef enum isc_result {
        ISC_R_SUCCESS,                /*%< success */
        ISC_R_NOMEMORY,               /*%< out of memory */
        ISC_R_TIMEDOUT,               /*%< timed out */
-       ISC_R_NOTHREADS,              /*%< no available threads */
        ISC_R_ADDRNOTAVAIL,           /*%< address not available */
        ISC_R_ADDRINUSE,              /*%< address in use */
        ISC_R_NOPERM,                 /*%< permission denied */
@@ -33,14 +32,12 @@ typedef enum isc_result {
        ISC_R_CONNREFUSED,            /*%< connection refused */
        ISC_R_NORESOURCES,            /*%< not enough free resources */
        ISC_R_EOF,                    /*%< end of file */
-       ISC_R_BOUND,                  /*%< socket already bound */
        ISC_R_RELOAD,                 /*%< reload */
        ISC_R_SUSPEND = ISC_R_RELOAD, /*%< alias of 'reload' */
        ISC_R_LOCKBUSY,               /*%< lock busy */
        ISC_R_EXISTS,                 /*%< already exists */
        ISC_R_NOSPACE,                /*%< ran out of space */
        ISC_R_CANCELED,               /*%< operation canceled */
-       ISC_R_NOTBOUND,               /*%< socket is not bound */
        ISC_R_SHUTTINGDOWN,           /*%< shutting down */
        ISC_R_NOTFOUND,               /*%< not found */
        ISC_R_UNEXPECTEDEND,          /*%< unexpected end of input */
@@ -64,15 +61,11 @@ typedef enum isc_result {
        ISC_R_NOENTROPY,              /*%< out of entropy */
        ISC_R_MULTICAST,              /*%< invalid use of multicast */
        ISC_R_NOTFILE,                /*%< not a file */
-       ISC_R_NOTDIRECTORY,           /*%< not a directory */
-       ISC_R_EMPTY,                  /*%< queue is empty */
        ISC_R_FAMILYMISMATCH,         /*%< address family mismatch */
        ISC_R_FAMILYNOSUPPORT,        /*%< AF not supported */
        ISC_R_BADHEX,                 /*%< bad hex encoding */
        ISC_R_TOOMANYOPENFILES,       /*%< too many open files */
-       ISC_R_NOTBLOCKING,            /*%< not blocking */
        ISC_R_UNBALANCEDQUOTES,       /*%< unbalanced quotes */
-       ISC_R_INPROGRESS,             /*%< operation in progress */
        ISC_R_CONNECTIONRESET,        /*%< connection reset */
        ISC_R_SOFTQUOTA,              /*%< soft quota reached */
        ISC_R_BADNUMBER,              /*%< not a valid number */
@@ -82,7 +75,6 @@ typedef enum isc_result {
        ISC_R_BADBASE32,              /*%< bad base32 encoding */
        ISC_R_UNSET,                  /*%< unset */
        ISC_R_MULTIPLE,               /*%< multiple */
-       ISC_R_WOULDBLOCK,             /*%< would block */
        ISC_R_COMPLETE,               /*%< complete */
        ISC_R_CRYPTOFAILURE,          /*%< cryptography library failure */
        ISC_R_DISCQUOTA,              /*%< disc quota */
@@ -103,14 +95,12 @@ typedef enum isc_result {
        DNS_R_UNKNOWN,
        DNS_R_BADLABELTYPE,
        DNS_R_BADPOINTER,
-       DNS_R_TOOMANYHOPS,
        DNS_R_DISALLOWED,
        DNS_R_EXTRATOKEN,
        DNS_R_EXTRADATA,
        DNS_R_TEXTTOOLONG,
        DNS_R_NOTZONETOP,
        DNS_R_SYNTAX,
-       DNS_R_BADCKSUM,
        DNS_R_BADAAAA,
        DNS_R_NOOWNER,
        DNS_R_NOTTL,
@@ -120,7 +110,6 @@ typedef enum isc_result {
        DNS_R_NEWORIGIN,
        DNS_R_UNCHANGED,
        DNS_R_BADTTL,
-       DNS_R_NOREDATA,
        DNS_R_CONTINUE,
        DNS_R_DELEGATION,
        DNS_R_GLUE,
@@ -129,7 +118,6 @@ typedef enum isc_result {
        DNS_R_BADDB,
        DNS_R_ZONECUT,
        DNS_R_BADZONE,
-       DNS_R_MOREDATA,
        DNS_R_UPTODATE,
        DNS_R_TSIGVERIFYFAILURE,
        DNS_R_TSIGERRORSET,
@@ -157,7 +145,6 @@ typedef enum isc_result {
        DNS_R_NOTINSECURE,
        DNS_R_UNKNOWNSERVICE,
        DNS_R_RECOVERABLE,
-       DNS_R_UNKNOWNOPT,
        DNS_R_UNEXPECTEDID,
        DNS_R_SEENINCLUDE,
        DNS_R_NOTEXACT,
@@ -172,12 +159,10 @@ typedef enum isc_result {
        DNS_R_CLOCKSKEW,
        DNS_R_BADIXFR,
        DNS_R_NOTAUTHORITATIVE,
-       DNS_R_NOVALIDKEY,
        DNS_R_OBSOLETE,
        DNS_R_FROZEN,
        DNS_R_UNKNOWNFLAG,
        DNS_R_EXPECTEDRESPONSE,
-       DNS_R_NOVALIDDS,
        DNS_R_NSISADDRESS,
        DNS_R_REMOTEFORMERR,
        DNS_R_TRUNCATEDTCP,
@@ -202,7 +187,6 @@ typedef enum isc_result {
        DNS_R_EXPIRED,
        DNS_R_NOTDYNAMIC,
        DNS_R_BADEUI,
-       DNS_R_NTACOVERED,
        DNS_R_BADCDS,
        DNS_R_BADCDNSKEY,
        DNS_R_OPTERR,
@@ -230,7 +214,6 @@ typedef enum isc_result {
        DST_R_CRYPTOFAILURE,
        /* compat */
        DST_R_OPENSSLFAILURE = DST_R_CRYPTOFAILURE,
-       DST_R_NOCRYPTO,
        DST_R_NULLKEY,
        DST_R_INVALIDPUBLICKEY,
        DST_R_INVALIDPRIVATEKEY,
@@ -241,8 +224,6 @@ typedef enum isc_result {
        DST_R_NOTPUBLICKEY,
        DST_R_NOTPRIVATEKEY,
        DST_R_KEYCANNOTCOMPUTESECRET,
-       DST_R_COMPUTESECRETFAILURE,
-       DST_R_NORANDOMNESS,
        DST_R_BADKEYTYPE,
        DST_R_NOENGINE,
        DST_R_EXTERNALKEY,

diff --git a/lib/isc/result.c b/lib/isc/result.c
index 7ce2fb5f4fea86e8236c662ae39117352d5fd5c4..298689babc551993c550e122573dafd59829afe8 100644 (file)
--- a/lib/isc/result.c
+++ b/lib/isc/result.c
@@ -23,7 +23,6 @@ static const char *description[ISC_R_NRESULTS] = {
        [ISC_R_SUCCESS] = "success",
        [ISC_R_NOMEMORY] = "out of memory",
        [ISC_R_TIMEDOUT] = "timed out",
-       [ISC_R_NOTHREADS] = "no available threads",
        [ISC_R_ADDRNOTAVAIL] = "address not available",
        [ISC_R_ADDRINUSE] = "address in use",
        [ISC_R_NOPERM] = "permission denied",
@@ -35,13 +34,11 @@ static const char *description[ISC_R_NRESULTS] = {
        [ISC_R_CONNREFUSED] = "connection refused",
        [ISC_R_NORESOURCES] = "not enough free resources",
        [ISC_R_EOF] = "end of file",
-       [ISC_R_BOUND] = "socket already bound",
        [ISC_R_RELOAD] = "reload",
        [ISC_R_LOCKBUSY] = "lock busy",
        [ISC_R_EXISTS] = "already exists",
        [ISC_R_NOSPACE] = "ran out of space",
        [ISC_R_CANCELED] = "operation canceled",
-       [ISC_R_NOTBOUND] = "socket is not bound",
        [ISC_R_SHUTTINGDOWN] = "shutting down",
        [ISC_R_NOTFOUND] = "not found",
        [ISC_R_UNEXPECTEDEND] = "unexpected end of input",
@@ -65,15 +62,11 @@ static const char *description[ISC_R_NRESULTS] = {
        [ISC_R_NOENTROPY] = "out of entropy",
        [ISC_R_MULTICAST] = "invalid use of multicast address",
        [ISC_R_NOTFILE] = "not a file",
-       [ISC_R_NOTDIRECTORY] = "not a directory",
-       [ISC_R_EMPTY] = "queue is empty",
        [ISC_R_FAMILYMISMATCH] = "address family mismatch",
        [ISC_R_FAMILYNOSUPPORT] = "address family not supported",
        [ISC_R_BADHEX] = "bad hex encoding",
        [ISC_R_TOOMANYOPENFILES] = "too many open files",
-       [ISC_R_NOTBLOCKING] = "not blocking",
        [ISC_R_UNBALANCEDQUOTES] = "unbalanced quotes",
-       [ISC_R_INPROGRESS] = "operation in progress",
        [ISC_R_CONNECTIONRESET] = "connection reset",
        [ISC_R_SOFTQUOTA] = "soft quota reached",
        [ISC_R_BADNUMBER] = "not a valid number",
@@ -83,7 +76,6 @@ static const char *description[ISC_R_NRESULTS] = {
        [ISC_R_BADBASE32] = "bad base32 encoding",
        [ISC_R_UNSET] = "unset",
        [ISC_R_MULTIPLE] = "multiple",
-       [ISC_R_WOULDBLOCK] = "would block",
        [ISC_R_COMPLETE] = "complete",
        [ISC_R_CRYPTOFAILURE] = "crypto failure",
        [ISC_R_DISCQUOTA] = "disc quota",
@@ -104,14 +96,12 @@ static const char *description[ISC_R_NRESULTS] = {
        [DNS_R_UNKNOWN] = "unknown class/type",
        [DNS_R_BADLABELTYPE] = "bad label type",
        [DNS_R_BADPOINTER] = "bad compression pointer",
-       [DNS_R_TOOMANYHOPS] = "too many hops",
        [DNS_R_DISALLOWED] = "disallowed (by application policy)",
        [DNS_R_EXTRATOKEN] = "extra input text",
        [DNS_R_EXTRADATA] = "extra input data",
        [DNS_R_TEXTTOOLONG] = "text too long",
        [DNS_R_NOTZONETOP] = "not at top of zone",
        [DNS_R_SYNTAX] = "syntax error",
-       [DNS_R_BADCKSUM] = "bad checksum",
        [DNS_R_BADAAAA] = "bad IPv6 address",
        [DNS_R_NOOWNER] = "no owner",
        [DNS_R_NOTTL] = "no ttl",
@@ -121,7 +111,6 @@ static const char *description[ISC_R_NRESULTS] = {
        [DNS_R_NEWORIGIN] = "new origin",
        [DNS_R_UNCHANGED] = "unchanged",
        [DNS_R_BADTTL] = "bad ttl",
-       [DNS_R_NOREDATA] = "more data needed/to be rendered",
        [DNS_R_CONTINUE] = "continue",
        [DNS_R_DELEGATION] = "delegation",
        [DNS_R_GLUE] = "glue",
@@ -130,7 +119,6 @@ static const char *description[ISC_R_NRESULTS] = {
        [DNS_R_BADDB] = "bad database",
        [DNS_R_ZONECUT] = "zonecut",
        [DNS_R_BADZONE] = "bad zone",
-       [DNS_R_MOREDATA] = "more data",
        [DNS_R_UPTODATE] = "up to date",
        [DNS_R_TSIGVERIFYFAILURE] = "tsig verify failure",
        [DNS_R_TSIGERRORSET] = "tsig indicates error",
@@ -158,7 +146,6 @@ static const char *description[ISC_R_NRESULTS] = {
        [DNS_R_NOTINSECURE] = "insecurity proof failed",
        [DNS_R_UNKNOWNSERVICE] = "unknown service",
        [DNS_R_RECOVERABLE] = "recoverable error occurred",
-       [DNS_R_UNKNOWNOPT] = "unknown opt attribute record",
        [DNS_R_UNEXPECTEDID] = "unexpected message id",
        [DNS_R_SEENINCLUDE] = "seen include file",
        [DNS_R_NOTEXACT] = "not exact",
@@ -173,12 +160,10 @@ static const char *description[ISC_R_NRESULTS] = {
        [DNS_R_CLOCKSKEW] = "clocks are unsynchronized",
        [DNS_R_BADIXFR] = "IXFR failed",
        [DNS_R_NOTAUTHORITATIVE] = "not authoritative",
-       [DNS_R_NOVALIDKEY] = "no valid KEY",
        [DNS_R_OBSOLETE] = "obsolete",
        [DNS_R_FROZEN] = "already frozen",
        [DNS_R_UNKNOWNFLAG] = "unknown flag",
        [DNS_R_EXPECTEDRESPONSE] = "expected a response",
-       [DNS_R_NOVALIDDS] = "no valid DS",
        [DNS_R_NSISADDRESS] = "NS is an address",
        [DNS_R_REMOTEFORMERR] = "received FORMERR",
        [DNS_R_TRUNCATEDTCP] = "truncated TCP response",
@@ -203,7 +188,6 @@ static const char *description[ISC_R_NRESULTS] = {
        [DNS_R_EXPIRED] = "expired",
        [DNS_R_NOTDYNAMIC] = "not dynamic",
        [DNS_R_BADEUI] = "bad EUI",
-       [DNS_R_NTACOVERED] = "covered by negative trust anchor",
        [DNS_R_BADCDS] = "bad CDS",
        [DNS_R_BADCDNSKEY] = "bad CDNSKEY",
        [DNS_R_OPTERR] = "malformed OPT option",
@@ -229,7 +213,6 @@ static const char *description[ISC_R_NRESULTS] = {
 
        [DST_R_UNSUPPORTEDALG] = "algorithm is unsupported",
        [DST_R_CRYPTOFAILURE] = "crypto failure",
-       [DST_R_NOCRYPTO] = "built with no crypto support",
        [DST_R_NULLKEY] = "illegal operation for a null key",
        [DST_R_INVALIDPUBLICKEY] = "public key is invalid",
        [DST_R_INVALIDPRIVATEKEY] = "private key is invalid",
@@ -240,8 +223,6 @@ static const char *description[ISC_R_NRESULTS] = {
        [DST_R_NOTPUBLICKEY] = "not a public key",
        [DST_R_NOTPRIVATEKEY] = "not a private key",
        [DST_R_KEYCANNOTCOMPUTESECRET] = "not a key that can compute a secret",
-       [DST_R_COMPUTESECRETFAILURE] = "failure computing a shared secret",
-       [DST_R_NORANDOMNESS] = "no randomness available",
        [DST_R_BADKEYTYPE] = "bad key type",
        [DST_R_NOENGINE] = "OpenSSL Engine support has been removed; "
                           "use OpenSSL Providers for PKCS#11",
@@ -279,7 +260,6 @@ static const char *identifier[ISC_R_NRESULTS] = {
        [ISC_R_SUCCESS] = "ISC_R_SUCCESS",
        [ISC_R_NOMEMORY] = "ISC_R_NOMEMORY",
        [ISC_R_TIMEDOUT] = "ISC_R_TIMEDOUT",
-       [ISC_R_NOTHREADS] = "ISC_R_NOTHREADS",
        [ISC_R_ADDRNOTAVAIL] = "ISC_R_ADDRNOTAVAIL",
        [ISC_R_ADDRINUSE] = "ISC_R_ADDRINUSE",
        [ISC_R_NOPERM] = "ISC_R_NOPERM",
@@ -291,13 +271,11 @@ static const char *identifier[ISC_R_NRESULTS] = {
        [ISC_R_CONNREFUSED] = "ISC_R_CONNREFUSED",
        [ISC_R_NORESOURCES] = "ISC_R_NORESOURCES",
        [ISC_R_EOF] = "ISC_R_EOF",
-       [ISC_R_BOUND] = "ISC_R_BOUND",
        [ISC_R_RELOAD] = "ISC_R_RELOAD",
        [ISC_R_LOCKBUSY] = "ISC_R_LOCKBUSY",
        [ISC_R_EXISTS] = "ISC_R_EXISTS",
        [ISC_R_NOSPACE] = "ISC_R_NOSPACE",
        [ISC_R_CANCELED] = "ISC_R_CANCELED",
-       [ISC_R_NOTBOUND] = "ISC_R_NOTBOUND",
        [ISC_R_SHUTTINGDOWN] = "ISC_R_SHUTTINGDOWN",
        [ISC_R_NOTFOUND] = "ISC_R_NOTFOUND",
        [ISC_R_UNEXPECTEDEND] = "ISC_R_UNEXPECTEDEND",
@@ -321,15 +299,11 @@ static const char *identifier[ISC_R_NRESULTS] = {
        [ISC_R_NOENTROPY] = "ISC_R_NOENTROPY",
        [ISC_R_MULTICAST] = "ISC_R_MULTICAST",
        [ISC_R_NOTFILE] = "ISC_R_NOTFILE",
-       [ISC_R_NOTDIRECTORY] = "ISC_R_NOTDIRECTORY",
-       [ISC_R_EMPTY] = "ISC_R_EMPTY",
        [ISC_R_FAMILYMISMATCH] = "ISC_R_FAMILYMISMATCH",
        [ISC_R_FAMILYNOSUPPORT] = "ISC_R_FAMILYNOSUPPORT",
        [ISC_R_BADHEX] = "ISC_R_BADHEX",
        [ISC_R_TOOMANYOPENFILES] = "ISC_R_TOOMANYOPENFILES",
-       [ISC_R_NOTBLOCKING] = "ISC_R_NOTBLOCKING",
        [ISC_R_UNBALANCEDQUOTES] = "ISC_R_UNBALANCEDQUOTES",
-       [ISC_R_INPROGRESS] = "ISC_R_INPROGRESS",
        [ISC_R_CONNECTIONRESET] = "ISC_R_CONNECTIONRESET",
        [ISC_R_SOFTQUOTA] = "ISC_R_SOFTQUOTA",
        [ISC_R_BADNUMBER] = "ISC_R_BADNUMBER",
@@ -339,7 +313,6 @@ static const char *identifier[ISC_R_NRESULTS] = {
        [ISC_R_BADBASE32] = "ISC_R_BADBASE32",
        [ISC_R_UNSET] = "ISC_R_UNSET",
        [ISC_R_MULTIPLE] = "ISC_R_MULTIPLE",
-       [ISC_R_WOULDBLOCK] = "ISC_R_WOULDBLOCK",
        [ISC_R_COMPLETE] = "ISC_R_COMPLETE",
        [ISC_R_CRYPTOFAILURE] = "ISC_R_CRYPTOFAILURE",
        [ISC_R_DISCQUOTA] = "ISC_R_DISCQUOTA",
@@ -358,14 +331,12 @@ static const char *identifier[ISC_R_NRESULTS] = {
        [DNS_R_UNKNOWN] = "DNS_R_UNKNOWN",
        [DNS_R_BADLABELTYPE] = "DNS_R_BADLABELTYPE",
        [DNS_R_BADPOINTER] = "DNS_R_BADPOINTER",
-       [DNS_R_TOOMANYHOPS] = "DNS_R_TOOMANYHOPS",
        [DNS_R_DISALLOWED] = "DNS_R_DISALLOWED",
        [DNS_R_EXTRATOKEN] = "DNS_R_EXTRATOKEN",
        [DNS_R_EXTRADATA] = "DNS_R_EXTRADATA",
        [DNS_R_TEXTTOOLONG] = "DNS_R_TEXTTOOLONG",
        [DNS_R_NOTZONETOP] = "DNS_R_NOTZONETOP",
        [DNS_R_SYNTAX] = "DNS_R_SYNTAX",
-       [DNS_R_BADCKSUM] = "DNS_R_BADCKSUM",
        [DNS_R_BADAAAA] = "DNS_R_BADAAAA",
        [DNS_R_NOOWNER] = "DNS_R_NOOWNER",
        [DNS_R_NOTTL] = "DNS_R_NOTTL",
@@ -375,7 +346,6 @@ static const char *identifier[ISC_R_NRESULTS] = {
        [DNS_R_NEWORIGIN] = "DNS_R_NEWORIGIN",
        [DNS_R_UNCHANGED] = "DNS_R_UNCHANGED",
        [DNS_R_BADTTL] = "DNS_R_BADTTL",
-       [DNS_R_NOREDATA] = "DNS_R_NOREDATA",
        [DNS_R_CONTINUE] = "DNS_R_CONTINUE",
        [DNS_R_DELEGATION] = "DNS_R_DELEGATION",
        [DNS_R_GLUE] = "DNS_R_GLUE",
@@ -384,7 +354,6 @@ static const char *identifier[ISC_R_NRESULTS] = {
        [DNS_R_BADDB] = "DNS_R_BADDB",
        [DNS_R_ZONECUT] = "DNS_R_ZONECUT",
        [DNS_R_BADZONE] = "DNS_R_BADZONE",
-       [DNS_R_MOREDATA] = "DNS_R_MOREDATA",
        [DNS_R_UPTODATE] = "DNS_R_UPTODATE",
        [DNS_R_TSIGVERIFYFAILURE] = "DNS_R_TSIGVERIFYFAILURE",
        [DNS_R_TSIGERRORSET] = "DNS_R_TSIGERRORSET",
@@ -412,7 +381,6 @@ static const char *identifier[ISC_R_NRESULTS] = {
        [DNS_R_NOTINSECURE] = "DNS_R_NOTINSECURE",
        [DNS_R_UNKNOWNSERVICE] = "DNS_R_UNKNOWNSERVICE",
        [DNS_R_RECOVERABLE] = "DNS_R_RECOVERABLE",
-       [DNS_R_UNKNOWNOPT] = "DNS_R_UNKNOWNOPT",
        [DNS_R_UNEXPECTEDID] = "DNS_R_UNEXPECTEDID",
        [DNS_R_SEENINCLUDE] = "DNS_R_SEENINCLUDE",
        [DNS_R_NOTEXACT] = "DNS_R_NOTEXACT",
@@ -427,12 +395,10 @@ static const char *identifier[ISC_R_NRESULTS] = {
        [DNS_R_CLOCKSKEW] = "DNS_R_CLOCKSKEW",
        [DNS_R_BADIXFR] = "DNS_R_BADIXFR",
        [DNS_R_NOTAUTHORITATIVE] = "DNS_R_NOTAUTHORITATIVE",
-       [DNS_R_NOVALIDKEY] = "DNS_R_NOVALIDKEY",
        [DNS_R_OBSOLETE] = "DNS_R_OBSOLETE",
        [DNS_R_FROZEN] = "DNS_R_FROZEN",
        [DNS_R_UNKNOWNFLAG] = "DNS_R_UNKNOWNFLAG",
        [DNS_R_EXPECTEDRESPONSE] = "DNS_R_EXPECTEDRESPONSE",
-       [DNS_R_NOVALIDDS] = "DNS_R_NOVALIDDS",
        [DNS_R_NSISADDRESS] = "DNS_R_NSISADDRESS",
        [DNS_R_REMOTEFORMERR] = "DNS_R_REMOTEFORMERR",
        [DNS_R_TRUNCATEDTCP] = "DNS_R_TRUNCATEDTCP",
@@ -457,7 +423,6 @@ static const char *identifier[ISC_R_NRESULTS] = {
        [DNS_R_EXPIRED] = "DNS_R_EXPIRED",
        [DNS_R_NOTDYNAMIC] = "DNS_R_NOTDYNAMIC",
        [DNS_R_BADEUI] = "DNS_R_BADEUI",
-       [DNS_R_NTACOVERED] = "DNS_R_NTACOVERED",
        [DNS_R_BADCDS] = "DNS_R_BADCDS",
        [DNS_R_BADCDNSKEY] = "DNS_R_BADCDNSKEY",
        [DNS_R_OPTERR] = "DNS_R_OPTERR",
@@ -483,7 +448,6 @@ static const char *identifier[ISC_R_NRESULTS] = {
 
        [DST_R_UNSUPPORTEDALG] = "DST_R_UNSUPPORTEDALG",
        [DST_R_CRYPTOFAILURE] = "DST_R_CRYPTOFAILURE",
-       [DST_R_NOCRYPTO] = "DST_R_NOCRYPTO",
        [DST_R_NULLKEY] = "DST_R_NULLKEY",
        [DST_R_INVALIDPUBLICKEY] = "DST_R_INVALIDPUBLICKEY",
        [DST_R_INVALIDPRIVATEKEY] = "DST_R_INVALIDPRIVATEKEY",
@@ -494,8 +458,6 @@ static const char *identifier[ISC_R_NRESULTS] = {
        [DST_R_NOTPUBLICKEY] = "DST_R_NOTPUBLICKEY",
        [DST_R_NOTPRIVATEKEY] = "DST_R_NOTPRIVATEKEY",
        [DST_R_KEYCANNOTCOMPUTESECRET] = "DST_R_KEYCANNOTCOMPUTESECRET",
-       [DST_R_COMPUTESECRETFAILURE] = "DST_R_COMPUTESECRETFAILURE",
-       [DST_R_NORANDOMNESS] = "DST_R_NORANDOMNESS",
        [DST_R_BADKEYTYPE] = "DST_R_BADKEYTYPE",
        [DST_R_NOENGINE] = "DST_R_NOENGINE",
        [DST_R_EXTERNALKEY] = "DST_R_EXTERNALKEY",