From nobody Fri Feb 25 19:07:54 2022 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 1B79819D6BE2; Fri, 25 Feb 2022 19:07:55 +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 4K4zn62tMRz3HdH; Fri, 25 Feb 2022 19:07:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645816074; 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=Ng/SrsVK6TTbWOXe0Hdj4Xu5RCm1uEH7gfgbnS+bM+E=; b=mGBKcXh2oTc7UbpSPYLhSEaQeuhrpU4wsrD0ThdhLnM0s8OzIHBI07cPmKKHSzHy5lmWVM XO8HTLfNNxvclY+sK9NeBaVH4gqt+3LF6dMxU4rV5neMs6PS1kLrdfG4RgCHggt1gaRk/y sPa4+7g4qLz3HG0Zk/MpZm7nFIPkzLTcVAg5WGkwISD6BUwrjbHzOqtUjgt5wN9gtUHLj7 0FZlRQ+bu9Z6QZByyBJ+V+Jk7W2ADlUtQZ5c8jXdxUumvucqcATkqqcgMzXrVDkoN8LNl/ xcTIzc3OLrknGmtTYL7P//ubYlSufK6e8oAqoiSChzC72neEfAi3zHNiNMEHfA== 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 3C1A624CF9; Fri, 25 Feb 2022 19:07:54 +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 21PJ7sYt060813; Fri, 25 Feb 2022 19:07:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21PJ7sps060812; Fri, 25 Feb 2022 19:07:54 GMT (envelope-from git) Date: Fri, 25 Feb 2022 19:07:54 GMT Message-Id: <202202251907.21PJ7sps060812@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ryan Stone Subject: git: e88dbe4f4672 - stable/13 - MFC 315bca194a14: 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org 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/stable/13 X-Git-Reftype: branch X-Git-Commit: e88dbe4f46721f8524de274a0f1e40a0fe6fe4f4 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645816074; 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=Ng/SrsVK6TTbWOXe0Hdj4Xu5RCm1uEH7gfgbnS+bM+E=; b=WHBKjfmrmt5dEdBfjexC52CjcBTdwtApurkbHqPYHWTkuyLjy1zObjGBhoyr15S6gXgSX2 ur5jePPT/As2SI3U22u2LdM8R+KMy+diKZUJ1KAcyIPCisTXa7WyqcPXJKqa3M4lDEX7pW aBGlQuGeePAuMTq46bF1cmBrKRT+F9ugVOez/4JMNUawXAYQjrhP9HaUQ3ill9ZcZ/mu0f 100IbaHNknNzmpQoEPgvYjzPrVTvltD9nPruRrOercxw3J84TrcMC1kI9acHDE5TlW/RKY 31TlNO+XrJJNSdCSl7JuEosx++MLgMD435oEoFCLspCKOwcFp53vWHO+c2zWAw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1645816074; a=rsa-sha256; cv=none; b=v76vMxchHgqXpDWaZ1FWxLjvMKcKkoJvwNkYNQthW0udfkTaHCFA2ZBeODgr9iJ8oLg+d1 Kyku3hNjF2CWqY6N4Rs3L1+4NR7bdOAY1Z8iRDmHFqR7Lj3A7pbkbj7wuKu/15r+6EeX8l /tQeHp16k/a1SC154cTTiGTYQdwPJPbr7YHzgc3NvAiV3qKwWF10cImSZdSkzFSibfFkDJ EKBkNSaDIcVURg0/SdBVkS3ghj9N9+IHRLVwyRAyAzVzAUd1xl+UMXPoF6+fedCZMaW/UZ pkgP1ypHj/xOfxW9gRB9FSURjYM4LnB6D/PeMV8+NTZ54HbLX38ZtKslXGpyRA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by rstone: URL: https://cgit.FreeBSD.org/src/commit/?id=e88dbe4f46721f8524de274a0f1e40a0fe6fe4f4 commit e88dbe4f46721f8524de274a0f1e40a0fe6fe4f4 Author: Ryan Stone AuthorDate: 2021-07-07 20:04:10 +0000 Commit: Ryan Stone CommitDate: 2022-02-25 19:06:46 +0000 MFC 315bca194a14: 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 (cherry picked from commit 315bca194a14f3b9ec683675bafa8d990d16bfaf) --- 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);