dhcp/dhcp-4.0.0-inherit-leases.patch
David Cantrell f669e74cea - Carry over RES_OPTIONS from ifcfg-ethX files to /etc/resolv.conf
(#202923)
- Clean up Requires tags for devel packages
- Allow SEARCH variable in ifcfg files to override search path (#454152)
- Do not down interface if there is an active lease (#453982)
- Clean up how dhclient-script restarts ypbind
- Set close-on-exec on dhclient.leases for SELinux (#446632)
2008-08-01 22:16:38 +00:00

35 lines
1.2 KiB
Diff

diff -up dhcp-4.0.0/client/dhclient.c.inherit dhcp-4.0.0/client/dhclient.c
--- dhcp-4.0.0/client/dhclient.c.inherit 2008-08-01 11:34:29.000000000 -1000
+++ dhcp-4.0.0/client/dhclient.c 2008-08-01 11:34:42.000000000 -1000
@@ -2296,6 +2296,7 @@ void send_request (cpp)
{
struct client_state *client = cpp;
+ int i;
int result;
int interval;
struct sockaddr_in destination;
@@ -2354,6 +2355,22 @@ void send_request (cpp)
/* Now do a preinit on the interface so that we can
discover a new address. */
script_init (client, "PREINIT", (struct string_list *)0);
+
+ /* Has an active lease */
+ if (client -> interface -> addresses != NULL) {
+ for (i = 0; i < client -> interface -> address_count; i++) {
+ if (client -> active &&
+ client -> active -> is_bootp &&
+ client -> active -> expiry > cur_time &&
+ client -> interface -> addresses[i].s_addr != 0 &&
+ client -> active -> address.len == 4 &&
+ memcpy (client -> active -> address.iabuf, &(client -> interface -> addresses[i]), 4) == 0) {
+ client_envadd (client, "", "keep_old_ip", "%s", "yes");
+ break;
+ }
+ }
+ }
+
if (client -> alias)
script_write_params (client, "alias_",
client -> alias);