aboutsummaryrefslogtreecommitdiff
path: root/sys/bsm
diff options
context:
space:
mode:
authorChristian Brueffer <brueffer@FreeBSD.org>2015-12-20 23:22:04 +0000
committerChristian Brueffer <brueffer@FreeBSD.org>2015-12-20 23:22:04 +0000
commit8a0f5c0b6cad9aeeb8bd6177e2a13da949ce7643 (patch)
tree75cb6a380dd482c68ef41eeda4ce82861392ad16 /sys/bsm
parent59797edfd853475fc9a696557b9d5b57e78a177a (diff)
downloadsrc-8a0f5c0b6cad9aeeb8bd6177e2a13da949ce7643.tar.gz
src-8a0f5c0b6cad9aeeb8bd6177e2a13da949ce7643.zip
Merge from contrib/openbsm to bring the kernel audit bits up to date with OpenBSM 1.2 alpha 4:
- remove $P4$ - fix a comment
Notes
Notes: svn path=/head/; revision=292522
Diffstat (limited to 'sys/bsm')
-rw-r--r--sys/bsm/audit.h1
-rw-r--r--sys/bsm/audit_domain.h1
-rw-r--r--sys/bsm/audit_errno.h1
-rw-r--r--sys/bsm/audit_fcntl.h1
-rw-r--r--sys/bsm/audit_internal.h1
-rw-r--r--sys/bsm/audit_kevents.h3
-rw-r--r--sys/bsm/audit_record.h1
-rw-r--r--sys/bsm/audit_socket_type.h1
8 files changed, 1 insertions, 9 deletions
diff --git a/sys/bsm/audit.h b/sys/bsm/audit.h
index 625e816da5b6..078b333a3268 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 76cd38f93fe0..22d2966c34da 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 d5a375fc7f57..939ddeb6b01e 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 15b5f511473f..8b5f1a57800d 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 8ba611f587da..3ec98960a562 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 303d37ff80f2..3c16c739a749 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 5da5e4f295f4..b72236bc7b0e 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 6b6bac1b74c6..1f580fce050e 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$
*/