diff -up dhcp-4.0.0//client/dhclient.c.backoff dhcp-4.0.0//client/dhclient.c --- dhcp-4.0.0//client/dhclient.c.backoff 2008-08-01 10:09:17.000000000 -1000 +++ dhcp-4.0.0//client/dhclient.c 2008-08-01 10:10:10.000000000 -1000 @@ -1003,6 +1003,7 @@ void state_init (cpp) void *cpp; { struct client_state *client = cpp; + enum dhcp_state init_state = client->state; ASSERT_STATE(state, S_INIT); @@ -1015,9 +1016,16 @@ void state_init (cpp) client -> first_sending = cur_time; client -> interval = client -> config -> initial_interval; - /* Add an immediate timeout to cause the first DHCPDISCOVER packet - to go out. */ - send_discover (client); + if (init_state != S_DECLINED) { + /* Add an immediate timeout to cause the first DHCPDISCOVER packet + to go out. */ + send_discover(client); + } else { + /* We've received an OFFER and it has been DECLINEd by dhclient-script. + * wait for a random time between 1 and backoff_cutoff seconds before + * trying again. */ + add_timeout(cur_time + ((1 + (random() >> 2)) % client->config->backoff_cutoff), send_discover, client, 0, 0); + } } /* state_selecting is called when one or more DHCPOFFER packets have been @@ -1284,6 +1292,7 @@ void bind_lease (client) send_decline (client); destroy_client_lease (client -> new); client -> new = (struct client_lease *)0; + client -> state = S_DECLINED; state_init (client); return; } @@ -3439,6 +3448,7 @@ void client_location_changed () case S_INIT: case S_REBINDING: case S_STOPPED: + case S_DECLINED: break; } client -> state = S_INIT; diff -up dhcp-4.0.0//includes/dhcpd.h.backoff dhcp-4.0.0//includes/dhcpd.h --- dhcp-4.0.0//includes/dhcpd.h.backoff 2008-08-01 10:09:01.000000000 -1000 +++ dhcp-4.0.0//includes/dhcpd.h 2008-08-01 10:10:10.000000000 -1000 @@ -992,7 +992,8 @@ enum dhcp_state { S_BOUND = 5, S_RENEWING = 6, S_REBINDING = 7, - S_STOPPED = 8 + S_STOPPED = 8, + S_DECLINED = 9 }; /* Authentication and BOOTP policy possibilities (not all values work