diff options
| author | Lennart Poettering <lennart@poettering.net> | 2009-03-05 11:04:40 +0100 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2009-03-05 11:04:40 +0100 |
| commit | f37ae8b0f302a089baae50b18195b03c2f789ea4 (patch) | |
| tree | d760b055988f14a5d579162e6f105fa983eeb688 /avahi-autoipd/main.c | |
| parent | c90c318dbbfa73a00951cdf96c51d13d7b23c44a (diff) | |
| parent | c3c0f3d47e49ab6814d4de3ee41a0c5caf0265b9 (diff) | |
Merge branch 'master' of ssh://rootserver/home/lennart/git/public/avahi
Diffstat (limited to 'avahi-autoipd/main.c')
| -rw-r--r-- | avahi-autoipd/main.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/avahi-autoipd/main.c b/avahi-autoipd/main.c index ef529b9..eb71c3b 100644 --- a/avahi-autoipd/main.c +++ b/avahi-autoipd/main.c @@ -1281,7 +1281,7 @@ static int loop(int iface, uint32_t addr) { DEBUG(daemon_log(LOG_DEBUG, "Ignoring irrelevant ARP packet.")); } - } else if (event == EVENT_ROUTABLE_ADDR_CONFIGURED) { + } else if (event == EVENT_ROUTABLE_ADDR_CONFIGURED && !force_bind) { daemon_log(LOG_INFO, "A routable address has been configured."); @@ -1306,7 +1306,7 @@ static int loop(int iface, uint32_t addr) { elapse_time(&next_wakeup, 0, PROBE_WAIT*1000); next_wakeup_valid = 1; - } else if (event == EVENT_REFRESH_REQUEST && state == STATE_RUNNING && !force_bind) { + } else if (event == EVENT_REFRESH_REQUEST && state == STATE_RUNNING) { /* The user requested a reannouncing of the address by a SIGHUP */ daemon_log(LOG_INFO, "Reannouncing address."); |