From nobody Wed Feb 26 15:15:53 2025 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 4Z2yj63t1lz5qH8j; Wed, 26 Feb 2025 15:15:54 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Z2yj60fC1z3P3g; Wed, 26 Feb 2025 15:15:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1740582954; 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=Hm6xWeC4DxGdUQQsWSqK4WcNywaCiM7oq9ECXcHCERk=; b=uKrtCdQSqbPaTPonWHe4PhUZgQqLfwyRMxUR1WxhzMjT1odsn7NQkYKcJmgBJORR7TRo74 Ymd1dYxrFSn53w2NHMViHV7h61SxRCYkVTBeNHbsxYkU/N2dz67yeT5Jw+zpJ/embnnfw8 Un4+jbbaeMk/4RkwdOw8TcFHxIXoZQCr8x/mKuJrxObPJgkdEnI5jXRxDD++HMrgPjai+u 6lbl2jzwT+3XFmtQwXBqJ0r/pJZvupFq57FMLq84rEB5+5sZKwcdo/jI9fiB6LDz34VFSQ VK3tB4y+ilr6o3IebIoHU1H0Mz1ShohRc9n+g0PRRgiBiWmWJ7b37aMgL5r3GQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1740582954; a=rsa-sha256; cv=none; b=LIlHJ+WqzQec82CE1F7l9hJrvjJStjeypopGht24p9iAYE60+t1AUwp0lkmA3QFerAbp9v JLUjGy3vZQEzbGxMkYUgIgnQaOTSZUvZMGH9EJH/Yo1B2wmhpgVQZM17RgR3coy+SBl+S5 VTQslwC9foBlQ350JbggWkIL9htiRHKYT5DiqP2bzD3xzufiQ1LcaN4MvD6p1piTCpaTK+ gCpXbgoKZlILzAbqWpaI4df96NOgL74eEEWP1NEYhcmhiB624U4zyFkAhfbPA5SRHYZ+dp Ilcm1bvDkrRyJHvr8giCdmIs4AiNHropMeCQ3yE6vOdos5yde0pDK/DSkimvDw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1740582954; 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=Hm6xWeC4DxGdUQQsWSqK4WcNywaCiM7oq9ECXcHCERk=; b=p4S1TRyxjPrlaG2wi6kDecB5PUmNdLdN24SK+POXy8SgpIWATU2OaD9c5yhYhthEx+2wgQ pOVB9IBRKCGPDgyWJKFy/QH97YKwQUx4Nen4scehC700vwzYL11WJ3Vh2/RQ1SaTOjIlps r6MANMmzuK66Fu/gvpRoIoIu8IHgyJQw0h3J5z5hp0gVGSObewas7rDGKgC2KZIZHaQxbD /tkr+50WZXXmAQ63rxTNkVrHQPTIcBzW+OGyQm+3Boo+LdF1V4zmzsSAgcd7oClUvHt8kQ ih5Ja6Im+k1MQz0o37kdJAy2/3RHIIHcmEMMqMco3M8O1S9Gs4inMixKewqdXw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Z2yj60FZKz1HCr; Wed, 26 Feb 2025 15:15:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 51QFFrw3034093; Wed, 26 Feb 2025 15:15:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51QFFrba034090; Wed, 26 Feb 2025 15:15:53 GMT (envelope-from git) Date: Wed, 26 Feb 2025 15:15:53 GMT Message-Id: <202502261515.51QFFrba034090@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: e49db000c493 - main - ctld: Permit targets to use a string for portal-groups in UCL 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 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/main X-Git-Reftype: branch X-Git-Commit: e49db000c4932753fb309ad895c02e98723023f3 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=e49db000c4932753fb309ad895c02e98723023f3 commit e49db000c4932753fb309ad895c02e98723023f3 Author: John Baldwin AuthorDate: 2025-02-26 15:13:56 +0000 Commit: John Baldwin CommitDate: 2025-02-26 15:13:56 +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 --- 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; } }