diff options
author | Thomas Markwalder <tmark@isc.org> | 2017-11-27 13:30:27 -0500 |
---|---|---|
committer | Thomas Markwalder <tmark@isc.org> | 2017-11-27 13:30:27 -0500 |
commit | 83f1dd956ce7cc9ff3f136610824d358a54e7840 (patch) | |
tree | cac27fcf9da0d2f1ad4d8d0b7b36cf34062aeb93 | |
parent | 3e88222f1c2f7a365b9fde018bb4bf86520b51d6 (diff) | |
download | isc-dhcp-83f1dd956ce7cc9ff3f136610824d358a54e7840.tar.gz |
[master] Corrected dhclient command line parsing of --dad-wait-time
Merges in rt46535
-rw-r--r-- | RELNOTES | 4 | ||||
-rw-r--r-- | client/dhclient.c | 5 |
2 files changed, 8 insertions, 1 deletions
@@ -198,6 +198,10 @@ dhcp-users@lists.isc.org. --decline-wait-time <seconds>. A value of zero equates to no wait at all. [ISC-Bugs #45457] +- Corrected dhclient command line parsing for --dad-wait-time that causes + even valid values to fail as invalid on some environments. + [ISC-Bugs #46535] + Changes since 4.3.0 (bug fixes) - Tidy up several small tickets. diff --git a/client/dhclient.c b/client/dhclient.c index 45fbec7a..d3e88d07 100644 --- a/client/dhclient.c +++ b/client/dhclient.c @@ -495,9 +495,12 @@ main(int argc, char **argv) { if (++i == argc) { usage(use_noarg, argv[i-1]); } + + errno = 0; dad_wait_time = (int)strtol(argv[i], &s, 10); if (errno || (*s != '\0') || (dad_wait_time < 0)) { - usage("Invalid value for --dad-wait-time: %s", argv[i]); + usage("Invalid value for --dad-wait-time: %s", + argv[i]); } } else if (!strcmp(argv[i], "--prefix-len-hint")) { if (++i == argc) { |