Merge remote-tracking branch 'origin/bug936080'
Noah Meyerhans
4 years ago
|
0 |
iputils (3:20190709-2) UNRELEASED; urgency=medium
|
|
1 |
|
|
2 |
* Incorporate upstream fix for arping exit code regression
|
|
3 |
(Closes: #936080)
|
|
4 |
|
|
5 |
-- Noah Meyerhans <noahm@debian.org> Thu, 03 Oct 2019 14:08:39 -0700
|
|
6 |
|
| 0 | 7 |
iputils (3:20190709-1) unstable; urgency=medium
|
| 1 | 8 |
|
| 2 | 9 |
* New upstream release
|
|
0 |
From: Sami Kerola <kerolasa@iki.fi>
|
|
1 |
Date: Wed, 31 Jul 2019 21:28:12 +0100
|
|
2 |
Subject: [PATCH] arping: revert partially - fix sent vs received packages
|
|
3 |
return value
|
|
4 |
Origin: https://github.com/iputils/iputils/commit/18f14be80466ddc8fb17a400be82764a779c8dcd
|
|
5 |
|
|
6 |
Commit 84ca65ca980315c73f929fed8b6f16bbd698c3a0 caused regression. The
|
|
7 |
arping -D needs return value evaluation that was the earlier default, in
|
|
8 |
other cases the new return value should be correct.
|
|
9 |
|
|
10 |
Addresses: https://github.com/iputils/iputils/issues/209
|
|
11 |
See-also: https://github.com/void-linux/void-packages/issues/13304
|
|
12 |
Signed-off-by: Sami Kerola <kerolasa@iki.fi>
|
|
13 |
---
|
|
14 |
arping.c | 6 +++++-
|
|
15 |
1 file changed, 5 insertions(+), 1 deletion(-)
|
|
16 |
|
|
17 |
diff --git a/arping.c b/arping.c
|
|
18 |
index 77c9c56..2c87c15 100644
|
|
19 |
--- a/arping.c
|
|
20 |
+++ b/arping.c
|
|
21 |
@@ -792,7 +792,11 @@ static int event_loop(struct run_state *ctl)
|
|
22 |
close(tfd);
|
|
23 |
freeifaddrs(ctl->ifa0);
|
|
24 |
rc |= finish(ctl);
|
|
25 |
- rc |= (ctl->sent != ctl->received);
|
|
26 |
+ if (ctl->dad && ctl->quit_on_reply)
|
|
27 |
+ /* Duplicate address detection mode return value */
|
|
28 |
+ rc |= !(ctl->brd_sent != ctl->received);
|
|
29 |
+ else
|
|
30 |
+ rc |= (ctl->sent != ctl->received);
|
|
31 |
return rc;
|
|
32 |
}
|
|
33 |
|
|
34 |
--
|
|
35 |
2.17.1
|
|
36 |
|
|
0 |
arping-revert-partially-fix-sent-vs-received-package.patch
|