[people/ms/ipfire-3.x.git] / dhcp / patches / dhcp-4.2.3-dhclient-decline-onetry.patch

diff -up dhcp-4.2.3/client/dhclient.c.decline-onetry dhcp-4.2.3/client/dhclient.c
--- dhcp-4.2.3/client/dhclient.c.decline-onetry	2011-11-24 14:21:50.000000000 +0100
+++ dhcp-4.2.3/client/dhclient.c	2011-11-24 14:23:44.472893215 +0100
@@ -1704,11 +1704,18 @@ void bind_lease (client)
 	if (script_go (client)) {
 		make_decline (client, client -> new);
 		send_decline (client);
-		destroy_client_lease (client -> new);
-		client -> new = (struct client_lease *)0;
-		client -> state = S_DECLINED;
-		state_init (client);
-		return;
+		if (onetry) {
+			if (!quiet)
+			  log_info ("Unable to obtain a lease on first try.%s",
+					"  Exiting.");
+			exit (2);
+		} else {
+			destroy_client_lease (client -> new);
+			client -> new = (struct client_lease *)0;
+			client -> state = S_DECLINED;
+			state_init (client);
+			return;
+		}
 	}
 
 	/* Write out the new lease if it has been long enough. */
Commit	Line	Data
444c1184 MT	1	diff -up dhcp-4.2.3/client/dhclient.c.decline-onetry dhcp-4.2.3/client/dhclient.c
	2	--- dhcp-4.2.3/client/dhclient.c.decline-onetry 2011-11-24 14:21:50.000000000 +0100
	3	+++ dhcp-4.2.3/client/dhclient.c 2011-11-24 14:23:44.472893215 +0100
	4	@@ -1704,11 +1704,18 @@ void bind_lease (client)
	5	if (script_go (client)) {
	6	make_decline (client, client -> new);
	7	send_decline (client);
	8	- destroy_client_lease (client -> new);
	9	- client -> new = (struct client_lease *)0;
	10	- client -> state = S_DECLINED;
	11	- state_init (client);
	12	- return;
	13	+ if (onetry) {
	14	+ if (!quiet)
	15	+ log_info ("Unable to obtain a lease on first try.%s",
	16	+ " Exiting.");
	17	+ exit (2);
	18	+ } else {
	19	+ destroy_client_lease (client -> new);
	20	+ client -> new = (struct client_lease *)0;
	21	+ client -> state = S_DECLINED;
	22	+ state_init (client);
	23	+ return;
	24	+ }
	25	}
	26
	27	/* Write out the new lease if it has been long enough. */