From nobody Wed Feb 26 15:15:49 2025 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 4Z2yj168qyz5qH8h; Wed, 26 Feb 2025 15:15:49 +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 4Z2yj13vVmz3P3X; Wed, 26 Feb 2025 15:15:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1740582949; 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=Q15F+E9iC+C7HGqtIVGv+PbJb2iEFJ9gEVdX3Fv5xiQ=; b=DFRTRyNeSYlSgKZIB+Vf91RyYJ833RoPYaAj3WRU2z1XZGqyMotUldVgnu5KGdOW0yvr0M teX/Ovf9MZITW8p9/Cwduqy+eTiawb2GrCpYCTrNVGH+elS5WIkvBkpt4sRZyjFW3oxksm t9j9Mmo/DreQiyAxi2wg4+IrRMbjMczDnDDbJ1pij2v3eq/asWETdziNELg1EqU2/iSFcX W0DoVouQ94P57SxlqHyUbUOUP5rcyXhICkd1EPcItcpa958w0tDgSS30eXGrpN2QHL6QEw oVxoNSGbX6OTuZjw1Y0eod1SNYoMdXZHmxqu2ELJcttL8dz4an+75S1o0W4udw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1740582949; a=rsa-sha256; cv=none; b=SoY9jgi49qmMY+j7D1xlP6IdDgEn0CScpMJPlQIxh9qD2aRPMsZ+ti/PuZkgMlNYJC8TWV dmjI7Gcd/ltONJbnYg22oydHABPUgbRKv2lGYbLFo7WjIdK4kkeLm1ADuEHTJvyDTXskwk 5vsQ4Pn4MctMFGLijsT/FLnecWRKG/w5wpE0iOulnvf0AUhreKxHSzMP7D3rQeQVMyZkV3 0WYhlDHHpituFJZVD7K9BFBnGAvRXAOv/x2QhRwjLIU3FPn4iZPV3ZdWHHLtho73/IQmlv pkFdqc64RfRGtDaS6/2EbcLcQwahsrOZYvWqBEetmioEuXS3FmGd+w+uXby+Jw== 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=1740582949; 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=Q15F+E9iC+C7HGqtIVGv+PbJb2iEFJ9gEVdX3Fv5xiQ=; b=lci+J4MzK/Mh7Sgw91Ed5I96JnvtzAcWDdXsKLsqyc33pVYal3DbFRiGErg2zQtd8R835z HVhK8D4c0emzFWveKDBnfZfuTkPB54txcbP18ZF9tlZr4P5gQzgWrEJvadT+rjI+zd78Mg PTnA0JmhyOSSmK/DWsGGNyBA7h8heNeuvpILgI2M5LxRKno8TCdqqAgRi495Ukpd++aEqp v9n+QnMHGeM2npcJiiIBHA568bHRzgZZsBicN6dH0vXOVvvziu0G9Gq3VHVYAQEV5BC4xq dCbSAYSPL2+xu3z2iYSChQ0dNdz78tvV8F8s700/CDRSc9zTzmV3iBbi4Y4GSw== 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 4Z2yj13HR2z1Gxn; Wed, 26 Feb 2025 15:15:49 +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 51QFFnlV033951; Wed, 26 Feb 2025 15:15:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51QFFnEb033948; Wed, 26 Feb 2025 15:15:49 GMT (envelope-from git) Date: Wed, 26 Feb 2025 15:15:49 GMT Message-Id: <202502261515.51QFFnEb033948@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: f3a43b3db881 - main - 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/main X-Git-Reftype: branch X-Git-Commit: f3a43b3db881679d0b82b97f18871422050a5819 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=f3a43b3db881679d0b82b97f18871422050a5819 commit f3a43b3db881679d0b82b97f18871422050a5819 Author: John Baldwin AuthorDate: 2025-02-26 15:11:07 +0000 Commit: John Baldwin CommitDate: 2025-02-26 15:11:07 +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 --- 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");