From nobody Wed Oct 07 14:07:45 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 4j0FM54jwyz6vyCh for ; Wed, 07 Oct 2026 14:07:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (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 "mxrelay.nyi.freebsd.org", Issuer "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4j0FM51b3hz3PGL for ; Wed, 07 Oct 2026 14:07:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791382065; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Eh7ttyjrawmYSUpcT1Mu8PqJlO0NnFycmiMqoPZrjrw=; b=bg+aiBjGK+CjtciOq0Jodgo8GWwYadYmD/+yiQSZJXmhwBUN6ik/kE5gHf57RKdRfmMxMg WTvABPJlvvqiHGoLK2W5cw7UE3rztJmZ+Heig6NnLkaZQn1p5Gbb0J2ADteQsTmJLZvF+R kZ5eGL7xtGHbRMHIxTBPHuNY15NFufLiXeoO1ahD/FTNeTuTL9fwcjYC6brbl4mplMdms+ RyrWb+M07lCQo49W5LT288px4gGXd1U3s5Jd7s4WkKJOojvgv5UNOcH18xNHpvc9oqdKsU H27ZS8JNXwB0doBFj50cWt5XMU9LlrVu8KWHwGJ0GMf+M0MqHi7EeCogGs0zzA== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1791382065; b=ykLNHWtm7c673y8ZlFJAFBAXhJXB9rIPDQTgF4u8vhLosEyGoyJmIt3Gcu342fIHEo9+qv QLiU38Cm39tvugbdnLG0COL0rVr4FVRwkVo/feAA2h73DuAXi8SfDIiaHSfxqjYP5neUnx bzE2lzT6/rgUK0Vr4JHneoT0V0Zq4RYBI5Uwx8/i8qpQEFygsDT9O+vlVStzJ3JbnWPzhQ mTj1OT4zM62iarFyODjkfy15siJjXViqj8sVut0QdM5ZZLR9vdQ5WJADZeGFqpQ/njSaFU gTuu3QWKX91fdAeoLj0VwylvGb9rXj6brM8EoamsQPfPnYhUyvdpVfAXAI2b+Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791382065; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Eh7ttyjrawmYSUpcT1Mu8PqJlO0NnFycmiMqoPZrjrw=; b=ratXRljyjYAjGtM8vEPxgdQk19LXwU0NuBxC3oogpffw2TTT15C5308J4Bj8tngJrXk/cv 1WUVmGS/89/OUpyJPglZd8mU7KJFYXvX429lO3ohLsG1Wmt0E+xZhyDVDrxjzmiHACnhLH HheNCxdrn8UjEaOAb4PGA/L2CKQU/IAR50fit9dVOdeQJFKeAyj3FkbvM6/C00UXNDaw+D 096gjfGbWInmRAdkDW7FL2afXmo2ABUl49uTEofEntyI0HLul9Qi6341kpStNjUFeVgg94 sYz2/OeDIjFnpAfbH1+G0VJqsyTUJrxIZ4MrOANsHmCC+CF4vfyGHfA6BswgNg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4j0FM50dtXzwJV for ; Wed, 07 Oct 2026 14:07:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1c09c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 07 Oct 2026 14:07:45 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Baptiste Daroussin Subject: git: 7ba72855939f - main - dhclient: export the Captive Portal URI to the script 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: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7ba72855939fc53eb8b6d9def386564579780786 Auto-Submitted: auto-generated Date: Wed, 07 Oct 2026 14:07:45 +0000 Message-Id: <6ac65231.1c09c.84ecb5c@gitrepo.freebsd.org> The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=7ba72855939fc53eb8b6d9def386564579780786 commit 7ba72855939fc53eb8b6d9def386564579780786 Author: Baptiste Daroussin AuthorDate: 2026-10-02 19:54:25 +0000 Commit: Baptiste Daroussin CommitDate: 2026-10-07 14:07:09 +0000 dhclient: export the Captive Portal URI to the script Differential Revision= https://reviews.freebsd.org/D60259 --- sbin/dhclient/dhclient.c | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/sbin/dhclient/dhclient.c b/sbin/dhclient/dhclient.c index a9425707577c..bef956645b85 100644 --- a/sbin/dhclient/dhclient.c +++ b/sbin/dhclient/dhclient.c @@ -2431,10 +2431,21 @@ supersede: 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);