/[pkgs]/devel/dhcp/dhcp-4.1.0-inherit-leases.patch
ViewVC logotype

Contents of /devel/dhcp/dhcp-4.1.0-inherit-leases.patch

Parent Directory Parent Directory | Revision Log Revision Log

Revision 1.1 - (show annotations) (download) (as text)
Tue Jan 6 23:46:50 2009 UTC (10 months, 2 weeks ago) by dcantrel
Branch: MAIN
CVS Tags: F-12-split, dhcp-4_1_0-3_fc11, dhcp-4_1_0-2_fc11, dhcp-4_1_0-22_fc12, dhcp-4_1_0-1_fc11, dhcp-4_1_0-20_fc12, dhcp-4_1_0p1-5_fc12, dhcp-4_1_0-16_fc11, dhcp-4_1_0p1-13_fc13, dhcp-4_1_0-11_fc11, dhcp-4_1_0p1-11_fc12, dhcp-4_1_0-10_fc11, dhcp-4_1_0-15_fc11, dhcp-4_1_0-12_fc11, dhcp-4_1_0-14_fc11, F-11-split, dhcp-4_1_0p1-6_fc12, dhcp-4_1_0p1-7_fc12, dhcp-4_1_0p1-8_fc12, dhcp-4_1_0-4_fc11, dhcp-4_1_0p1-4_fc12, dhcp-4_1_0-13_fc11, dhcp-4_1_0-18_fc12, dhcp-4_1_0p1-14_fc13, dhcp-4_1_0-23_fc12, dhcp-4_1_0-6_fc11, dhcp-4_1_0-17_fc12, dhcp-4_1_0-19_fc12, dhcp-4_1_0p1-1_fc12, dhcp-4_1_0p1-3_fc12, dhcp-4_1_0p1-9_fc12, dhcp-4_1_0-9_fc11, dhcp-4_1_0p1-12_fc13, dhcp-4_1_0-26_fc12, dhcp-4_1_0p1-10_fc12, dhcp-4_1_0-8_fc11, dhcp-4_1_0-5_fc11, dhcp-4_1_0-25_fc12, dhcp-4_1_0-24_fc12, dhcp-4_1_0-7_fc11, dhcp-4_1_0-27_fc12, dhcp-4_1_0-21_fc12, dhcp-4_1_0p1-2_fc12, HEAD
File MIME type: text/x-patch 
* Tue Jan 06 2009 David Cantrell <dcantrell@redhat.com> - 12:4.1.0-1
- Upgraded to ISC dhcp-4.1.0
- Had to rename the -T option to -timeout as ISC is now using -T
- Allow package rebuilders to easily enable DHCPv6 support with:
      rpmbuild --with DHCPv6 dhcp.spec
  Note that Fedora is still using the 'dhcpv6' package, but some
  users may want to experiment with the ISC DHCPv6 implementation
  locally.
1 diff -up dhcp-4.1.0/client/dhclient.c.inherit dhcp-4.1.0/client/dhclient.c
2 --- dhcp-4.1.0/client/dhclient.c.inherit 2009-01-06 12:08:56.000000000 -1000
3 +++ dhcp-4.1.0/client/dhclient.c 2009-01-06 12:08:57.000000000 -1000
4 @@ -2299,6 +2299,7 @@ void send_request (cpp)
5 {
6 struct client_state *client = cpp;
7
8 + int i;
9 int result;
10 int interval;
11 struct sockaddr_in destination;
12 @@ -2358,6 +2359,22 @@ void send_request (cpp)
13 /* Now do a preinit on the interface so that we can
14 discover a new address. */
15 script_init (client, "PREINIT", (struct string_list *)0);
16 +
17 + /* Has an active lease */
18 + if (client -> interface -> addresses != NULL) {
19 + for (i = 0; i < client -> interface -> address_count; i++) {
20 + if (client -> active &&
21 + client -> active -> is_bootp &&
22 + client -> active -> expiry > cur_time &&
23 + client -> interface -> addresses[i].s_addr != 0 &&
24 + client -> active -> address.len == 4 &&
25 + memcpy (client -> active -> address.iabuf, &(client -> interface -> addresses[i]), 4) == 0) {
26 + client_envadd (client, "", "keep_old_ip", "%s", "yes");
27 + break;
28 + }
29 + }
30 + }
31 +
32 if (client -> alias)
33 script_write_params (client, "alias_",
34 client -> alias);
admin@fedoraproject.org
 ViewVC Help
Powered by ViewVC 1.1.2