From nobody Thu Jun 23 14:48:14 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 1ECAB878CD2; Thu, 23 Jun 2022 14:48:15 +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 4LTNR30Jdtz4hvv; Thu, 23 Jun 2022 14:48:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655995695; 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=VDhkAVMDCaJ5r11rgEg+cj8N89WrlirNLBe3dojClkw=; b=fH6RX/iPksHuFJ/rZSsj++T2yd62KebtDz3JnY/EpaIPMBzzdy7CLBheSQKCu/h6vx0dKY sxvk7xJMQP8G9Jm2KEp/yJKC8aVWpEDDadbSAbRSSO8fQABXEkLvPTOcIxQOKOyTi01B5/ hJYaNri5ERRr578tEXqwBw9AGaZxfbgOKTNOCdNUvT5x8pqyAIe9hE36rRNH+yB1En//aN pVmZ65rRgYVg5lJq8R0D74rzZqM2wadz/pBFM0nvUWwlJMm7dgx3XPxvFxXpQGzZIhShQ0 um7zNrNcfuUtXavibVApy58NNzP9cYGlTvVHt1cSsbaXQG18dypuXrFgBI2hfg== 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 DEEF11D016; Thu, 23 Jun 2022 14:48:14 +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 25NEmEcH026109; Thu, 23 Jun 2022 14:48:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25NEmEsC026108; Thu, 23 Jun 2022 14:48:14 GMT (envelope-from git) Date: Thu, 23 Jun 2022 14:48:14 GMT Message-Id: <202206231448.25NEmEsC026108@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Eugene Grosbein Subject: git: 95144583f70b - main - adjkerntz(8): revert "detect extra jailed invokation to keep logs clean" 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: eugen X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 95144583f70b91c33270c3eee7d682e39e210cae Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655995695; 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=VDhkAVMDCaJ5r11rgEg+cj8N89WrlirNLBe3dojClkw=; b=jy1/Mmq75rs8TSGzvgi8VaWmSiytuGaHVgZOtfNRh6TxS/7mLvqwTk7s7PlXH3jfm0yNRZ v82NFcnMWn/d345lAlA4vcyoEgniXzs+AYCAWGBonlRCWe7DdkiPIIo4pwERUBFDYIGb7w Cu8WMHDSaCRnB9skSmXOQomoQz8awINqZiCCyJKLcKgMb2ueiAcIvwDdcp/Lx5nUQtFg2M 6jVgL2tSZdEJ11Mwrl6ux6u4jCV+3NO01niv4KGxFzs5+2DKcFfLPSzQmi1v2e7TvfHava CyfynWtJKP/RF8WwRHTpAtoGZviE2u/sw4CyXHCYq1iT8hduluQa20mPZGiwtA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1655995695; a=rsa-sha256; cv=none; b=n6CtiZv6VjOpXDNrOjYfUd0DutxKMThFQMl8ygo2pA6J9Yl1pzgL0h65Ie6a2krMZ2RVBI FdIw6ipkSa6x4I+eYlZc16zPGt0fo51IcXhlKT7lB4aOmM+ldswmhfFX90MW0/1eHYQhEz uOSCDFMdPKXPAtWGJ7NU6AovaR6El6Y0uqIyFI8F8FfY/ottc7gF5jf0uuBrdrRrhp5uy8 CCLtao/ol1UzJELGGtAHMhEyowDSxOqhlr2xmUV606YorWiGlTgQvX1YRjDdU9o4yy7KD3 fcbxLA9ot0ILlW4+piT1VC5U/CbdQbf+Ye0Oc+XCebaClbEbTnqusVsKYTgwMQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by eugen: URL: https://cgit.FreeBSD.org/src/commit/?id=95144583f70b91c33270c3eee7d682e39e210cae commit 95144583f70b91c33270c3eee7d682e39e210cae Author: Eugene Grosbein AuthorDate: 2022-06-23 14:46:08 +0000 Commit: Eugene Grosbein CommitDate: 2022-06-23 14:46:08 +0000 adjkerntz(8): revert "detect extra jailed invokation to keep logs clean" This reverts commit 048ce0876f5421f70a6d348479bdeacdd8472bed due to bugs. Reworked change will be committed later hopefully. --- sbin/adjkerntz/adjkerntz.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/sbin/adjkerntz/adjkerntz.c b/sbin/adjkerntz/adjkerntz.c index 2fde545ebf32..e6cadcf7f189 100644 --- a/sbin/adjkerntz/adjkerntz.c +++ b/sbin/adjkerntz/adjkerntz.c @@ -46,7 +46,6 @@ __FBSDID("$FreeBSD$"); * with Garrett Wollman and Bruce Evans fixes. * */ -#include #include #include #include @@ -160,12 +159,6 @@ again: len = sizeof(kern_offset); if (sysctlbyname("machdep.adjkerntz", &kern_offset, &len, NULL, 0) == -1) { - if (errno == EPERM && !init && geteuid() == 0) - /* - * Surplus call from jailed root crontab. - * Avoid spamming logs. - */ - return 1; syslog(LOG_ERR, "sysctl(\"machdep.adjkerntz\"): %m"); return 1; }