Commit 0c42a9c0 authored by Mark Andrews's avatar Mark Andrews
Browse files

explictly convert ISC_R_NOSPACE from dns_message_parse to DNS_R_FORMERR and...

explictly convert ISC_R_NOSPACE from dns_message_parse to DNS_R_FORMERR and remove from dns_result_torcode
parent c6ac1b09
...@@ -407,7 +407,6 @@ dns_result_torcode(isc_result_t result) { ...@@ -407,7 +407,6 @@ dns_result_torcode(isc_result_t result) {
rcode = dns_rcode_noerror; rcode = dns_rcode_noerror;
break; break;
case ISC_R_BADBASE64: case ISC_R_BADBASE64:
case ISC_R_NOSPACE:
case ISC_R_RANGE: case ISC_R_RANGE:
case ISC_R_UNEXPECTEDEND: case ISC_R_UNEXPECTEDEND:
case DNS_R_BADAAAA: case DNS_R_BADAAAA:
......
...@@ -2445,14 +2445,18 @@ ns__client_request(isc_task_t *task, isc_event_t *event) { ...@@ -2445,14 +2445,18 @@ ns__client_request(isc_task_t *task, isc_event_t *event) {
* Parsing the request failed. Send a response * Parsing the request failed. Send a response
* (typically FORMERR or SERVFAIL). * (typically FORMERR or SERVFAIL).
*/ */
if (result == DNS_R_OPTERR) if (result == DNS_R_OPTERR) {
(void)ns_client_addopt(client, client->message, (void)ns_client_addopt(client, client->message,
&client->opt); &client->opt);
}
ns_client_log(client, NS_LOGCATEGORY_CLIENT, ns_client_log(client, NS_LOGCATEGORY_CLIENT,
NS_LOGMODULE_CLIENT, ISC_LOG_DEBUG(1), NS_LOGMODULE_CLIENT, ISC_LOG_DEBUG(1),
"message parsing failed: %s", "message parsing failed: %s",
isc_result_totext(result)); isc_result_totext(result));
if (result == ISC_R_NOSPACE) {
result = DNS_R_FORMERR;
}
ns_client_error(client, result); ns_client_error(client, result);
return; return;
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment