summaryrefslogtreecommitdiff
path: root/sbin/dhclient
diff options
context:
space:
mode:
authorKenneth R Westerback <krw@cvs.openbsd.org>2014-12-07 17:01:10 +0000
committerKenneth R Westerback <krw@cvs.openbsd.org>2014-12-07 17:01:10 +0000
commit2f742b67a67375ae95827b995a8b7ea9e9e6259b (patch)
treee0dd84dd570b36a8fe5e310858fce3c380b5ce11 /sbin/dhclient
parent571bb62a49e71517d028bd2a3e0fe326a5ca7413 (diff)
Ensure we grab the interface LLADDR as soon as the link state is
noted as being up. Thus avoiding a premature exit if extra RTM_IFINFO messages arrive before state_reboot() gets a chance to run.
Diffstat (limited to 'sbin/dhclient')
-rw-r--r--sbin/dhclient/dhclient.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/sbin/dhclient/dhclient.c b/sbin/dhclient/dhclient.c
index 459272cd79a..14a46a75b85 100644
--- a/sbin/dhclient/dhclient.c
+++ b/sbin/dhclient/dhclient.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dhclient.c,v 1.340 2014/12/07 15:28:23 krw Exp $ */
+/* $OpenBSD: dhclient.c,v 1.341 2014/12/07 17:01:09 krw Exp $ */
/*
* Copyright 2004 Henning Brauer <henning@openbsd.org>
@@ -350,8 +350,10 @@ routehandler(void)
#endif
ifi->linkstat = linkstat;
if (ifi->linkstat) {
- if (client->state == S_PREBOOT)
+ if (client->state == S_PREBOOT) {
state_preboot();
+ get_hw_address();
+ }
client->state = S_REBOOTING;
set_timeout_interval(1, state_reboot);
} else if (strlen(path_option_db)) {