]> git.ipfire.org Git - thirdparty/dhcpcd.git/commitdiff
Don't spam warning about CSR all the time.
authorRoy Marples <roy@marples.name>
Tue, 26 Mar 2013 11:40:44 +0000 (11:40 +0000)
committerRoy Marples <roy@marples.name>
Tue, 26 Mar 2013 11:40:44 +0000 (11:40 +0000)
dhcp.c

diff --git a/dhcp.c b/dhcp.c
index 3c183a9577cf5e71e32c71f9ee417815ce9ac953..59c8f4963403e60ffa5a06371abf8549cf476115 100644 (file)
--- a/dhcp.c
+++ b/dhcp.c
@@ -1720,6 +1720,7 @@ dhcp_rebind(void *arg)
        state->state = DHS_REBIND;
        eloop_timeout_delete(send_renew, ifp);
        state->lease.server.s_addr = 0;
+       ifp->options->options &= ~ DHCPCD_CSR_WARNED;
        send_rebind(ifp);
 }
 
@@ -1831,7 +1832,6 @@ dhcp_bind(void *arg)
                    "%s: renew in %u seconds, rebind in %u seconds",
                    iface->name, lease->renewaltime, lease->rebindtime);
        }
-       ifo->options &= ~ DHCPCD_CSR_WARNED;
        ipv4_applyaddr(iface);
        daemonise();
        state->state = DHS_BOUND;
@@ -2023,6 +2023,7 @@ dhcp_drop(struct interface *iface, const char *reason)
        free(state->old);
        state->old = NULL;
        state->lease.addr.s_addr = 0;
+       iface->options->options &= ~ DHCPCD_CSR_WARNED;
 }
 
 static void