diff options
| author | Thomas Markwalder <tmark@isc.org> | 2017-11-27 13:35:26 -0500 |
|---|---|---|
| committer | Thomas Markwalder <tmark@isc.org> | 2017-11-27 13:35:26 -0500 |
| commit | 955c016b93f9533ccd28a16185e8035df75106ef (patch) | |
| tree | 4035d80ae4263c12b374ae93e61859b8626aa2a5 | |
| parent | 5ce577413749008a50d0ede574e11b4706887328 (diff) | |
| download | isc-dhcp-955c016b93f9533ccd28a16185e8035df75106ef.tar.gz | |
[v4_3] Corrected dhclient command line parsing of --dad-wait-time
Merges in rt46535
| -rw-r--r-- | RELNOTES | 4 | ||||
| -rw-r--r-- | client/dhclient.c | 4 |
2 files changed, 7 insertions, 1 deletions
@@ -73,6 +73,10 @@ dhcp-users@lists.isc.org. with implicit function declaration errors for POST() and INSIST(). [ISC-bugs #46332] +- 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.6b1 - None diff --git a/client/dhclient.c b/client/dhclient.c index c5b6282a..6928c746 100644 --- a/client/dhclient.c +++ b/client/dhclient.c @@ -409,9 +409,11 @@ 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]); } #endif /* DHCPv6 */ |