From nobody Thu Jul 21 14:27:38 2022 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 4LpZfM0h6vz4WlPF; Thu, 21 Jul 2022 14:27:39 +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 4LpZfM08Gnz44Dp; Thu, 21 Jul 2022 14:27:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658413659; 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=DAv6uexcxLWrbqEaYHS7gZSGjnKCNnoaViDR/2LcTpo=; b=UvYXOIbKzoC2yUIGoXcFPXAI2YFN723ipaX6p2So3+QYq+YK/zBdVVtoG8fPl5wdEcPkiI z+TT5dlbjxfV1LZokWA0ztXV3fKQ7JBtvOQe37ga2064EO3TdDlflYBpypFmrkyJi3SrQ/ ekJDLdO1DP4ZZHDsQiKkFbR/yx7u/90jgdIY5g2kd3q26YiDhEI1bzhg5UghWkkS8w7D2r zTM8XxqR7lw2mOIVKW3koTiDyGS8k4FnD8v18S52hbizodh1zY0AnD8CVhNXXgnNY6yyjG lXmMDcppnp4BQba5YL+aunmn0r/Y7CcpOpulkzc9t7MHJ8wvpzem6Zud7c13eg== 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 4LpZfL63LMzQBb; Thu, 21 Jul 2022 14:27:38 +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 26LERc2D056614; Thu, 21 Jul 2022 14:27:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 26LERcFC056613; Thu, 21 Jul 2022 14:27:38 GMT (envelope-from git) Date: Thu, 21 Jul 2022 14:27:38 GMT Message-Id: <202207211427.26LERcFC056613@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Allan Jude Subject: git: e89841f89318 - main - Revert "mac_ddb: Make db_show_vnet_valid() handle !VIMAGE" 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: allanjude X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e89841f893181fc2539b741418202ab3a2155eba Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658413659; 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=DAv6uexcxLWrbqEaYHS7gZSGjnKCNnoaViDR/2LcTpo=; b=tJpvASIn7vddxSg5xk3SEFb3mUtM+aw4EWJu8V2piT5Er6HwCi9QZ04r3QCSIcZL2Y2UoW 4D0LC2Sm7jSlMSbB0h6oAeyAmmVSLO5ENo06PyL6CGWAeyWm2OALyNSQz2R3JULJ1l7SQO RyovKqJGiZrLE4qTzyJeCNDc+si22QcmEjiCM2v+q5ctHv2JPL/J43xvfCAAlVUvjXhQ0B 8kCTYFa2/aWiKRJxpz70E1ljCQxKD3IMdv+97EdxIE/dCAeu0gVG/Q7gnRn5Mv7ds0KVBR ALTYvB5RRoggRBkhnwaHof+E2zWvfdmX8ztbKis/buFwVe92FLGaJr4aI/8WOw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1658413659; a=rsa-sha256; cv=none; b=BxcimvJTrVrkbhTT7FenwcI9NrtrEH3eWKuEbHruVU4QaDitErgbJgXusGwJBcYo4ZTOV0 w/QvEVI5pObXr2xf9KkQ1GikdVd/dAKD1CaDfjcAHFdvbcwiNRNgx1fhtGJksXSYSX0GIm TzhKD7L/Uvfw8m5Ql3A0foMQMjBSp6AFRy5DOpeAfqFjDsiaA89FKmex3ihtyZTTprC4+p rg/Aw+BxR2nKR3xG3koU6EdzAH/OpAuZrQ0MGzSZxDNGRoY7RBO1Vq+KMWCq99PncqK3Yi bXlQqpWZI7Uwln8QsuKOwAA1ddhi54wrNZNikTR9BAPnzajBzBqraV63Q3yQeA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by allanjude: URL: https://cgit.FreeBSD.org/src/commit/?id=e89841f893181fc2539b741418202ab3a2155eba commit e89841f893181fc2539b741418202ab3a2155eba Author: Allan Jude AuthorDate: 2022-07-21 14:26:54 +0000 Commit: Allan Jude CommitDate: 2022-07-21 14:26:54 +0000 Revert "mac_ddb: Make db_show_vnet_valid() handle !VIMAGE" jhb@ already fixed this in a different way Reported by: andrew This reverts commit 3810b37903220af1a369d3c4032ae25fb2d7949d. --- sys/security/mac_ddb/mac_ddb.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/sys/security/mac_ddb/mac_ddb.c b/sys/security/mac_ddb/mac_ddb.c index 8f2f0d78bb07..847be4997226 100644 --- a/sys/security/mac_ddb/mac_ddb.c +++ b/sys/security/mac_ddb/mac_ddb.c @@ -196,7 +196,6 @@ db_show_rman_valid(db_expr_t addr, bool have_addr, db_expr_t count, char *modif) static int db_show_vnet_valid(db_expr_t addr, bool have_addr, db_expr_t count, char *modif) { -#ifdef VIMAGE VNET_ITERATOR_DECL(vnet); if (!have_addr) @@ -208,9 +207,6 @@ db_show_vnet_valid(db_expr_t addr, bool have_addr, db_expr_t count, char *modif) } return (EACCES); -#else - return (EOPNOTSUPP); -#endif } #endif