Attachment 600483 Details for Bug 662254 – patch

[patch] patch

server-infinite.patch (text/plain), 1.01 KB, created by Jiri Popelka on 2012-07-26 11:10:50 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jiri Popelka

Created: 2012-07-26 11:10:50 UTC

Size: 1.01 KB

patch

obsolete

>diff -up dhcp-4.2.4-P1/server/dhcp.c.infinite dhcp-4.2.4-P1/server/dhcp.c
>--- dhcp-4.2.4-P1/server/dhcp.c.infinite	2012-07-26 13:02:00.000000000 +0200
>+++ dhcp-4.2.4-P1/server/dhcp.c	2012-07-26 13:02:55.190184789 +0200
>@@ -2650,11 +2650,6 @@ void ack_lease (packet, lease, offer, wh
> 					  &lease->scope, oc, MDL)) {
> 			TIME rebind_time = getULong(d1.data);
> 
>-			/* Drop the configured (invalid) rebinding time. */
>-			if (rebind_time >= offered_lease_time)
>-				delete_option(&dhcp_universe, state->options,
>-					      DHO_DHCP_REBINDING_TIME);
>-			else /* XXX: variable is reused. */
> 				offered_lease_time = rebind_time;
> 
> 			data_string_forget(&d1, MDL);
>@@ -2665,9 +2660,6 @@ void ack_lease (packet, lease, offer, wh
> 		    evaluate_option_cache(&d1, packet, lease, NULL,
> 					  packet->options, state->options,
> 					  &lease->scope, oc, MDL)) {
>-			if (getULong(d1.data) >= offered_lease_time)
>-				delete_option(&dhcp_universe, state->options,
>-					      DHO_DHCP_RENEWAL_TIME);
> 
> 			data_string_forget(&d1, MDL);
> 		}

Actions: View | Diff

Attachments on bug 662254: 468545 | 600475 | 600483 | 600669 | 600672