From nobody Tue Jan 27 18:44:17 2026 X-Original-To: dev-commits-src-branches@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 4f0vSy2DSKz6QFFP for ; Tue, 27 Jan 2026 18:44:18 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f0vSx53W8z3rQs for ; Tue, 27 Jan 2026 18:44:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769539457; 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=SJsU2HmE6JaTfDTf73/UPqb+ujU1RuMArMVNDTykL+w=; b=EXQ+gpkMeU7SfcpcKggxVSn7Nn+YnxuIxcbgLs5qBiHWtmB22Tni/uZu3/jaItL+sZg9tZ scd+hIizOATDoUCiNdrsLZV1BemeImp9tJAz1uwEk2NhxBtDHZQ/pDMyex5SQwbV4I0znZ zi6u3NkxKSa7Kp9kVyzKO7+vS5chDPBi8Cl5vDsuZZYGtCRJYodXLQ+WPi3o9+D7B7YwYw +GLDE7ubYjRzwvRKh/5TT13MQBjKA7RXaOvqKORKjzDqqf6Iyxpk5wHKnoOt0JbD7EsZY0 xL53yGHKi44yoKoZy8ipb77N49GIGcSBriMh7xeggUsAzay6Poe7WDQqqrj5jw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769539457; 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=SJsU2HmE6JaTfDTf73/UPqb+ujU1RuMArMVNDTykL+w=; b=xJXAoBDNHyHbT0AEUIBT0e/Ww3MPhDkOSWCVEWnFoTWmnwVxU3qGrHkWA1N7FyN0TB3QuK T4w1a34gAgYwzqyh8h/z9yPP53VwwfxcD9a8IE4nouhKME5d95Nru9sXvXkylL5cJuIdAj p2Gjhx/8BowWgdS+8xS7ER6HMmcE0BauUBHC9UnsvPNtC1bDiSbxS7JjnJeykcAfSn9KW1 CTe6fiRNdZYJToW8+E4nVrHVNNKMMqX9bBbIps4T54cHLcGQ0Gj/AEOVcpixx95dL54+YJ DrmIwez1ZtmpxcUK6wx8OU5dRaV+fPXE217jNucqfAJwvqa7XVXHSjwSpyEZ8g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769539457; a=rsa-sha256; cv=none; b=DewUGFxZNWGHlcqvOqX8moKWfG97qkkYGIfpcBj/RxwQ1oP3IijzvQeQ9Cg79zHMnpj2CS YVP804hAShHTeUYDoiQUxAzwCi+DBc/EXXi8qIWmndmFm/HAHj7RdkbDqCnwcp/H5QXsXq QOrCUIACv2Npz+D1xWNRG8dE4je0iT53vjxR2YAqOzTkT6cDEdNsyoshEiBb+/7nES92Tc HYxQgfSnI4rqaEBI/HEXA0ckD700u2LAr80Qgya9FKF+C7dHwJGhL12PEHGSPUyHdI9/JU ++oS+WWt/PnQc4E+TIRr9RQNEhC6jtGhA7zG4NjcNx6sb8mUX50cIHH+KSgeUA== 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 4f0vSx4cqHz3qn for ; Tue, 27 Jan 2026 18:44:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id fafb by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 27 Jan 2026 18:44:17 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: e1548d92b945 - stable/14 - ctld: Permit targets to use a string for portal-groups in UCL List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: e1548d92b945f6e0e1ead509595451dc4a5ed24c Auto-Submitted: auto-generated Date: Tue, 27 Jan 2026 18:44:17 +0000 Message-Id: <69790781.fafb.1be18618@gitrepo.freebsd.org> The branch stable/14 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=e1548d92b945f6e0e1ead509595451dc4a5ed24c commit e1548d92b945f6e0e1ead509595451dc4a5ed24c Author: John Baldwin AuthorDate: 2025-02-26 15:13:56 +0000 Commit: John Baldwin CommitDate: 2026-01-27 18:15:57 +0000 ctld: Permit targets to use a string for portal-groups in UCL In the case that a separate auth-group is not required, this permits replacing: portal-group = { name = pg0 } with: portal-group = pg0 Sponsored by: Chelsio Communications Differential Revision: https://reviews.freebsd.org/D48938 (cherry picked from commit e49db000c4932753fb309ad895c02e98723023f3) --- usr.sbin/ctld/ctl.conf.5 | 2 +- usr.sbin/ctld/uclparse.c | 22 +++++++++++++++++----- 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/usr.sbin/ctld/ctl.conf.5 b/usr.sbin/ctld/ctl.conf.5 index 015fc1e12e36..8cc7c85b6f95 100644 --- a/usr.sbin/ctld/ctl.conf.5 +++ b/usr.sbin/ctld/ctl.conf.5 @@ -567,7 +567,7 @@ target { "iqn.2012-06.com.example:target1" { auth-group = ag0 - portal-group { name = pg0 } + portal-group = pg0 lun = [ { number = 0, name = example_1 }, { diff --git a/usr.sbin/ctld/uclparse.c b/usr.sbin/ctld/uclparse.c index b9d88a1d45d2..ab41e328cd90 100644 --- a/usr.sbin/ctld/uclparse.c +++ b/usr.sbin/ctld/uclparse.c @@ -191,6 +191,20 @@ uclparse_target_portal_group(const char *t_name, const ucl_object_t *obj) const ucl_object_t *portal_group, *auth_group; const char *ag_name; + /* + * If the value is a single string, assume it is a + * portal-group name. + */ + if (obj->type == UCL_STRING) + return (target_add_portal_group(ucl_object_tostring(obj), + NULL)); + + if (obj->type != UCL_OBJECT) { + log_warnx("portal-group section in target \"%s\" must be " + "an object or string", t_name); + return (false); + } + portal_group = ucl_object_find_key(obj, "name"); if (!portal_group || portal_group->type != UCL_STRING) { log_warnx("portal-group section in target \"%s\" is missing " @@ -884,11 +898,6 @@ uclparse_target(const char *name, const ucl_object_t *top) } if (strcmp(key, "portal-group") == 0) { - if (obj->type == UCL_OBJECT) { - if (!uclparse_target_portal_group(name, obj)) - goto fail; - } - if (obj->type == UCL_ARRAY) { while ((tmp = ucl_iterate_object(obj, &it2, true))) { @@ -896,6 +905,9 @@ uclparse_target(const char *name, const ucl_object_t *top) tmp)) goto fail; } + } else { + if (!uclparse_target_portal_group(name, obj)) + goto fail; } }