Fail the interface when we need a clientid.

diff --git a/dhcpcd-run-hooks.8.in b/dhcpcd-run-hooks.8.in
index ef95590f5a761e7c5f2a4fa6e1dd687b28fc90a9..7c5990acbb72465f9412ca982483db6e39ebd48f 100644 (file)
--- a/dhcpcd-run-hooks.8.in
+++ b/dhcpcd-run-hooks.8.in
@@ -107,7 +107,7 @@ The cable may have been unplugged or association to the wireless point lost.
 dhcpcd failed to operate on the interface.
 This normally happens when dhcpcd does not support the raw interface, which
 means it cannot work as a DHCP or ZeroConf client.
-Static configuration is still allowed.
+Static configuration and DHCP INFORM is still allowed.
 .It Dv STOP
 dhcpcd stopped running on the interface.
 .It Dv TEST

diff --git a/dhcpcd.c b/dhcpcd.c
index 1fe5cdbf9f64abfcbd68288c31d97cee6ab9327c..0fba54ca7b3cc5d508fe9ba2fc22a09c80dc341a 100644 (file)
--- a/dhcpcd.c
+++ b/dhcpcd.c
@@ -979,7 +979,10 @@ start_interface(void *arg)
        }
        if (iface->hwlen == 0 && ifo->clientid[0] == '\0') {
                syslog(LOG_WARNING, "%s: needs a clientid to configure",
-                       iface->name);
+                   iface->name);
+               drop_config(iface, "FAIL");
+               close_sockets(iface);
+               delete_timeout(NULL, iface);
                return;
        }
        if (ifo->req_addr.s_addr) {