diff options
Diffstat (limited to 'sbin')
| -rw-r--r-- | sbin/dhclient/clparse.c | 4 | ||||
| -rw-r--r-- | sbin/dhclient/dhclient.c | 9 |
2 files changed, 6 insertions, 7 deletions
diff --git a/sbin/dhclient/clparse.c b/sbin/dhclient/clparse.c index 9afae9890bb..b561a5af215 100644 --- a/sbin/dhclient/clparse.c +++ b/sbin/dhclient/clparse.c @@ -1,4 +1,4 @@ -/* $OpenBSD: clparse.c,v 1.88 2014/10/27 13:36:21 krw Exp $ */ +/* $OpenBSD: clparse.c,v 1.89 2014/11/02 15:18:32 krw Exp $ */ /* Parser for dhclient config and lease files. */ @@ -663,7 +663,7 @@ alloc: memcpy(&hunkbuf[hunkix], dp, len); hunkix += len; break; - case 'l': /* Signed 32-bit integer. */ + case 'l': /* Signed 32-bit integer. */ if (!parse_decimal(cfile, buf, *fmt)) { parse_warn("expecting signed 32-bit " "integer."); diff --git a/sbin/dhclient/dhclient.c b/sbin/dhclient/dhclient.c index 8d4ec4c24db..01bc48b63ca 100644 --- a/sbin/dhclient/dhclient.c +++ b/sbin/dhclient/dhclient.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dhclient.c,v 1.325 2014/11/01 15:49:07 krw Exp $ */ +/* $OpenBSD: dhclient.c,v 1.326 2014/11/02 15:18:32 krw Exp $ */ /* * Copyright 2004 Henning Brauer <henning@openbsd.org> @@ -1026,9 +1026,8 @@ dhcpoffer(struct in_addr client_addr, struct option_data *options, char *info) if (stop_selecting <= time(NULL)) state_selecting(); - else { + else set_timeout(stop_selecting, state_selecting); - } } /* @@ -1337,7 +1336,7 @@ send_request(void) client->interval = client->active->expiry - cur_time + 1; /* - * If the reboot timeout has expired, or the lease rebind time has + * If the reboot timeout has expired, or the lease rebind time has * elapsed, or if we're not yet bound, broadcast the DHCPREQUEST rather * than unicasting. */ @@ -2386,7 +2385,7 @@ add_direct_route(int rdomain, struct in_addr dest, struct in_addr mask, struct i * * or * - * route -q $rdomain add default $router + * route -q $rdomain add default $router */ void add_default_route(int rdomain, struct in_addr addr, struct in_addr gateway) |