diff options
| author | Robert Watson <rwatson@FreeBSD.org> | 2012-12-15 13:27:45 +0000 |
|---|---|---|
| committer | Robert Watson <rwatson@FreeBSD.org> | 2012-12-15 13:27:45 +0000 |
| commit | 911ea853e570be4aaaec9076b1240d857525432c (patch) | |
| tree | 956cb5a3cb0928432cd20bdfce4e38d0492cefaf /sys | |
| parent | 399d3f65db6c7d2b9e9f56ec3062b520d8e0e433 (diff) | |
| download | src-911ea853e570be4aaaec9076b1240d857525432c.tar.gz src-911ea853e570be4aaaec9076b1240d857525432c.zip | |
Vendor import of OpenBSM 1.2-alpha3. This eliminates most local patchesvendor/openbsm/1.2-ALPHA-3
made relative to OpenBSM 1.2-alpha2 in order to build OpenBSM as part of
the FreeBSD base.
Obtained from: TrustedBSD Project
Notes
Notes:
svn path=/vendor/openbsm/dist/; revision=244256
svn path=/vendor/openbsm/1.2-ALPHA-3/; revision=244257; tag=vendor/openbsm/1.2-ALPHA-3
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/bsm/audit_kevents.h | 3 | ||||
| -rw-r--r-- | sys/bsm/audit_record.h | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/sys/bsm/audit_kevents.h b/sys/bsm/audit_kevents.h index db7fc941de41..94e42ab2eb83 100644 --- a/sys/bsm/audit_kevents.h +++ b/sys/bsm/audit_kevents.h @@ -26,7 +26,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. * - * $P4: //depot/projects/trustedbsd/openbsm/sys/bsm/audit_kevents.h#9 $ + * $P4: //depot/projects/trustedbsd/openbsm/sys/bsm/audit_kevents.h#10 $ */ #ifndef _BSM_AUDIT_KEVENTS_H_ @@ -601,6 +601,7 @@ #define AUE_PDKILL 43198 /* FreeBSD. */ #define AUE_PDGETPID 43199 /* FreeBSD. */ #define AUE_PDWAIT 43200 /* FreeBSD. */ +#define AUE_WAIT6 43201 /* FreeBSD. */ /* * Darwin BSM uses a number of AUE_O_* definitions, which are aliased to the diff --git a/sys/bsm/audit_record.h b/sys/bsm/audit_record.h index f8dced869f4f..2a49cdc6ec56 100644 --- a/sys/bsm/audit_record.h +++ b/sys/bsm/audit_record.h @@ -26,7 +26,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. * - * $P4: //depot/projects/trustedbsd/openbsm/sys/bsm/audit_record.h#10 $ + * $P4: //depot/projects/trustedbsd/openbsm/sys/bsm/audit_record.h#12 $ */ #ifndef _BSM_AUDIT_RECORD_H_ @@ -233,6 +233,7 @@ token_t *au_to_ipc_perm(struct ipc_perm *perm); token_t *au_to_iport(uint16_t iport); token_t *au_to_opaque(const char *data, uint16_t bytes); token_t *au_to_path(const char *path); +token_t *au_to_privset(char *privtypestr, char *privstr); token_t *au_to_process(au_id_t auid, uid_t euid, gid_t egid, uid_t ruid, gid_t rgid, pid_t pid, au_asid_t sid, au_tid_t *tid); token_t *au_to_process32(au_id_t auid, uid_t euid, gid_t egid, uid_t ruid, @@ -278,6 +279,7 @@ token_t *au_to_exec_env(char **envp); token_t *au_to_text(const char *text); token_t *au_to_kevent(struct kevent *kev); token_t *au_to_trailer(int rec_size); +token_t *au_to_upriv(char sorf, char *priv); token_t *au_to_zonename(const char *zonename); /* |