Attachment 601702 Details for Bug 843802 – I've just sent this patch upstream [ISC-Bugs #30471]

[patch] I've just sent this patch upstream [ISC-Bugs #30471]

dhcp-4.2.4-P1-ignore-configured-renewal-rebinding.patch (text/plain), 1.30 KB, created by Jiri Popelka on 2012-08-01 10:27:08 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jiri Popelka

Created: 2012-08-01 10:27:08 UTC

Size: 1.30 KB

patch

obsolete

>diff -up dhcp-4.2.4-P1/server/dhcp.c.orig dhcp-4.2.4-P1/server/dhcp.c
>--- dhcp-4.2.4-P1/server/dhcp.c.orig	2012-07-13 08:18:05.000000000 +0200
>+++ dhcp-4.2.4-P1/server/dhcp.c	2012-08-01 12:13:14.317762763 +0200
>@@ -2626,10 +2626,11 @@ void ack_lease (packet, lease, offer, wh
> 			TIME rebind_time = getULong(d1.data);
> 
> 			/* Drop the configured (invalid) rebinding time. */
>-			if (rebind_time >= offered_lease_time)
>+			if (rebind_time > offered_lease_time) {
>+				log_info ("Ignoring configured dhcp-rebinding-time; it's greater than offered lease time");
> 				delete_option(&dhcp_universe, state->options,
> 					      DHO_DHCP_REBINDING_TIME);
>-			else /* XXX: variable is reused. */
>+			} else /* XXX: variable is reused. */
> 				offered_lease_time = rebind_time;
> 
> 			data_string_forget(&d1, MDL);
>@@ -2640,9 +2641,11 @@ 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)
>+			if (getULong(d1.data) > offered_lease_time) {
>+				log_info ("Ignoring configured dhcp-renewal-time; it's greater than offered lease time");
> 				delete_option(&dhcp_universe, state->options,
> 					      DHO_DHCP_RENEWAL_TIME);
>+			}
> 
> 			data_string_forget(&d1, MDL);
> 		}

Actions: View | Diff

Attachments on bug 843802: 601702