From nobody Tue Jan 27 18:44:13 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 4f0vSs3tnkz6QFnH for ; Tue, 27 Jan 2026 18:44:13 +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 4f0vSs2CJYz3r8t for ; Tue, 27 Jan 2026 18:44:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769539453; 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=G+1gYLLH8bcINKP0x56xwPntBJDGEy/b9mKqAc2eHNE=; b=hXEfuUpL9R9yxNFA/ijxWbco/7PuRNnjzAAN4VHuPmYonAuegkLXNMiiJVbz8uU8wqfKt/ N1fgctzojBKnvvNisTMgirirQpUZtecSmOtdIEXRSBVzCzTls0sFVph0JS4OqQlZX0C0qS cfbYPb0TAMdA4pPCLZsF6ydjpGQH0hvqZKkHsOGPH6Xl/3yPH4eNovf/qoQSu9yYQrNedk nArDgw+thtmB+WhCUtI0tRWR4bmHosevyRNiEvx8zQUPawZbxDnfM5hhJowLQ2SXXCKV6o vxywsRWEK+V8MCOp9Gi0nDMmi+iwAxkVtrV32W5eCz5oCfo7ZdAJUAlfWqOm2g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769539453; 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=G+1gYLLH8bcINKP0x56xwPntBJDGEy/b9mKqAc2eHNE=; b=YfnF1Kto8WjZaQYmP8cHolKR25DE1TYOHc0UGc5b46P465zJH06MaRuq7W65n2eQFopro6 sN+ROYuYoU0nzSk71ENEqrHNp2DA0AgZ2PhDludbqg1DDemUC28I/KaZ5mIbS543fgXzjy SH+jvdLu2nBWLOc1MO15BMnZG6NN1HWeR89YCs+oHKFuXb/yJwztnF2zQpZXyDy2+SEw/d sKpkIvHnMWORSuT0mROb4ckzMOcf6HlWgynD3AkwewBQMj8tfy+UGVqoluaC8LF1Qgycg0 sRyTtjEIUGr4V6VBW+QnSgrPi+rHCp4BPuOhG+eI+Eb66pDoTR7scbEIu/f9Hg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769539453; a=rsa-sha256; cv=none; b=OznbTXpDvFqcDO+t5aHd1pt0cyZr5A9qw/jnU405BM/sPMqdDnNGBcua5okTm0RgjtCJdZ HiaoWtYsKSlT54LZkudq6Ui/3AkDchImxx+IAtSOdmRiChM3YbyVERdkgobiq6JMkrYaZ8 BqTJ/C+dCoz3Zf+VQbtlvjwT+v/458pnY8nfbTd26kojEX6pTd4uCYJelKYOuZ60z/f4vg e9ir+Qw5tD+gvoxtKAZn3lhahSNT5oIxMMQr++dY2fbb4d6gqpi0XrfONZ1G4qL/hMgCUh an7MK1q6//1aNGY50gRYLoi3py34/BG5kKmx6t2w7ymftdvbEgEu62AHt1hgBg== 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 4f0vSs1Wfqz3vs for ; Tue, 27 Jan 2026 18:44:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 206cc by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 27 Jan 2026 18:44:13 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: c3688679ded5 - stable/14 - ctld: Fail UCL configurations with a nested error 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 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: c3688679ded592a35de9ed8ac1d576542c5ab02f Auto-Submitted: auto-generated Date: Tue, 27 Jan 2026 18:44:13 +0000 Message-Id: <6979077d.206cc.7be4aa0d@gitrepo.freebsd.org> The branch stable/14 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=c3688679ded592a35de9ed8ac1d576542c5ab02f commit c3688679ded592a35de9ed8ac1d576542c5ab02f Author: John Baldwin AuthorDate: 2025-02-26 15:11:07 +0000 Commit: John Baldwin CommitDate: 2026-01-27 18:15:57 +0000 ctld: Fail UCL configurations with a nested error Errors from auth groups, portal groups, global luns, and targets were not propagated out of the main loop. Sponsored by: Chelsio Communications Differential Revision: https://reviews.freebsd.org/D49071 (cherry picked from commit f3a43b3db881679d0b82b97f18871422050a5819) --- usr.sbin/ctld/uclparse.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/usr.sbin/ctld/uclparse.c b/usr.sbin/ctld/uclparse.c index f8f8954304fa..2dc4872bee84 100644 --- a/usr.sbin/ctld/uclparse.c +++ b/usr.sbin/ctld/uclparse.c @@ -336,7 +336,9 @@ uclparse_toplevel(const ucl_object_t *top) if (obj->type == UCL_OBJECT) { iter = NULL; while ((child = ucl_iterate_object(obj, &iter, true))) { - uclparse_auth_group(ucl_object_key(child), child); + if (!uclparse_auth_group( + ucl_object_key(child), child)) + return (false); } } else { log_warnx("\"auth-group\" section is not an object"); @@ -348,7 +350,9 @@ uclparse_toplevel(const ucl_object_t *top) if (obj->type == UCL_OBJECT) { iter = NULL; while ((child = ucl_iterate_object(obj, &iter, true))) { - uclparse_portal_group(ucl_object_key(child), child); + if (!uclparse_portal_group( + ucl_object_key(child), child)) + return (false); } } else { log_warnx("\"portal-group\" section is not an object"); @@ -360,7 +364,9 @@ uclparse_toplevel(const ucl_object_t *top) if (obj->type == UCL_OBJECT) { iter = NULL; while ((child = ucl_iterate_object(obj, &iter, true))) { - uclparse_lun(ucl_object_key(child), child); + if (!uclparse_lun(ucl_object_key(child), + child)) + return (false); } } else { log_warnx("\"lun\" section is not an object"); @@ -379,8 +385,9 @@ uclparse_toplevel(const ucl_object_t *top) iter = NULL; while ((child = ucl_iterate_object(obj, &iter, true))) { - uclparse_target(ucl_object_key(child), - child); + if (!uclparse_target( + ucl_object_key(child), child)) + return (false); } } else { log_warnx("\"target\" section is not an object");