diff options
| author |   krw <krw@openbsd.org> | 2018-12-27 16:15:10 +0000 |
|---|---|---|
| committer | krw <krw@openbsd.org> | 2018-12-27 16:15:10 +0000 |
| commit | 72cb5f7a0bfdcf4e27598de7f1936702caf11bdb (patch) | |
| tree | cd1b525bb3c7c1d063f238ed1e8b6b48a57f8cb9 | |
| parent | extract subaddress from last resolved node, not from dest or rcpt address (diff) | |
| download | wireguard-openbsd-72cb5f7a0bfdcf4e27598de7f1936702caf11bdb.tar.xz wireguard-openbsd-72cb5f7a0bfdcf4e27598de7f1936702caf11bdb.zip | |
No need to return early when setting the tick stop.
| -rw-r--r-- | sbin/dhclient/dhclient.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/sbin/dhclient/dhclient.c b/sbin/dhclient/dhclient.c index 0b39cf98a59..b45d31cf885 100644 --- a/sbin/dhclient/dhclient.c +++ b/sbin/dhclient/dhclient.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dhclient.c,v 1.593 2018/12/25 17:05:56 krw Exp $ */ +/* $OpenBSD: dhclient.c,v 1.594 2018/12/27 16:15:10 krw Exp $ */ /* * Copyright 2004 Henning Brauer <henning@openbsd.org> @@ -2770,10 +2770,8 @@ tick_msg(const char *preamble, int success, time_t start) return; } - if (stop == 0) { + if (stop == 0) stop = cur_time + config->link_timeout; - return; - } if (isatty(STDERR_FILENO) == 0 || sleeping == 1 || cur_time < start + GRACE_SECONDS) |