nsupdate: when set to 0, UDP timeout should be calculated by dns_request

The manual page of nsupdate's '-u udptimeout' option states that, quote:

> If zero, the interval is computed from the timeout interval and number
> of UDP retries.

However, nsupdate sets the UDP timeout value to UINT_MAX when it is 0,
thus, not behaving as documented.

Let dns_request_create() calculate the UDP timeout, if it was set to 0.

(cherry picked from commit 0ef11c0ccbea4db66f9edd6818a3a836f6c625f2)

diff --git a/bin/nsupdate/nsupdate.c b/bin/nsupdate/nsupdate.c
index 3dceff7b3e3fbff0388e30c6fbe8c279ea3e76c9..0d0f115e2646e90ad8ad603f5953a87d28955453 100644 (file)
--- a/bin/nsupdate/nsupdate.c
+++ b/bin/nsupdate/nsupdate.c
@@ -1177,9 +1177,6 @@ parse_args(int argc, char **argv) {
                                        isc_commandline_argument);
                                exit(1);
                        }
-                       if (udp_timeout == 0) {
-                               udp_timeout = UINT_MAX;
-                       }
                        break;
                case 'r':
                        result = isc_parse_uint32(&udp_retries,