Blame SOURCES/dhcp-4.2.3-dhclient-decline-onetry.patch

fad460
diff -up dhcp-4.2.3/client/dhclient.c.decline-onetry dhcp-4.2.3/client/dhclient.c
fad460
--- dhcp-4.2.3/client/dhclient.c.decline-onetry	2011-11-24 14:21:50.000000000 +0100
fad460
+++ dhcp-4.2.3/client/dhclient.c	2011-11-24 14:23:44.472893215 +0100
fad460
@@ -1704,11 +1704,18 @@ void bind_lease (client)
fad460
 	if (script_go (client)) {
fad460
 		make_decline (client, client -> new);
fad460
 		send_decline (client);
fad460
-		destroy_client_lease (client -> new);
fad460
-		client -> new = (struct client_lease *)0;
fad460
-		client -> state = S_DECLINED;
fad460
-		state_init (client);
fad460
-		return;
fad460
+		if (onetry) {
fad460
+			if (!quiet)
fad460
+			  log_info ("Unable to obtain a lease on first try.%s",
fad460
+					"  Exiting.");
fad460
+			exit (2);
fad460
+		} else {
fad460
+			destroy_client_lease (client -> new);
fad460
+			client -> new = (struct client_lease *)0;
fad460
+			client -> state = S_DECLINED;
fad460
+			state_init (client);
fad460
+			return;
fad460
+		}
fad460
 	}
fad460
 
fad460
 	/* Write out the new lease if it has been long enough. */