From nobody Fri Jan 24 14:54:42 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 4Yfgnv3Jylz5lVxp; Fri, 24 Jan 2025 14:54:43 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Yfgnt6fVqz3dHS; Fri, 24 Jan 2025 14:54:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737730482; 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=1R3oMGrJ2Lf5qc+tYhrTLRgS1/OG4rwdKxWjdYo6iOs=; b=kLTKho28GaeUCn+nuVf4V7Byvrc8H/cP2VESjMH7dG3nLSmHJHTTZJQaoTPP7ftJHN/Nf5 wfrhkNncCSYvLSaqlGqFKVkf7nNuxPnqSH5m0TnB/SVdabnteUj9UqFGwUSDvLylXCQzKP +N/pTmhz4uBfWZUtT76sN6BwkGcFPij/o5xeWSwcji0SK4oZRgAUE8qmd+tqqGv5St4jfK DK97FzRdFKNqoZ2A5YthYP/6AjmaipCdVBcvSKh5gNEnFFjIO8UlByjWLhx5Q91xZVYw20 EhKpSC2HG6IqfnCqlaOLN24QwtLl0jcPmKePEW7+8vJcgreU18wz6mx23Ev0KA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737730482; 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=1R3oMGrJ2Lf5qc+tYhrTLRgS1/OG4rwdKxWjdYo6iOs=; b=PAXDaQ9hYBao5XSHsR+18W2hp1zYQZqUR/iuZiHTd0/Jyq0lHxkv0/ZgOAfeKWv5jGMRkO ua7+f8IyxxEUjn0bFk5e49L+hbr205EnzexuGnyz7Rw9cA4p7u7bwjzLFrrXnbGeBFTLwX N8ecZJTNhBu/t8ufn2H4B4lqWk7yewvdM2QKUSuvN/gQT42dVe2Kzvr+Lh/8lmuzXdGHV2 WeX7xbYx3P+Woy8Pf0NP499X5TtEVzRmDJro3UYHxd4F+9zzKLnmfJAUhar/rqP8ocqrPe JCVovJxJOkCgRukGg8hfVV8ihQ/42qoW8Y1SA2hbSgEYMOcp+nCAMkH2yKvctg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1737730482; a=rsa-sha256; cv=none; b=V2maALaeu5MdTsYpEa+ZcrYMtVhdKTlqD+vp16/p8vBa1YraEjTZqYxivTYbQK6AOgSySe T3oqcSZYhtCP7fYKTw4s/lWbkT/AlDqJdVDv6JmOVzwowhu/9jqO0gCiGcMWHeaQzAfTSy G9YsZNMcHxO012iHHuqVygio/adAPldS/tpqWTQfRNJ0YKYprvis3i0IK6AJeaLJuKvZMc butnfi78ty4aln5CHuPXZG2cMqiHXWa2XU/AwbR3LDBTCs1SKYmkaCzssePI2Rb+s0HLSy XdbgB/ZjKMZOCTG/5BCttGPSF8A9VCchwUcCCMZBhYL2cUruMOkXyhWXdwwGBw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4Yfgnt6CSjzTt2; Fri, 24 Jan 2025 14:54:42 +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 50OEsgLt043819; Fri, 24 Jan 2025 14:54:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50OEsgkp043816; Fri, 24 Jan 2025 14:54:42 GMT (envelope-from git) Date: Fri, 24 Jan 2025 14:54:42 GMT Message-Id: <202501241454.50OEsgkp043816@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: ca81304f7cbe - main - ctld: Fix assertion against the wrong field 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: ca81304f7cbe033be802e3e2ef12378a61fe2175 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=ca81304f7cbe033be802e3e2ef12378a61fe2175 commit ca81304f7cbe033be802e3e2ef12378a61fe2175 Author: John Baldwin AuthorDate: 2025-01-24 14:53:44 +0000 Commit: John Baldwin CommitDate: 2025-01-24 14:53:44 +0000 ctld: Fix assertion against the wrong field Reviewed by: mav, imp, asomers Sponsored by: Chelsio Communications Differential Revision: https://reviews.freebsd.org/D48622 --- usr.sbin/ctld/discovery.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/ctld/discovery.c b/usr.sbin/ctld/discovery.c index f548b41d5cba..09613284f881 100644 --- a/usr.sbin/ctld/discovery.c +++ b/usr.sbin/ctld/discovery.c @@ -161,7 +161,7 @@ discovery_target_filtered_out(const struct ctld_connection *conn, ag = targ->t_auth_group; pg = conn->conn_portal->p_portal_group; - assert(pg->pg_discovery_auth_group != PG_FILTER_UNKNOWN); + assert(pg->pg_discovery_filter != PG_FILTER_UNKNOWN); if (pg->pg_discovery_filter >= PG_FILTER_PORTAL && auth_portal_check(ag, &conn->conn_initiator_sa) != 0) {