Date: Thu, 23 Jun 2022 14:48:14 GMT From: Eugene Grosbein <eugen@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: 95144583f70b - main - adjkerntz(8): revert "detect extra jailed invokation to keep logs clean" Message-ID: <202206231448.25NEmEsC026108@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by eugen: URL: https://cgit.FreeBSD.org/src/commit/?id=95144583f70b91c33270c3eee7d682e39e210cae commit 95144583f70b91c33270c3eee7d682e39e210cae Author: Eugene Grosbein <eugen@FreeBSD.org> AuthorDate: 2022-06-23 14:46:08 +0000 Commit: Eugene Grosbein <eugen@FreeBSD.org> 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 <errno.h> #include <stdio.h> #include <signal.h> #include <stdlib.h> @@ -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; }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202206231448.25NEmEsC026108>