Merge branch 'busybox' into merge

2 files changed, 6 insertions, 5 deletions

diff --git a/networking/ifupdown.c b/networking/ifupdown.c
index daabeec0c..606fc049f 100644
--- a/networking/ifupdown.c
+++ b/networking/ifupdown.c
@@ -1239,6 +1239,7 @@ int ifupdown_main(int argc UNUSED_PARAM, char **argv)
                 char *pch;
                 bool okay = 0;
                 int cmds_ret;
+                bool curr_failure = 0;
 
                 iface = xstrdup(target_list->data);
                 target_list = target_list->link;
@@ -1304,11 +1305,11 @@ int ifupdown_main(int argc UNUSED_PARAM, char **argv)
                                 /* Call the cmds function pointer, does either iface_up() or iface_down() */
                                 cmds_ret = cmds(currif);
                                 if (cmds_ret == -1) {
-                                        bb_error_msg("don't seem to have all the variables for %s/%s",
+                                        bb_error_msg("don't have all variables for %s/%s",
                                                         liface, currif->address_family->name);
-                                        any_failures = 1;
+                                        any_failures = curr_failure = 1;
                                 } else if (cmds_ret == 0) {
-                                        any_failures = 1;
+                                        any_failures = curr_failure = 1;
                                 }
 
                                 currif->iface = oldiface;
@@ -1329,7 +1330,7 @@ int ifupdown_main(int argc UNUSED_PARAM, char **argv)
                         llist_t *state_list = read_iface_state();
                         llist_t *iface_state = find_iface_state(state_list, iface);
 
-                        if (cmds == iface_up && !any_failures) {
+                        if (cmds == iface_up && !curr_failure) {
                                 char *newiface = xasprintf("%s=%s", iface, liface);
                                 if (!iface_state) {
                                         llist_add_to_end(&state_list, newiface);
diff --git a/networking/zcip.c b/networking/zcip.c
index a3307c5c9..962ba2e60 100644
--- a/networking/zcip.c
+++ b/networking/zcip.c
@@ -521,7 +521,7 @@ int zcip_main(int argc UNUSED_PARAM, char **argv)
                         target_ip_conflict = 0;
 
                         if (memcmp(&p.arp.arp_sha, &eth_addr, ETH_ALEN) != 0) {
-                                if (memcmp(p.arp.arp_spa, &ip.s_addr, sizeof(struct in_addr))) {
+                                if (memcmp(p.arp.arp_spa, &ip.s_addr, sizeof(struct in_addr)) == 0) {
                                         /* A probe or reply with source_ip == chosen ip */
                                         source_ip_conflict = 1;
                                 }