diff options
| author | Ron Yorston <rmy@pobox.com> | 2017-08-22 14:56:12 +0100 |
|---|---|---|
| committer | Ron Yorston <rmy@pobox.com> | 2017-08-22 14:56:12 +0100 |
| commit | ce9af1cc5ea23f754587448cf35b5120c77bfeef (patch) | |
| tree | 69e5eaba5e75ab909ed92d5045393471b8ff3c13 /networking/arping.c | |
| parent | c170026700eabb10147dd848c45c06995b43a32e (diff) | |
| parent | e837a0dbbebf4229306df98fe9ee3b9bb30630c4 (diff) | |
| download | busybox-w32-ce9af1cc5ea23f754587448cf35b5120c77bfeef.tar.gz busybox-w32-ce9af1cc5ea23f754587448cf35b5120c77bfeef.tar.bz2 busybox-w32-ce9af1cc5ea23f754587448cf35b5120c77bfeef.zip | |
Merge branch 'busybox' into merge
Diffstat (limited to 'networking/arping.c')
| -rw-r--r-- | networking/arping.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/networking/arping.c b/networking/arping.c index 71672957e..f9967d81e 100644 --- a/networking/arping.c +++ b/networking/arping.c | |||
| @@ -295,8 +295,8 @@ int arping_main(int argc UNUSED_PARAM, char **argv) | |||
| 295 | 295 | ||
| 296 | sock_fd = xsocket(AF_PACKET, SOCK_DGRAM, 0); | 296 | sock_fd = xsocket(AF_PACKET, SOCK_DGRAM, 0); |
| 297 | 297 | ||
| 298 | // Drop suid root privileges | 298 | // If you ever change BB_SUID_DROP to BB_SUID_REQUIRE, |
| 299 | // Need to remove SUID_NEVER from applets.h for this to work | 299 | // drop suid root privileges here: |
| 300 | //xsetuid(getuid()); | 300 | //xsetuid(getuid()); |
| 301 | 301 | ||
| 302 | { | 302 | { |
| @@ -306,9 +306,9 @@ int arping_main(int argc UNUSED_PARAM, char **argv) | |||
| 306 | /* Dad also sets quit_on_reply. | 306 | /* Dad also sets quit_on_reply. |
| 307 | * Advert also sets unsolicited. | 307 | * Advert also sets unsolicited. |
| 308 | */ | 308 | */ |
| 309 | opt_complementary = "=1:Df:AU"; | 309 | opt = getopt32(argv, "^" "DUAqfbc:+w:I:s:" "\0" "=1:Df:AU", |
| 310 | opt = getopt32(argv, "DUAqfbc:+w:I:s:", | 310 | &count, &str_timeout, &device, &source |
| 311 | &count, &str_timeout, &device, &source); | 311 | ); |
| 312 | if (opt & 0x80) /* -w: timeout */ | 312 | if (opt & 0x80) /* -w: timeout */ |
| 313 | timeout_us = xatou_range(str_timeout, 0, INT_MAX/2000000) * 1000000 + 500000; | 313 | timeout_us = xatou_range(str_timeout, 0, INT_MAX/2000000) * 1000000 + 500000; |
| 314 | //if (opt & 0x200) /* -s: source */ | 314 | //if (opt & 0x200) /* -s: source */ |