diff --git a/dhcp-4.1.1-dhclient-decline-backoff.patch b/dhcp-4.1.1-dhclient-decline-backoff.patch index c50ab26..3b8789f 100644 --- a/dhcp-4.1.1-dhclient-decline-backoff.patch +++ b/dhcp-4.1.1-dhclient-decline-backoff.patch @@ -1,15 +1,16 @@ diff -up dhcp-4.1.1/client/dhclient.c.backoff dhcp-4.1.1/client/dhclient.c ---- dhcp-4.1.1/client/dhclient.c.backoff 2010-01-20 17:14:37.000000000 +0100 -+++ dhcp-4.1.1/client/dhclient.c 2010-01-20 17:14:37.000000000 +0100 -@@ -1187,6 +1187,7 @@ void state_init (cpp) +--- dhcp-4.1.1/client/dhclient.c.backoff 2010-02-08 16:41:52.000000000 +0100 ++++ dhcp-4.1.1/client/dhclient.c 2010-02-08 16:43:56.000000000 +0100 +@@ -1187,6 +1187,8 @@ void state_init (cpp) void *cpp; { struct client_state *client = cpp; + enum dhcp_state init_state = client->state; ++ struct timeval tv; ASSERT_STATE(state, S_INIT); -@@ -1199,9 +1200,16 @@ void state_init (cpp) +@@ -1199,9 +1201,18 @@ void state_init (cpp) client -> first_sending = cur_time; client -> interval = client -> config -> initial_interval; @@ -24,12 +25,14 @@ diff -up dhcp-4.1.1/client/dhclient.c.backoff dhcp-4.1.1/client/dhclient.c + /* 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); ++ tv . tv_sec = cur_time + ((1 + (random() >> 2)) % client->config->backoff_cutoff); ++ tv . tv_usec = 0; ++ add_timeout(&tv, send_discover, client, 0, 0); + } } /* -@@ -1480,6 +1488,7 @@ void bind_lease (client) +@@ -1480,6 +1491,7 @@ void bind_lease (client) send_decline (client); destroy_client_lease (client -> new); client -> new = (struct client_lease *)0; @@ -37,7 +40,7 @@ diff -up dhcp-4.1.1/client/dhclient.c.backoff dhcp-4.1.1/client/dhclient.c state_init (client); return; } -@@ -3689,6 +3698,7 @@ void client_location_changed () +@@ -3689,6 +3701,7 @@ void client_location_changed () case S_INIT: case S_REBINDING: case S_STOPPED: @@ -46,8 +49,8 @@ diff -up dhcp-4.1.1/client/dhclient.c.backoff dhcp-4.1.1/client/dhclient.c } client -> state = S_INIT; diff -up dhcp-4.1.1/includes/dhcpd.h.backoff dhcp-4.1.1/includes/dhcpd.h ---- dhcp-4.1.1/includes/dhcpd.h.backoff 2010-01-20 17:14:37.000000000 +0100 -+++ dhcp-4.1.1/includes/dhcpd.h 2010-01-20 17:14:37.000000000 +0100 +--- dhcp-4.1.1/includes/dhcpd.h.backoff 2010-02-08 16:41:52.000000000 +0100 ++++ dhcp-4.1.1/includes/dhcpd.h 2010-02-08 16:41:52.000000000 +0100 @@ -1017,7 +1017,8 @@ enum dhcp_state { S_BOUND = 5, S_RENEWING = 6, diff --git a/dhcp.spec b/dhcp.spec index fc1b529..921d0f4 100644 --- a/dhcp.spec +++ b/dhcp.spec @@ -13,7 +13,7 @@ Summary: Dynamic host configuration protocol software Name: dhcp Version: %{basever} -Release: 4%{?dist} +Release: 5%{?dist} # NEVER CHANGE THE EPOCH on this package. The previous maintainer (prior to # dcantrell maintaining the package) made incorrect use of the epoch and # that's why it is at 12 now. It should have never been used, but it was. @@ -500,6 +500,9 @@ fi %attr(0644,root,root) %{_mandir}/man3/omapi.3.gz %changelog +* Mon Feb 08 2010 Jiri Popelka - 12:4.1.1-5 +- Fix dhclient-decline-backoff.patch (#562854) + * Fri Feb 05 2010 Jiri Popelka - 12:4.1.1-4 - Fix dhclient-script to delete address which the client is going to release as soon as it begins the Release message exchange process (#559142)