Author: brueffer
Date: Mon Jan  4 16:51:56 2016
New Revision: 293163
URL: https://svnweb.freebsd.org/changeset/base/293163

Log:
  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

Modified:
  stable/10/sys/bsm/audit.h
  stable/10/sys/bsm/audit_domain.h
  stable/10/sys/bsm/audit_errno.h
  stable/10/sys/bsm/audit_fcntl.h
  stable/10/sys/bsm/audit_internal.h
  stable/10/sys/bsm/audit_kevents.h
  stable/10/sys/bsm/audit_record.h
  stable/10/sys/bsm/audit_socket_type.h
  stable/10/sys/security/audit/bsm_domain.c
  stable/10/sys/security/audit/bsm_errno.c
  stable/10/sys/security/audit/bsm_fcntl.c
  stable/10/sys/security/audit/bsm_socket_type.c
  stable/10/sys/security/audit/bsm_token.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/bsm/audit.h
==============================================================================
--- stable/10/sys/bsm/audit.h   Mon Jan  4 16:33:54 2016        (r293162)
+++ stable/10/sys/bsm/audit.h   Mon Jan  4 16:51:56 2016        (r293163)
@@ -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: stable/10/sys/bsm/audit_domain.h
==============================================================================
--- stable/10/sys/bsm/audit_domain.h    Mon Jan  4 16:33:54 2016        
(r293162)
+++ stable/10/sys/bsm/audit_domain.h    Mon Jan  4 16:51:56 2016        
(r293163)
@@ -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: stable/10/sys/bsm/audit_errno.h
==============================================================================
--- stable/10/sys/bsm/audit_errno.h     Mon Jan  4 16:33:54 2016        
(r293162)
+++ stable/10/sys/bsm/audit_errno.h     Mon Jan  4 16:51:56 2016        
(r293163)
@@ -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: stable/10/sys/bsm/audit_fcntl.h
==============================================================================
--- stable/10/sys/bsm/audit_fcntl.h     Mon Jan  4 16:33:54 2016        
(r293162)
+++ stable/10/sys/bsm/audit_fcntl.h     Mon Jan  4 16:51:56 2016        
(r293163)
@@ -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: stable/10/sys/bsm/audit_internal.h
==============================================================================
--- stable/10/sys/bsm/audit_internal.h  Mon Jan  4 16:33:54 2016        
(r293162)
+++ stable/10/sys/bsm/audit_internal.h  Mon Jan  4 16:51:56 2016        
(r293163)
@@ -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: stable/10/sys/bsm/audit_kevents.h
==============================================================================
--- stable/10/sys/bsm/audit_kevents.h   Mon Jan  4 16:33:54 2016        
(r293162)
+++ stable/10/sys/bsm/audit_kevents.h   Mon Jan  4 16:51:56 2016        
(r293163)
@@ -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: stable/10/sys/bsm/audit_record.h
==============================================================================
--- stable/10/sys/bsm/audit_record.h    Mon Jan  4 16:33:54 2016        
(r293162)
+++ stable/10/sys/bsm/audit_record.h    Mon Jan  4 16:51:56 2016        
(r293163)
@@ -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: stable/10/sys/bsm/audit_socket_type.h
==============================================================================
--- stable/10/sys/bsm/audit_socket_type.h       Mon Jan  4 16:33:54 2016        
(r293162)
+++ stable/10/sys/bsm/audit_socket_type.h       Mon Jan  4 16:51:56 2016        
(r293163)
@@ -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: stable/10/sys/security/audit/bsm_domain.c
==============================================================================
--- stable/10/sys/security/audit/bsm_domain.c   Mon Jan  4 16:33:54 2016        
(r293162)
+++ stable/10/sys/security/audit/bsm_domain.c   Mon Jan  4 16:51:56 2016        
(r293163)
@@ -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: stable/10/sys/security/audit/bsm_errno.c
==============================================================================
--- stable/10/sys/security/audit/bsm_errno.c    Mon Jan  4 16:33:54 2016        
(r293162)
+++ stable/10/sys/security/audit/bsm_errno.c    Mon Jan  4 16:51:56 2016        
(r293163)
@@ -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: stable/10/sys/security/audit/bsm_fcntl.c
==============================================================================
--- stable/10/sys/security/audit/bsm_fcntl.c    Mon Jan  4 16:33:54 2016        
(r293162)
+++ stable/10/sys/security/audit/bsm_fcntl.c    Mon Jan  4 16:51:56 2016        
(r293163)
@@ -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: stable/10/sys/security/audit/bsm_socket_type.c
==============================================================================
--- stable/10/sys/security/audit/bsm_socket_type.c      Mon Jan  4 16:33:54 
2016        (r293162)
+++ stable/10/sys/security/audit/bsm_socket_type.c      Mon Jan  4 16:51:56 
2016        (r293163)
@@ -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: stable/10/sys/security/audit/bsm_token.c
==============================================================================
--- stable/10/sys/security/audit/bsm_token.c    Mon Jan  4 16:33:54 2016        
(r293162)
+++ stable/10/sys/security/audit/bsm_token.c    Mon Jan  4 16:51:56 2016        
(r293163)
@@ -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>
_______________________________________________
svn-src-stable-10@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to "svn-src-stable-10-unsubscr...@freebsd.org"

Reply via email to