diff options
| author | Christian Brueffer <brueffer@FreeBSD.org> | 2015-12-20 23:22:04 +0000 |
|---|---|---|
| committer | Christian Brueffer <brueffer@FreeBSD.org> | 2015-12-20 23:22:04 +0000 |
| commit | 8a0f5c0b6cad9aeeb8bd6177e2a13da949ce7643 (patch) | |
| tree | 75cb6a380dd482c68ef41eeda4ce82861392ad16 /sys | |
| parent | 59797edfd853475fc9a696557b9d5b57e78a177a (diff) | |
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')
| -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 | ||||
| -rw-r--r-- | sys/security/audit/bsm_domain.c | 2 | ||||
| -rw-r--r-- | sys/security/audit/bsm_errno.c | 2 | ||||
| -rw-r--r-- | sys/security/audit/bsm_fcntl.c | 2 | ||||
| -rw-r--r-- | sys/security/audit/bsm_socket_type.c | 2 | ||||
| -rw-r--r-- | sys/security/audit/bsm_token.c | 2 |
13 files changed, 1 insertions, 19 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$ */ diff --git a/sys/security/audit/bsm_domain.c b/sys/security/audit/bsm_domain.c index cb5939fa1772..8119956f4fff 100644 --- a/sys/security/audit/bsm_domain.c +++ b/sys/security/audit/bsm_domain.c @@ -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> diff --git a/sys/security/audit/bsm_errno.c b/sys/security/audit/bsm_errno.c index e2e1961fee5a..bb746b5decb3 100644 --- a/sys/security/audit/bsm_errno.c +++ b/sys/security/audit/bsm_errno.c @@ -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> diff --git a/sys/security/audit/bsm_fcntl.c b/sys/security/audit/bsm_fcntl.c index 1e7e68f9127c..5d27a3ac28b1 100644 --- a/sys/security/audit/bsm_fcntl.c +++ b/sys/security/audit/bsm_fcntl.c @@ -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> diff --git a/sys/security/audit/bsm_socket_type.c b/sys/security/audit/bsm_socket_type.c index c049179e21b1..94c361c36e73 100644 --- a/sys/security/audit/bsm_socket_type.c +++ b/sys/security/audit/bsm_socket_type.c @@ -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> diff --git a/sys/security/audit/bsm_token.c b/sys/security/audit/bsm_token.c index 763d59721eb7..84f4fce43001 100644 --- a/sys/security/audit/bsm_token.c +++ b/sys/security/audit/bsm_token.c @@ -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> |