From e484af13ede6ab7afcf1382fc78d60fe54679bfa Mon Sep 17 00:00:00 2001 From: Robert Watson Date: Sun, 24 Aug 2008 21:20:35 +0000 Subject: [PATCH] When MPSAFE ttys were merged, a new BSM audit event identifier was allocated for posix_openpt(2). Unfortunately, that identifier conflicts with other events already allocated to other systems in OpenBSM. Assign a new globally unique identifier and conform better to the AUE_ event naming scheme. This is a stopgap until a new OpenBSM import is done with the correct identifier, so we'll maintain this as a local diff in svn until then. Discussed with: ed Obtained from: TrustedBSD Project --- sys/bsm/audit_kevents.h | 2 +- sys/compat/freebsd32/syscalls.master | 2 +- sys/kern/syscalls.master | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/bsm/audit_kevents.h b/sys/bsm/audit_kevents.h index c53843136f0..6e073d47fe7 100644 --- a/sys/bsm/audit_kevents.h +++ b/sys/bsm/audit_kevents.h @@ -548,7 +548,7 @@ #define AUE_MKNODAT 43150 /* FreeBSD. */ #define AUE_READLINKAT 43151 /* FreeBSD. */ #define AUE_SYMLINKAT 43152 /* FreeBSD. */ -#define AUE_POSIXOPENPT 43153 /* FreeBSD. */ +#define AUE_POSIX_OPENPT 43185 /* FreeBSD. */ /* * Darwin BSM uses a number of AUE_O_* definitions, which are aliased to the diff --git a/sys/compat/freebsd32/syscalls.master b/sys/compat/freebsd32/syscalls.master index b9dd19972f1..443c84bea0a 100644 --- a/sys/compat/freebsd32/syscalls.master +++ b/sys/compat/freebsd32/syscalls.master @@ -853,4 +853,4 @@ char *path2); } 503 AUE_UNLINKAT NOPROTO { int unlinkat(int fd, char *path, \ int flag); } -504 AUE_POSIXOPENPT NOPROTO { int posix_openpt(int flags); } +504 AUE_POSIX_OPENPT NOPROTO { int posix_openpt(int flags); } diff --git a/sys/kern/syscalls.master b/sys/kern/syscalls.master index 59c92d880cc..3bbe2e6cbca 100644 --- a/sys/kern/syscalls.master +++ b/sys/kern/syscalls.master @@ -894,6 +894,6 @@ 502 AUE_SYMLINKAT STD { int symlinkat(char *path1, int fd, \ char *path2); } 503 AUE_UNLINKAT STD { int unlinkat(int fd, char *path, int flag); } -504 AUE_POSIXOPENPT STD { int posix_openpt(int flags); } +504 AUE_POSIX_OPENPT STD { int posix_openpt(int flags); } ; Please copy any additions and changes to the following compatability tables: ; sys/compat/freebsd32/syscalls.master