From nobody Wed Oct 07 18:08:14 2026 X-Original-To: dev-commits-src-all@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 4j0Lhd61msz4n5hy; Wed, 07 Oct 2026 18:08:17 +0000 (UTC) (envelope-from glebius@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (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 4j0Lhd5XxFz4mhV; Wed, 07 Oct 2026 18:08:17 +0000 (UTC) (envelope-from glebius@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791396497; 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: in-reply-to:in-reply-to:references:references; bh=etUwusu3KvOzSeWwrup1RKUjd0pKt4tsP+wXCAhh3lo=; b=v8HszLJHa2r/xDsWvbwTxQEoeY56iIGGwrgj2NzkrbZK0IvyETs2OBeKKISvdY+mV3CKDR 69osqzkBza9CCK/yHJb2sqksnPKTCg0oZn2X5Cb/KNxU8OGFzlwcqljNym/UWVAXvyxsoO sL//yXKPmwDwOMbQwCU/2JSdwORx+nSEdOHDw2lJBp3KHv+74FneIr3+exxkA9k2EVEHGw /PwHVXwNYGcxEDqgqBIHHbik5Tmxa0uEu8uTbBWEGcEOEsb/iEzSOuxLOuQNi8eJcCSjy+ 26Yq5nCocv5Z1/0L3XKL2ghRmMRRmTEuH8A61RMXqCcOflEQCQ/eAomQt0dz8w== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1791396497; b=xH856UF7jQxgXvvU4Rwdx7S21mA1wL335T77MNGbHZIj/bvMMHRl/l5j0Wc6tiMcNSpD7l yIbaV10wA1/7FPE6gZ4ptrkIuIG2j1HHpRPPHFQM+UdzVqctId9A3Ek16XSMa4GIkHz1xF ABxDMh9PVxBf53v3MyuU+iJXpcn1Mcw13uLM/y85C2sj/lAy2h+85tEo4ksLOdLxGhvjHU Iin/5FpM9Aayasgn9z3Vu6FvHeckxamXZm913/Iv6BKBwXnUAcy3tiObBPBYTFl3TwPBVh CA9RzMASOouKmOARTKVeTpXtv6lpzpb0bjrWwpwD3YSrSiveN+R4us/5j+X1cA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791396497; 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: in-reply-to:in-reply-to:references:references; bh=etUwusu3KvOzSeWwrup1RKUjd0pKt4tsP+wXCAhh3lo=; b=B+Vyvbup2uaBx6K1ZTMvrteBRwsoshiN2/zMS/XaxSpbm70yJVZIm/+dXr+Y35UMXBwo4b cQH5sKFsZdUriVAMU2Rl1QIhfnFCnhyJLcXzKF+0jSNTBOg2ShM+uCIYCbCcwzTsTIxAja 99pNX5qi6hWKfA6I/nJ4vd+RMdpX/sBLUb5jA143Mf1xrytrXP/gZAb9GLo22vjcyRdzCe X1WLanjUB9TIap7/Ol+z/MaPtLd/Tc++hOiuxFZ7unL+WbOCUIQuCEabO5ewOomXZzYxtc +JHsPCaHxdDat6TXmPu160Stw5sQ+LLEMGXPadzJ7Qqo7ghH2Iz851jhCeOAnA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from cell.glebi.us (glebi.us [162.251.186.162]) (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 did not present a certificate) (Authenticated sender: glebius) by smtp.freebsd.org (Postfix) with ESMTPSA id 4j0Lhd0b8KzlX7; Wed, 07 Oct 2026 18:08:16 +0000 (UTC) (envelope-from glebius@freebsd.org) Date: Wed, 7 Oct 2026 11:08:14 -0700 From: Gleb Smirnoff To: Baptiste Daroussin Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 0f1ca95d7740 - main - dhclient-script: store the Captive Portal URI Message-ID: References: <6ac65232.19ad2.1f382395@gitrepo.freebsd.org> List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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=us-ascii Content-Disposition: inline In-Reply-To: <6ac65232.19ad2.1f382395@gitrepo.freebsd.org> On Wed, Oct 07, 2026 at 02:07:46PM +0000, Baptiste Daroussin wrote: B> The branch main has been updated by bapt: B> B> URL: https://cgit.FreeBSD.org/src/commit/?id=0f1ca95d7740e0800572ed436fd61e70f76eb6c3 B> 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> B> dhclient-script: store the Captive Portal URI B> B> Write the URI received in DHCP option 114 to B> /var/run/captive-portal.IFACE atomically, with the legacy option 160 as B> a fallback, and remove the file on EXPIRE and FAIL. ... B> diff --git a/sbin/dhclient/dhclient-script.8 b/sbin/dhclient/dhclient-script.8 B> index dd3efd3e8698..00482da3731c 100644 B> --- a/sbin/dhclient/dhclient-script.8 B> +++ b/sbin/dhclient/dhclient-script.8 B> @@ -36,7 +36,7 @@ B> .\" see ``http://www.isc.org/isc''. To learn more about Vixie B> .\" Enterprises, see ``http://www.vix.com''. B> .\" B> -.Dd September 6, 2010 B> +.Dd October 5, 2026 B> .Dt DHCLIENT-SCRIPT 8 B> .Os B> .Sh NAME B> @@ -142,6 +142,15 @@ in order to make valid shell variables, and the variable names start with B> So for example, the new subnet mask would be passed in B> .Va $new_subnet_mask . B> .Pp B> +As an exception, the captive portal API URI from DHCP option 114 B> +.Pq see Xr dhcp-options 5 B> +is passed as B> +.Va $new_captive_portal_url . B> +When such a URI is received, the script also writes it to B> +.Pa /var/run/captive-portal. Ns Va $interface B> +so that it can be discovered by other programs. B> +The file is removed when the lease expires or is lost. B> +.Pp B> When a binding has been completed, a lot of network parameters are B> likely to need to be set up. B> A new Note that URI and URL are two different things. I'm pretty sure you meant URL all around in this batch of changes. The commit messages can't be fixed anymore, but the dhclient-script.8 should be. -- Gleb Smirnoff