From 1cbf65cf520923e70534f49e91bed8eb6e1ce61e Mon Sep 17 00:00:00 2001 From: pgoyette Date: Tue, 8 Nov 2016 03:20:07 +0000 Subject: [PATCH] Merge changes from David H. Gutteridge in PR misc/51612 Thanks! --- usr.sbin/paxctl/paxctl.8 | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/usr.sbin/paxctl/paxctl.8 b/usr.sbin/paxctl/paxctl.8 index a479c4b28890..8f9d8091489c 100644 --- a/usr.sbin/paxctl/paxctl.8 +++ b/usr.sbin/paxctl/paxctl.8 @@ -1,4 +1,4 @@ -.\" $NetBSD: paxctl.8,v 1.14 2014/03/18 18:20:47 riastradh Exp $ +.\" $NetBSD: paxctl.8,v 1.15 2016/11/08 03:20:07 pgoyette Exp $ .\" .\" Copyright 2006 Elad Efrat .\" Copyright 2008 Christos Zoulas @@ -23,7 +23,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.Dd September 17, 2009 +.Dd November 7, 2016 .Dt PAXCTL 8 .Os .Sh NAME @@ -110,8 +110,9 @@ The utility currently uses .Xr elf 5 .Dq note -sections to mark executables as PaX Segvguard enabled. +sections to mark executables as having PaX flags enabled. This will be done using .Xr fileassoc 9 in the future so that we can control who does the marking and -not altering the binary file signature. +not altering the binary file signature. (Note this also means that +at present any flags set do not survive binary file upgrades.)