svn commit: r292522 - in head/sys: bsm security/audit
Christian Brueffer
brueffer at FreeBSD.org
Sun Dec 20 23:22:07 UTC 2015
Author: brueffer
Date: Sun Dec 20 23:22:04 2015
New Revision: 292522
URL: https://svnweb.freebsd.org/changeset/base/292522
Log:
Merge from contrib/openbsm to bring the kernel audit bits up to date with OpenBSM 1.2 alpha 4:
- remove $P4$
- fix a comment
Modified:
head/sys/bsm/audit.h
head/sys/bsm/audit_domain.h
head/sys/bsm/audit_errno.h
head/sys/bsm/audit_fcntl.h
head/sys/bsm/audit_internal.h
head/sys/bsm/audit_kevents.h
head/sys/bsm/audit_record.h
head/sys/bsm/audit_socket_type.h
head/sys/security/audit/bsm_domain.c
head/sys/security/audit/bsm_errno.c
head/sys/security/audit/bsm_fcntl.c
head/sys/security/audit/bsm_socket_type.c
head/sys/security/audit/bsm_token.c
Modified: head/sys/bsm/audit.h
==============================================================================
--- head/sys/bsm/audit.h Sun Dec 20 23:05:20 2015 (r292521)
+++ head/sys/bsm/audit.h Sun Dec 20 23:22:04 2015 (r292522)
@@ -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$
*/
Modified: head/sys/bsm/audit_domain.h
==============================================================================
--- head/sys/bsm/audit_domain.h Sun Dec 20 23:05:20 2015 (r292521)
+++ head/sys/bsm/audit_domain.h Sun Dec 20 23:22:04 2015 (r292522)
@@ -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$
*/
Modified: head/sys/bsm/audit_errno.h
==============================================================================
--- head/sys/bsm/audit_errno.h Sun Dec 20 23:05:20 2015 (r292521)
+++ head/sys/bsm/audit_errno.h Sun Dec 20 23:22:04 2015 (r292522)
@@ -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$
*/
Modified: head/sys/bsm/audit_fcntl.h
==============================================================================
--- head/sys/bsm/audit_fcntl.h Sun Dec 20 23:05:20 2015 (r292521)
+++ head/sys/bsm/audit_fcntl.h Sun Dec 20 23:22:04 2015 (r292522)
@@ -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$
*/
Modified: head/sys/bsm/audit_internal.h
==============================================================================
--- head/sys/bsm/audit_internal.h Sun Dec 20 23:05:20 2015 (r292521)
+++ head/sys/bsm/audit_internal.h Sun Dec 20 23:22:04 2015 (r292522)
@@ -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$
*/
Modified: head/sys/bsm/audit_kevents.h
==============================================================================
--- head/sys/bsm/audit_kevents.h Sun Dec 20 23:05:20 2015 (r292521)
+++ head/sys/bsm/audit_kevents.h Sun Dec 20 23:22:04 2015 (r292522)
@@ -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))
Modified: head/sys/bsm/audit_record.h
==============================================================================
--- head/sys/bsm/audit_record.h Sun Dec 20 23:05:20 2015 (r292521)
+++ head/sys/bsm/audit_record.h Sun Dec 20 23:22:04 2015 (r292522)
@@ -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$
*/
Modified: head/sys/bsm/audit_socket_type.h
==============================================================================
--- head/sys/bsm/audit_socket_type.h Sun Dec 20 23:05:20 2015 (r292521)
+++ head/sys/bsm/audit_socket_type.h Sun Dec 20 23:22:04 2015 (r292522)
@@ -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$
*/
Modified: head/sys/security/audit/bsm_domain.c
==============================================================================
--- head/sys/security/audit/bsm_domain.c Sun Dec 20 23:05:20 2015 (r292521)
+++ head/sys/security/audit/bsm_domain.c Sun Dec 20 23:22:04 2015 (r292522)
@@ -25,8 +25,6 @@
* STRICT LIABILITY, OR TORT (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/libbsm/bsm_domain.c#3
*/
#include <sys/cdefs.h>
Modified: head/sys/security/audit/bsm_errno.c
==============================================================================
--- head/sys/security/audit/bsm_errno.c Sun Dec 20 23:05:20 2015 (r292521)
+++ head/sys/security/audit/bsm_errno.c Sun Dec 20 23:22:04 2015 (r292522)
@@ -25,8 +25,6 @@
* STRICT LIABILITY, OR TORT (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/libbsm/bsm_errno.c#22
*/
#include <sys/cdefs.h>
Modified: head/sys/security/audit/bsm_fcntl.c
==============================================================================
--- head/sys/security/audit/bsm_fcntl.c Sun Dec 20 23:05:20 2015 (r292521)
+++ head/sys/security/audit/bsm_fcntl.c Sun Dec 20 23:22:04 2015 (r292522)
@@ -25,8 +25,6 @@
* STRICT LIABILITY, OR TORT (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/libbsm/bsm_fcntl.c#2
*/
#include <sys/cdefs.h>
Modified: head/sys/security/audit/bsm_socket_type.c
==============================================================================
--- head/sys/security/audit/bsm_socket_type.c Sun Dec 20 23:05:20 2015 (r292521)
+++ head/sys/security/audit/bsm_socket_type.c Sun Dec 20 23:22:04 2015 (r292522)
@@ -25,8 +25,6 @@
* STRICT LIABILITY, OR TORT (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/libbsm/bsm_socket_type.c#1
*/
#include <sys/cdefs.h>
Modified: head/sys/security/audit/bsm_token.c
==============================================================================
--- head/sys/security/audit/bsm_token.c Sun Dec 20 23:05:20 2015 (r292521)
+++ head/sys/security/audit/bsm_token.c Sun Dec 20 23:22:04 2015 (r292522)
@@ -29,8 +29,6 @@
* STRICT LIABILITY, OR TORT (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/libbsm/bsm_token.c#99
*/
#include <sys/cdefs.h>
More information about the svn-src-head
mailing list