From 67b6951f3f28a27dc33f0a7982e011b817c5aca7 Mon Sep 17 00:00:00 2001 From: rob Date: Mon, 7 Feb 2022 13:17:27 +0000 Subject: [PATCH] Sync ps.1 with sys/proc.h. Tweaked by deraadt@. Ok millert@ deraadt@ --- bin/ps/ps.1 | 7 +++++-- sys/sys/proc.h | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/bin/ps/ps.1 b/bin/ps/ps.1 index f66148333d0..2105a156abc 100644 --- a/bin/ps/ps.1 +++ b/bin/ps/ps.1 @@ -1,4 +1,4 @@ -.\" $OpenBSD: ps.1,v 1.119 2022/01/05 04:10:36 guenther Exp $ +.\" $OpenBSD: ps.1,v 1.120 2022/02/07 13:17:27 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: January 5 2022 $ +.Dd $Mdocdate: February 7 2022 $ .Dt PS 1 .Os .Sh NAME @@ -345,6 +345,9 @@ PS_EMBRYO 0x20000 New process, not yet fledged PS_ZOMBIE 0x40000 Dead and ready to be waited for PS_NOBROADCASTKILL 0x80000 Process excluded from kill -1 PS_PLEDGE 0x100000 process has called pledge(2) +PS_WXNEEDED 0x00200000 /* Process is allowed to violate W^X */ +PS_EXECPLEDGE 0x00400000 /* Has exec pledges */ +PS_ORPHAN 0x00800000 /* Process is on an orphan list */ .Ed .It Cm re Core residency time (in seconds; 127 = infinity). diff --git a/sys/sys/proc.h b/sys/sys/proc.h index 112b3c6647f..9502de3ac99 100644 --- a/sys/sys/proc.h +++ b/sys/sys/proc.h @@ -1,4 +1,4 @@ -/* $OpenBSD: proc.h,v 1.323 2021/12/10 05:34:42 guenther Exp $ */ +/* $OpenBSD: proc.h,v 1.324 2022/02/07 13:17:27 rob Exp $ */ /* $NetBSD: proc.h,v 1.44 1996/04/22 01:23:21 christos Exp $ */ /*- @@ -274,7 +274,7 @@ struct process { #define PS_ZOMBIE 0x00040000 /* Dead and ready to be waited for */ #define PS_NOBROADCASTKILL 0x00080000 /* Process excluded from kill -1. */ #define PS_PLEDGE 0x00100000 /* Has called pledge(2) */ -#define PS_WXNEEDED 0x00200000 /* Process may violate W^X */ +#define PS_WXNEEDED 0x00200000 /* Process is allowed to violate W^X */ #define PS_EXECPLEDGE 0x00400000 /* Has exec pledges */ #define PS_ORPHAN 0x00800000 /* Process is on an orphan list */ -- 2.20.1