From nobody Wed Oct 07 18:18:29 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4j0LwR2PT0z4n6RL; Wed, 07 Oct 2026 18:18:31 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4j0LwR1rfBz4ptw; Wed, 07 Oct 2026 18:18:31 +0000 (UTC) (envelope-from bapt@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791397111; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=0pPZ+ZVeQvuBYykBUxmwfR/xWgXf2jcwAlrEhoHvvYY=; b=ylpZgbSloqO5x4Z7aCy8IuethKaW06AeacreU4vHG3vOYCTQFfcvLUtVoum91ry9LwDmT6 5uzPAdI/F4bi3afOp0eotAeDGc0nU95pFdDIzymrmg5efmoas1zE/l+IMK81QIAC8tPgv8 Gd/2YeijZfCpfYKeqwJNDnvtOYilJVb0CT4HdAgZyGEOiHX9MHqMpp6KsLGl/cFPMjebw4 SLj0o7aZEREK+P7vPkhLR2f7QRnYTvjjLjvh7RqOQpfwKDV6if6KZ3a4obJvWZAW+ngC8j cOh5nbuOXoL8UqUa1LVDnwTslsGzAVIq7wYmvaEkkzmqVK9lToRu01XHbKy/Kw== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1791397111; b=xsqbX2oxheFbcZmiPoxZ8dZwwST3uQI8A9nTsjUmK0jf1k4Djs6bsyzeSCchSDih/TOtWy 2JzGi5z8K176nnKzJcEXExmbqzNu6lVLnYzIOtZSx6G5sZEcpjfcPDAfSx17mdKPDE1GMP qY2GWYcyPSK0G1w4E5u9cbAzq3+oUpM1Qla28JS1R8TMu55Q5veBPyBs/KSJZrP0P3EVj5 aUy0s5iH0J9WZiGRQVB3lb1x/1SJGEJ59tMuukwjHWmrkGSVEKE67KIIY34m6PApwfPyfb ctQRYizBrjhwKtuzlyMWF5ulQogVSFXq+ovUdeFLvEDOe1qUXkqmNGB47u67aA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791397111; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=0pPZ+ZVeQvuBYykBUxmwfR/xWgXf2jcwAlrEhoHvvYY=; b=jq62FuSe135pTD4Stxc+Mx42tFu1g72tTJUEcR9P1jpOeERgSF2wqrtAB4W+E7t7T+xe+p BSN8p8X6DiV8yczw8NuKNr78VxOAJ1lPiXLC3sk2gS7rD/pRP/CfZmDT+xz2R1pcFm3Ok4 VhgcqCkyBHeNhFIecE7ZoyO/VwxwhpFitbR7Iyt0C3M6AVX4MyGR4nA9oYIQloiXjoLtqX g8u8hYhUHmiFDRUelytZi0mjZ7s23o0YXYDQuR5lblfTojmKz4MqApyzlxwlFFfJbPR6Zb 4HDoyPAi5XkjVJ3/OozAuP51jxBNPDEcUYupEhYI/66Qfs/KAkdrvbSffZ/xKw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from b.nours.eu (b.nours.eu [54.38.177.57]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519) (Client did not present a certificate) (Authenticated sender: bapt) by smtp.freebsd.org (Postfix) with ESMTPSA id 4j0LwR02ZFzmRZ; Wed, 07 Oct 2026 18:18:30 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from ehlo.thunderbird.net (82-66-66-238.subs.proxad.net [82.66.66.238]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange x25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by b.nours.eu (Postfix) with ESMTPSA id 66CCD1A8B7C; Wed, 07 Oct 2026 20:18:14 +0200 (CEST) Date: Wed, 07 Oct 2026 20:18:29 +0200 From: Baptiste Daroussin To: Gleb Smirnoff CC: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: =?US-ASCII?Q?Re=3A_git=3A_0f1ca95d7740_-_main_-_dhclien?= =?US-ASCII?Q?t-script=3A_store_the_Captive_Portal_URI?= User-Agent: Thunderbird for Android In-Reply-To: References: <6ac65232.19ad2.1f382395@gitrepo.freebsd.org> Message-ID: List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Le 7 octobre 2026 20:08:14 GMT+02:00, Gleb Smirnoff a =C3=A9crit : >On Wed, Oct 07, 2026 at 02:07:46PM +0000, Baptiste Daroussin wrote: >B> The branch main has been updated by bapt: >B>=20 >B> URL: https://cgit=2EFreeBSD=2Eorg/src/commit/?id=3D0f1ca95d7740e080057= 2ed436fd61e70f76eb6c3 >B>=20 >B> commit 0f1ca95d7740e0800572ed436fd61e70f76eb6c3 >B> Author: Baptiste Daroussin >B> AuthorDate: 2026-10-02 19:55:28 +0000 >B> Commit: Baptiste Daroussin >B> CommitDate: 2026-10-07 14:07:09 +0000 >B>=20 >B> dhclient-script: store the Captive Portal URI >B> =20 >B> Write the URI received in DHCP option 114 to >B> /var/run/captive-portal=2EIFACE atomically, with the legacy option= 160 as >B> a fallback, and remove the file on EXPIRE and FAIL=2E >=2E=2E=2E >B> diff --git a/sbin/dhclient/dhclient-script=2E8 b/sbin/dhclient/dhclien= t-script=2E8 >B> index dd3efd3e8698=2E=2E00482da3731c 100644 >B> --- a/sbin/dhclient/dhclient-script=2E8 >B> +++ b/sbin/dhclient/dhclient-script=2E8 >B> @@ -36,7 +36,7 @@ >B> =2E\" see ``http://www=2Eisc=2Eorg/isc''=2E To learn more about Vixi= e >B> =2E\" Enterprises, see ``http://www=2Evix=2Ecom''=2E >B> =2E\" >B> -=2EDd September 6, 2010 >B> +=2EDd October 5, 2026 >B> =2EDt DHCLIENT-SCRIPT 8 >B> =2EOs >B> =2ESh NAME >B> @@ -142,6 +142,15 @@ in order to make valid shell variables, and the v= ariable names start with >B> So for example, the new subnet mask would be passed in >B> =2EVa $new_subnet_mask =2E >B> =2EPp >B> +As an exception, the captive portal API URI from DHCP option 114 >B> +=2EPq see Xr dhcp-options 5 >B> +is passed as >B> +=2EVa $new_captive_portal_url =2E >B> +When such a URI is received, the script also writes it to >B> +=2EPa /var/run/captive-portal=2E Ns Va $interface >B> +so that it can be discovered by other programs=2E >B> +The file is removed when the lease expires or is lost=2E >B> +=2EPp >B> When a binding has been completed, a lot of network parameters are >B> likely to need to be set up=2E >B> A new > >Note that URI and URL are two different things=2E I'm pretty sure you me= ant URL >all around in this batch of changes=2E The commit messages can't be fixe= d >anymore, but the dhclient-script=2E8 should be=2E > oups sorry for the typo I ll fix Bapt