D60258.diff
No OneTemporary
Actions

Size

934 B

Referenced Files

None

Subscribers

None

D60258.diff
View Options

	diff --git a/sbin/dhclient/dhclient.c b/sbin/dhclient/dhclient.c
	--- a/sbin/dhclient/dhclient.c
	+++ b/sbin/dhclient/dhclient.c
	@@ -2431,10 +2431,21 @@
	if (len) {
	char name[256];

	- if (dhcp_option_ev_name(name, sizeof(name),
	+ /*
	+ * The option is named "captive-portal", so the
	+ * generic name derived below would be
	+ * new_captive_portal / old_captive_portal.
	+ * Append "_url" suffix so that the variable name
	+ * says that the value is a URL.
	+ */
	+ if (i == DHO_CAPTIVE_PORTAL)
	+ strlcpy(name, "captive_portal_url",
	+ sizeof(name));
	+ else if (!dhcp_option_ev_name(name, sizeof(name),
	&dhcp_options[i]))
	- script_set_env(ip->client, prefix, name,
	- pretty_print_option(i, dp, len, 0, 0));
	+ continue;
	+ script_set_env(ip->client, prefix, name,
	+ pretty_print_option(i, dp, len, 0, 0));
	}
	}
	snprintf(tbuf, sizeof(tbuf), "%d", (int)lease->expiry);