]> git.ipfire.org Git - thirdparty/dhcpcd.git/commitdiff
Dodge more errors when deleting not available anymore.
authorRoy Marples <roy@marples.name>
Mon, 5 Sep 2016 20:11:44 +0000 (20:11 +0000)
committerRoy Marples <roy@marples.name>
Mon, 5 Sep 2016 20:11:44 +0000 (20:11 +0000)
ipv4.c
ipv6.c

diff --git a/ipv4.c b/ipv4.c
index 84504d40e1a73c9ffc1d03f6acc479f7c21bf637..80c9eb5b06811a49a29a4deea22be829cfd4dd8d 100644 (file)
--- a/ipv4.c
+++ b/ipv4.c
@@ -882,8 +882,9 @@ ipv4_deladdr(struct ipv4_addr *addr, int keeparp)
            "%s: deleting IP address %s", addr->iface->name, addr->saddr);
 
        r = if_address(RTM_DELADDR, addr);
-       if (r == -1 && errno != EADDRNOTAVAIL && errno != ENXIO &&
-           errno != ENODEV)
+       if (r == -1 &&
+           errno != EADDRNOTAVAIL && errno != ESRCH &&
+           errno != ENXIO && errno != ENODEV)
                logger(addr->iface->ctx, LOG_ERR, "%s: %s: %m",
                    addr->iface->name, __func__);
 
diff --git a/ipv6.c b/ipv6.c
index 0df156ca9fff6813e9cd1494dc4d6b08b2f173c4..a43301d1a8568be75b7e027787fbea28f4d507ff 100644 (file)
--- a/ipv6.c
+++ b/ipv6.c
@@ -601,8 +601,9 @@ ipv6_deleteaddr(struct ipv6_addr *ia)
        logger(ia->iface->ctx, LOG_INFO, "%s: deleting address %s",
            ia->iface->name, ia->saddr);
        if (if_address6(RTM_DELADDR, ia) == -1 &&
-           errno != EADDRNOTAVAIL && errno != ENXIO && errno != ENODEV)
-               logger(ia->iface->ctx, LOG_ERR, "if_address6: :%m");
+           errno != EADDRNOTAVAIL && errno != ESRCH &&
+           errno != ENXIO && errno != ENODEV)
+               logger(ia->iface->ctx, LOG_ERR, "if_address6: %m");
 
        /* NOREJECT is set if we delegated exactly the prefix to another
         * address.