Re: git: 0f1ca95d7740 - main - dhclient-script: store the Captive Portal URI

Reply: Baptiste Daroussin : "Re:_git:_0f1ca95d7740_-_main_-_dhclien t-script:_store_the_Captive_Portal_URI"
In reply to: Baptiste Daroussin : "git: 0f1ca95d7740 - main - dhclient-script: store the Captive Portal URI"
Go to: [ bottom of page ] [ top of archives ] [ this month ]

From: Gleb Smirnoff <glebius_at_freebsd.org>
Date: Wed, 07 Oct 2026 18:08:14 UTC

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 <bapt@FreeBSD.org>
B> AuthorDate: 2026-10-02 19:55:28 +0000
B> Commit:     Baptiste Daroussin <bapt@FreeBSD.org>
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