diff options
| -rw-r--r-- | bin/ps/print.c | 4 | ||||
| -rw-r--r-- | bin/ps/ps.1 | 6 | ||||
| -rw-r--r-- | lib/libkvm/kvm_proc2.c | 3 | ||||
| -rw-r--r-- | sys/sys/sysctl.h | 5 |
4 files changed, 5 insertions, 13 deletions
diff --git a/bin/ps/print.c b/bin/ps/print.c index 4e49a7fc3c6..7b54ae7d13d 100644 --- a/bin/ps/print.c +++ b/bin/ps/print.c @@ -1,4 +1,4 @@ -/* $OpenBSD: print.c,v 1.80 2022/02/07 22:57:47 rob Exp $ */ +/* $OpenBSD: print.c,v 1.81 2022/02/14 18:09:08 rob Exp $ */ /* $NetBSD: print.c,v 1.27 1995/09/29 21:58:12 cgd Exp $ */ /*- @@ -289,8 +289,6 @@ printstate(const struct kinfo_proc *kp, VARENT *ve) else *cp++ = 'u'; } - if (kp->p_eflag & EPROC_CHROOT) - *cp++ = 'c'; *cp = '\0'; if (state == 'R' && kp->p_cpuid != KI_NOCPU) { diff --git a/bin/ps/ps.1 b/bin/ps/ps.1 index 55a6e9f3d70..4ada43512a4 100644 --- a/bin/ps/ps.1 +++ b/bin/ps/ps.1 @@ -1,4 +1,4 @@ -.\" $OpenBSD: ps.1,v 1.122 2022/02/07 22:57:47 rob Exp $ +.\" $OpenBSD: ps.1,v 1.123 2022/02/14 18:09:08 rob Exp $ .\" $NetBSD: ps.1,v 1.16 1996/03/21 01:36:28 jtc Exp $ .\" .\" Copyright (c) 1980, 1990, 1991, 1993, 1994 @@ -30,7 +30,7 @@ .\" .\" @(#)ps.1 8.3 (Berkeley) 4/18/94 .\" -.Dd $Mdocdate: February 7 2022 $ +.Dd $Mdocdate: February 14 2022 $ .Dt PS 1 .Os .Sh NAME @@ -451,8 +451,6 @@ swapped. .\" for example, .\" .Xr lisp 1 .\" in a garbage collect). -.It c -The process is chrooted. .It E The process is trying to exit. .It K diff --git a/lib/libkvm/kvm_proc2.c b/lib/libkvm/kvm_proc2.c index 2675b8f34f5..8928910f5af 100644 --- a/lib/libkvm/kvm_proc2.c +++ b/lib/libkvm/kvm_proc2.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kvm_proc2.c,v 1.36 2022/02/08 12:10:39 jsg Exp $ */ +/* $OpenBSD: kvm_proc2.c,v 1.37 2022/02/14 18:09:08 rob Exp $ */ /* $NetBSD: kvm_proc.c,v 1.30 1999/03/24 05:50:50 mrg Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -84,7 +84,6 @@ #include <sys/signalvar.h> #include <sys/pledge.h> #include <sys/wait.h> -#include <sys/filedesc.h> #include <stddef.h> #include <stdlib.h> #include <string.h> diff --git a/sys/sys/sysctl.h b/sys/sys/sysctl.h index 0f2cb6b5733..6e34020ea48 100644 --- a/sys/sys/sysctl.h +++ b/sys/sys/sysctl.h @@ -1,4 +1,4 @@ -/* $OpenBSD: sysctl.h,v 1.223 2022/02/07 22:57:47 rob Exp $ */ +/* $OpenBSD: sysctl.h,v 1.224 2022/02/14 18:09:08 rob Exp $ */ /* $NetBSD: sysctl.h,v 1.16 1996/04/09 20:55:36 cgd Exp $ */ /* @@ -382,7 +382,6 @@ struct kinfo_proc { #define EPROC_SLEADER 0x02 /* session leader */ #define EPROC_UNVEIL 0x04 /* has unveil settings */ #define EPROC_LKUNVEIL 0x08 /* unveil is locked */ -#define EPROC_CHROOT 0x10 /* chrooted */ int32_t p_exitsig; /* unused, always zero. */ int32_t p_flag; /* INT: P_* flags. */ @@ -655,8 +654,6 @@ do { \ strlcpy((kp)->p_login, (sess)->s_login, \ MIN(sizeof((kp)->p_login), sizeof((sess)->s_login))); \ \ - if ((pr)->ps_fd->fd_rdir != NULL) \ - (kp)->p_eflag |= EPROC_CHROOT; \ if ((sess)->s_ttyvp) \ (kp)->p_eflag |= EPROC_CTTY; \ if ((pr)->ps_uvpaths) \ |