diff options
author | brueffer <brueffer@FreeBSD.org> | 2016-01-04 16:51:56 +0000 |
---|---|---|
committer | brueffer <brueffer@FreeBSD.org> | 2016-01-04 16:51:56 +0000 |
commit | 83a7c6a86d86bd25e5d651dd0114bc533e6bbfec (patch) | |
tree | 80d5c4bc3e5a8b4100f8acaefc84fd9acd3dfb08 /sys/bsm | |
parent | 6360716a3a74e75bf63f9bcd3e28110eac21a081 (diff) | |
download | FreeBSD-src-83a7c6a86d86bd25e5d651dd0114bc533e6bbfec.zip FreeBSD-src-83a7c6a86d86bd25e5d651dd0114bc533e6bbfec.tar.gz |
MFH: r292522
Merge from contrib/openbsm to bring the kernel audit bits up to date with OpenBSM 1.2 alpha 4:
- remove $P4$
- fix a comment
Diffstat (limited to 'sys/bsm')
-rw-r--r-- | sys/bsm/audit.h | 1 | ||||
-rw-r--r-- | sys/bsm/audit_domain.h | 1 | ||||
-rw-r--r-- | sys/bsm/audit_errno.h | 1 | ||||
-rw-r--r-- | sys/bsm/audit_fcntl.h | 1 | ||||
-rw-r--r-- | sys/bsm/audit_internal.h | 1 | ||||
-rw-r--r-- | sys/bsm/audit_kevents.h | 3 | ||||
-rw-r--r-- | sys/bsm/audit_record.h | 1 | ||||
-rw-r--r-- | sys/bsm/audit_socket_type.h | 1 |
8 files changed, 1 insertions, 9 deletions
diff --git a/sys/bsm/audit.h b/sys/bsm/audit.h index 625e816..078b333 100644 --- a/sys/bsm/audit.h +++ b/sys/bsm/audit.h @@ -26,7 +26,6 @@ * (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.h#10 * $FreeBSD$ */ diff --git a/sys/bsm/audit_domain.h b/sys/bsm/audit_domain.h index 76cd38f..22d2966 100644 --- a/sys/bsm/audit_domain.h +++ b/sys/bsm/audit_domain.h @@ -26,7 +26,6 @@ * 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_domain.h#2 * $FreeBSD$ */ diff --git a/sys/bsm/audit_errno.h b/sys/bsm/audit_errno.h index d5a375f..939ddeb 100644 --- a/sys/bsm/audit_errno.h +++ b/sys/bsm/audit_errno.h @@ -26,7 +26,6 @@ * 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#7 * $FreeBSD$ */ diff --git a/sys/bsm/audit_fcntl.h b/sys/bsm/audit_fcntl.h index 15b5f51..8b5f1a5 100644 --- a/sys/bsm/audit_fcntl.h +++ b/sys/bsm/audit_fcntl.h @@ -26,7 +26,6 @@ * 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_fcntl.h#2 * $FreeBSD$ */ diff --git a/sys/bsm/audit_internal.h b/sys/bsm/audit_internal.h index 8ba611f..3ec9896 100644 --- a/sys/bsm/audit_internal.h +++ b/sys/bsm/audit_internal.h @@ -30,7 +30,6 @@ * (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#6 * $FreeBSD$ */ diff --git a/sys/bsm/audit_kevents.h b/sys/bsm/audit_kevents.h index 303d37f..3c16c73 100644 --- a/sys/bsm/audit_kevents.h +++ b/sys/bsm/audit_kevents.h @@ -26,7 +26,6 @@ * (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#7 * $FreeBSD$ */ @@ -34,7 +33,7 @@ #define _BSM_AUDIT_KEVENTS_H_ /* - * The reserved event numbers for kernel events are 1...2047 and 43001..44900. + * The reserved event numbers for kernel events are 1...2047 and 43001..44999. */ #define AUE_IS_A_KEVENT(e) (((e) > 0 && (e) < 2048) || \ ((e) > 43000 && (e) < 45000)) diff --git a/sys/bsm/audit_record.h b/sys/bsm/audit_record.h index 7e6074f..63c5f50 100644 --- a/sys/bsm/audit_record.h +++ b/sys/bsm/audit_record.h @@ -26,7 +26,6 @@ * (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 * $FreeBSD$ */ diff --git a/sys/bsm/audit_socket_type.h b/sys/bsm/audit_socket_type.h index 6b6bac1..1f580fc 100644 --- a/sys/bsm/audit_socket_type.h +++ b/sys/bsm/audit_socket_type.h @@ -26,7 +26,6 @@ * 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_socket_type.h#1 * $FreeBSD$ */ |