mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-09-01 06:55:30 +00:00
Code Issues Releases Wiki Activity

Merge branch '3235-dig-exitcode' into 'main'

Browse Source 
ensure dig sets exitcode after local UDP connection failure

Closes #3235

See merge request isc-projects/bind9!6107
This commit is contained in:
Evan Hunt
2022-04-15 18:08:10 +00:00
parent 9fb812763a d646aca282
commit 76bb33fbd5
2 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGES
View File

@@ -1,3 +1,6 @@
5862. [bug] dig returned a 0 exit status on UDP connection failure.
[GL #3235]
5861. [func] Implement support for catalog zones change of ownership 5861. [func] Implement support for catalog zones change of ownership
(coo) mechanism described in the DNS catalog zones draft (coo) mechanism described in the DNS catalog zones draft
version 5 document. [GL #3223] version 5 document. [GL #3223]

6
bin/dig/dighost.c
View File

@@ -3120,6 +3120,10 @@ udp_ready(isc_nmhandle_t *handle, isc_result_t eresult, void *arg) {
dig_lookup_t *l = query->lookup; dig_lookup_t *l = query->lookup;
debug("udp setup failed: %s", isc_result_totext(eresult)); debug("udp setup failed: %s", isc_result_totext(eresult));
if (exitcode < 9) {
exitcode = 9;
}
query_detach(&query); query_detach(&query);
cancel_lookup(l); cancel_lookup(l);
lookup_detach(&l); lookup_detach(&l);
@@ -3980,6 +3984,8 @@ recv_done(isc_nmhandle_t *handle, isc_result_t eresult, isc_region_t *region,
if (eresult == ISC_R_EOF) { if (eresult == ISC_R_EOF) {
requeue_or_update_exitcode(l); requeue_or_update_exitcode(l);
} else if (exitcode < 9) {
exitcode = 9;
} }
goto cancel_lookup; goto cancel_lookup;