diff options
author | rwatson <rwatson@FreeBSD.org> | 2012-12-01 13:46:37 +0000 |
---|---|---|
committer | rwatson <rwatson@FreeBSD.org> | 2012-12-01 13:46:37 +0000 |
commit | 81b0e0a69f7f1dc223a50bd085c98f86bdf4b6e5 (patch) | |
tree | fd7265710e4a9cdb360fc16ecb93373701b93cd3 /sys/bsm | |
parent | 946ac5071e3d600a9df487c53b2cff2d10678a88 (diff) | |
download | FreeBSD-src-81b0e0a69f7f1dc223a50bd085c98f86bdf4b6e5.zip FreeBSD-src-81b0e0a69f7f1dc223a50bd085c98f86bdf4b6e5.tar.gz |
Merge OpenBSM 1.2-alpha2 changes from contrib/openbsm to
src/sys/{bsm,security/audit}. There are a few tweaks to help with the
FreeBSD build environment that will be merged back to OpenBSM. No
significant functional changes appear on the kernel side.
Obtained from: TrustedBSD Project
Sponsored by: The FreeBSD Foundation (auditdistd)
Diffstat (limited to 'sys/bsm')
-rw-r--r-- | sys/bsm/audit_errno.h | 2 | ||||
-rw-r--r-- | sys/bsm/audit_internal.h | 4 | ||||
-rw-r--r-- | sys/bsm/audit_record.h | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/sys/bsm/audit_errno.h b/sys/bsm/audit_errno.h index 8b78199..d5a375f 100644 --- a/sys/bsm/audit_errno.h +++ b/sys/bsm/audit_errno.h @@ -26,7 +26,7 @@ * 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_errno.h#5 + * P4: //depot/projects/trustedbsd/openbsm/sys/bsm/audit_errno.h#7 * $FreeBSD$ */ diff --git a/sys/bsm/audit_internal.h b/sys/bsm/audit_internal.h index b25c47f..8ba611f 100644 --- a/sys/bsm/audit_internal.h +++ b/sys/bsm/audit_internal.h @@ -15,7 +15,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. Neither the name of Apple Computer, Inc. ("Apple") nor the names of + * 3. Neither the name of Apple Inc. ("Apple") nor the names of * its contributors may be used to endorse or promote products derived * from this software without specific prior written permission. * @@ -30,7 +30,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_internal.h#5 + * P4: //depot/projects/trustedbsd/openbsm/sys/bsm/audit_internal.h#6 * $FreeBSD$ */ diff --git a/sys/bsm/audit_record.h b/sys/bsm/audit_record.h index 9d6be04..706c6f3 100644 --- a/sys/bsm/audit_record.h +++ b/sys/bsm/audit_record.h @@ -234,6 +234,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, @@ -279,6 +280,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); /* |