From owner-dev-commits-src-all@freebsd.org Tue Aug 31 03:04:27 2021 Return-Path: Delivered-To: dev-commits-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id E29756637A3; Tue, 31 Aug 2021 03:04:27 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4GzBqb4ZHHz3LxR; Tue, 31 Aug 2021 03:04:27 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 443181AB1; Tue, 31 Aug 2021 03:04:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 17V34RCc082488; Tue, 31 Aug 2021 03:04:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 17V34RXX082487; Tue, 31 Aug 2021 03:04:27 GMT (envelope-from git) Date: Tue, 31 Aug 2021 03:04:27 GMT Message-Id: <202108310304.17V34RXX082487@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ryan Stone Subject: git: 315bca194a14 - main - Fix an early return in ctld UCL parser MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rstone X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 315bca194a14f3b9ec683675bafa8d990d16bfaf Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 31 Aug 2021 03:04:28 -0000 The branch main has been updated by rstone: URL: https://cgit.FreeBSD.org/src/commit/?id=315bca194a14f3b9ec683675bafa8d990d16bfaf commit 315bca194a14f3b9ec683675bafa8d990d16bfaf Author: Ryan Stone AuthorDate: 2021-07-07 20:04:10 +0000 Commit: Ryan Stone CommitDate: 2021-08-31 02:59:33 +0000 Fix an early return in ctld UCL parser If the UCL ctld parser encountered a port that used the CTL ioctl device, it fell into a special case that had an erroneous early return. This caused all configuration in the target following the port attribute to be skipped. Fix this by replacing the return with a continue so that the rest of the config is parsed correctly. Sponsored by: Dell EMC Isilon MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D31703 Reviewed by: bapt --- usr.sbin/ctld/uclparse.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/ctld/uclparse.c b/usr.sbin/ctld/uclparse.c index b73e6b48b2f6..d02530d1b808 100644 --- a/usr.sbin/ctld/uclparse.c +++ b/usr.sbin/ctld/uclparse.c @@ -847,7 +847,7 @@ uclparse_target(const char *name, const ucl_object_t *top) return (1); } - return (0); + continue; } pp = pport_find(conf, value);