[Midnightbsd-cvs] src [11166] trunk/contrib/openbsm: fixup
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Wed Jun 27 18:43:50 EDT 2018
Revision: 11166
http://svnweb.midnightbsd.org/src/?rev=11166
Author: laffer1
Date: 2018-06-27 18:43:50 -0400 (Wed, 27 Jun 2018)
Log Message:
-----------
fixup
Modified Paths:
--------------
trunk/contrib/openbsm/FREEBSD-upgrade
trunk/contrib/openbsm/INSTALL
trunk/contrib/openbsm/NEWS
trunk/contrib/openbsm/bin/auditd/audit_triggers.defs
trunk/contrib/openbsm/bin/auditd/auditd_control.defs
trunk/contrib/openbsm/bin/auditd/auditd_darwin.c
trunk/contrib/openbsm/bin/auditd/auditd_fbsd.c
trunk/contrib/openbsm/bin/auditdistd/Makefile.am
trunk/contrib/openbsm/bin/auditdistd/auditdistd.8
trunk/contrib/openbsm/bin/auditdistd/auditdistd.c
trunk/contrib/openbsm/bin/auditdistd/auditdistd.conf.5
trunk/contrib/openbsm/bin/auditdistd/auditdistd.h
trunk/contrib/openbsm/bin/auditdistd/faccessat.h
trunk/contrib/openbsm/bin/auditdistd/fstatat.h
trunk/contrib/openbsm/bin/auditdistd/openat.h
trunk/contrib/openbsm/bin/auditdistd/parse.y
trunk/contrib/openbsm/bin/auditdistd/pjdlog.c
trunk/contrib/openbsm/bin/auditdistd/pjdlog.h
trunk/contrib/openbsm/bin/auditdistd/proto.c
trunk/contrib/openbsm/bin/auditdistd/proto.h
trunk/contrib/openbsm/bin/auditdistd/proto_common.c
trunk/contrib/openbsm/bin/auditdistd/proto_impl.h
trunk/contrib/openbsm/bin/auditdistd/proto_socketpair.c
trunk/contrib/openbsm/bin/auditdistd/proto_tcp.c
trunk/contrib/openbsm/bin/auditdistd/proto_tls.c
trunk/contrib/openbsm/bin/auditdistd/proto_uds.c
trunk/contrib/openbsm/bin/auditdistd/receiver.c
trunk/contrib/openbsm/bin/auditdistd/renameat.h
trunk/contrib/openbsm/bin/auditdistd/sandbox.c
trunk/contrib/openbsm/bin/auditdistd/sandbox.h
trunk/contrib/openbsm/bin/auditdistd/sender.c
trunk/contrib/openbsm/bin/auditdistd/sigtimedwait.h
trunk/contrib/openbsm/bin/auditdistd/strndup.h
trunk/contrib/openbsm/bin/auditdistd/subr.c
trunk/contrib/openbsm/bin/auditdistd/subr.h
trunk/contrib/openbsm/bin/auditdistd/synch.h
trunk/contrib/openbsm/bin/auditdistd/token.l
trunk/contrib/openbsm/bin/auditdistd/trail.c
trunk/contrib/openbsm/bin/auditdistd/trail.h
trunk/contrib/openbsm/bin/auditdistd/unlinkat.h
trunk/contrib/openbsm/bsm/auditd_lib.h
trunk/contrib/openbsm/compat/closefrom.h
trunk/contrib/openbsm/compat/compat.h
trunk/contrib/openbsm/compat/endian_enc.h
trunk/contrib/openbsm/compat/flopen.h
trunk/contrib/openbsm/compat/pidfile.h
trunk/contrib/openbsm/compat/strlcat.h
trunk/contrib/openbsm/compat/strlcpy.h
trunk/contrib/openbsm/configure
trunk/contrib/openbsm/libauditd/Makefile.am
trunk/contrib/openbsm/libauditd/auditd_lib.c
trunk/contrib/openbsm/libauditd/libauditd.3
trunk/contrib/openbsm/libbsm/au_domain.3
trunk/contrib/openbsm/libbsm/au_errno.3
trunk/contrib/openbsm/libbsm/au_fcntl_cmd.3
trunk/contrib/openbsm/libbsm/au_socket_type.3
trunk/contrib/openbsm/libbsm/bsm_domain.c
trunk/contrib/openbsm/libbsm/bsm_errno.c
trunk/contrib/openbsm/libbsm/bsm_fcntl.c
trunk/contrib/openbsm/libbsm/bsm_socket_type.c
trunk/contrib/openbsm/man/Makefile.in
trunk/contrib/openbsm/sys/Makefile.am
trunk/contrib/openbsm/sys/bsm/Makefile.am
trunk/contrib/openbsm/sys/bsm/audit.h
trunk/contrib/openbsm/sys/bsm/audit_domain.h
trunk/contrib/openbsm/sys/bsm/audit_errno.h
trunk/contrib/openbsm/sys/bsm/audit_fcntl.h
trunk/contrib/openbsm/sys/bsm/audit_internal.h
trunk/contrib/openbsm/sys/bsm/audit_kevents.h
trunk/contrib/openbsm/sys/bsm/audit_record.h
trunk/contrib/openbsm/sys/bsm/audit_socket_type.h
Modified: trunk/contrib/openbsm/FREEBSD-upgrade
===================================================================
--- trunk/contrib/openbsm/FREEBSD-upgrade 2018-06-27 22:43:21 UTC (rev 11165)
+++ trunk/contrib/openbsm/FREEBSD-upgrade 2018-06-27 22:43:50 UTC (rev 11166)
@@ -53,4 +53,4 @@
are necessary, and the commits to various parts of the system must be
made in close succession.
-$FreeBSD: release/9.2.0/contrib/openbsm/FREEBSD-upgrade 161866 2006-09-02 09:56:28Z rwatson $
+$FreeBSD: stable/10/contrib/openbsm/FREEBSD-upgrade 161866 2006-09-02 09:56:28Z rwatson $
Modified: trunk/contrib/openbsm/INSTALL
===================================================================
--- trunk/contrib/openbsm/INSTALL 2018-06-27 22:43:21 UTC (rev 11165)
+++ trunk/contrib/openbsm/INSTALL 2018-06-27 22:43:50 UTC (rev 11166)
@@ -3,7 +3,7 @@
OpenBSM is currently built using autoconf and automake, which should allow
for building on a range of operating systems, including FreeBSD, Mac OS X,
and Linux. Some components are built only if appropriate kernel audit
-suppport is found. Typical builds will be performed using:
+support is found. Typical builds will be performed using:
./configure
make
@@ -31,7 +31,7 @@
You may wish to specify that the OpenBSM components not be installed in the
base system, rather in a specific directory. This may be done using the
--prefix argument to configure. If installing to a specific directory,
-remember to update your library path so that running tools from that
+remember to update your library path so that when running tools from that
directory the correct libbsm is used:
./configure --prefix=/home/rwatson/openbsm
Modified: trunk/contrib/openbsm/NEWS
===================================================================
--- trunk/contrib/openbsm/NEWS 2018-06-27 22:43:21 UTC (rev 11165)
+++ trunk/contrib/openbsm/NEWS 2018-06-27 22:43:50 UTC (rev 11166)
@@ -1,5 +1,16 @@
OpenBSM Version History
+OpenBSM 1.2 alpha 4
+
+- Fix praudit to emit correct XML.
+- Fix auditdistd bugs related to IPv6 support, locking, and a kqueue-related
+ descriptor leak.
+- Add audit event definitions for Capsicum-related syscalls, as well as
+ AUE_BINDAT and AUE_CONNECTAT.
+- Manpage symlinks for all libbsm functions are installed again after the
+ move to autotools in OpenBSM 1.0 Alpha 5.
+- A variety of minor documentation cleanups.
+
OpenBSM 1.2 alpha 3
- Various minor tweaks to the auditdistd build to make it fit the FreeBSD
@@ -494,5 +505,3 @@
- auditd(8), audit(8) added to the OpenBSM distribution. auditd extended
to support reloading of kernel event table.
- Allow comments in /etc/security configuration files.
-
-$P4: //depot/projects/trustedbsd/openbsm/NEWS#55 $
Modified: trunk/contrib/openbsm/bin/auditd/audit_triggers.defs
===================================================================
--- trunk/contrib/openbsm/bin/auditd/audit_triggers.defs 2018-06-27 22:43:21 UTC (rev 11165)
+++ trunk/contrib/openbsm/bin/auditd/audit_triggers.defs 2018-06-27 22:43:50 UTC (rev 11166)
@@ -1,5 +1 @@
-/*
- * $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/audit_triggers.defs#1 $
- */
-
#include <mach/audit_triggers.defs>
Modified: trunk/contrib/openbsm/bin/auditd/auditd_control.defs
===================================================================
--- trunk/contrib/openbsm/bin/auditd/auditd_control.defs 2018-06-27 22:43:21 UTC (rev 11165)
+++ trunk/contrib/openbsm/bin/auditd/auditd_control.defs 2018-06-27 22:43:50 UTC (rev 11166)
@@ -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/bin/auditd/auditd_control.defs#2 $
*/
/*
Modified: trunk/contrib/openbsm/bin/auditd/auditd_darwin.c
===================================================================
--- trunk/contrib/openbsm/bin/auditd/auditd_darwin.c 2018-06-27 22:43:21 UTC (rev 11165)
+++ trunk/contrib/openbsm/bin/auditd/auditd_darwin.c 2018-06-27 22:43:50 UTC (rev 11166)
@@ -25,8 +25,6 @@
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, 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/bin/auditd/auditd_darwin.c#5 $
*/
#include <sys/types.h>
Modified: trunk/contrib/openbsm/bin/auditd/auditd_fbsd.c
===================================================================
--- trunk/contrib/openbsm/bin/auditd/auditd_fbsd.c 2018-06-27 22:43:21 UTC (rev 11165)
+++ trunk/contrib/openbsm/bin/auditd/auditd_fbsd.c 2018-06-27 22:43:50 UTC (rev 11166)
@@ -25,8 +25,6 @@
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, 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/bin/auditd/auditd_fbsd.c#4 $
*/
#include <sys/types.h>
Modified: trunk/contrib/openbsm/bin/auditdistd/Makefile.am
===================================================================
--- trunk/contrib/openbsm/bin/auditdistd/Makefile.am 2018-06-27 22:43:21 UTC (rev 11165)
+++ trunk/contrib/openbsm/bin/auditdistd/Makefile.am 2018-06-27 22:43:50 UTC (rev 11166)
@@ -1,7 +1,3 @@
-##
-## $P4: //depot/projects/trustedbsd/openbsm/bin/auditdistd/Makefile.am#1 $
-##
-
if USE_NATIVE_INCLUDES
INCLUDES = -I$(top_builddir) -I$(top_srcdir)
else
Modified: trunk/contrib/openbsm/bin/auditdistd/auditdistd.8
===================================================================
--- trunk/contrib/openbsm/bin/auditdistd/auditdistd.8 2018-06-27 22:43:21 UTC (rev 11165)
+++ trunk/contrib/openbsm/bin/auditdistd/auditdistd.8 2018-06-27 22:43:50 UTC (rev 11166)
@@ -25,7 +25,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: release/9.2.0/contrib/openbsm/bin/auditdistd/auditdistd.8 243730 2012-11-30 23:50:07Z rwatson $
+.\" $FreeBSD: stable/10/contrib/openbsm/bin/auditdistd/auditdistd.8 293161 2016-01-04 16:32:21Z brueffer $
.\"
.Dd March 5, 2012
.Dt AUDITDISTD 8
@@ -41,7 +41,7 @@
.Sh DESCRIPTION
The
.Nm
-daemon is responsible for distributing audit trail files over TCP/IP network in
+daemon is responsible for distributing audit trail files over a TCP/IP network in
a secure and reliable way.
.Pp
The
@@ -49,7 +49,7 @@
daemon can be started with the following command line arguments:
.Bl -tag -width ".Fl P Ar pidfile"
.It Fl c Ar config
-Specify alternative location of the configuration file.
+Specify an alternative location of the configuration file.
The default location is
.Pa /etc/security/auditdistd.conf .
Note: the configuration file may contain passwords.
@@ -74,7 +74,7 @@
Start in a launchd-friendly mode, ie. do not use
.Xr daemon 3 .
.It Fl P Ar pidfile
-Specify alternative location of a file where main process PID will be
+Specify an alternative location of a file where main process PID will be
stored.
The default location is
.Pa /var/run/auditdistd.pid .
Modified: trunk/contrib/openbsm/bin/auditdistd/auditdistd.c
===================================================================
--- trunk/contrib/openbsm/bin/auditdistd/auditdistd.c 2018-06-27 22:43:21 UTC (rev 11165)
+++ trunk/contrib/openbsm/bin/auditdistd/auditdistd.c 2018-06-27 22:43:50 UTC (rev 11166)
@@ -25,8 +25,6 @@
* 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/bin/auditdistd/auditdistd.c#3 $
*/
#include <config/config.h>
Modified: trunk/contrib/openbsm/bin/auditdistd/auditdistd.conf.5
===================================================================
--- trunk/contrib/openbsm/bin/auditdistd/auditdistd.conf.5 2018-06-27 22:43:21 UTC (rev 11165)
+++ trunk/contrib/openbsm/bin/auditdistd/auditdistd.conf.5 2018-06-27 22:43:50 UTC (rev 11166)
@@ -25,9 +25,9 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: release/9.2.0/contrib/openbsm/bin/auditdistd/auditdistd.conf.5 244265 2012-12-15 14:59:00Z rwatson $
+.\" $FreeBSD: stable/10/contrib/openbsm/bin/auditdistd/auditdistd.conf.5 293161 2016-01-04 16:32:21Z brueffer $
.\"
-.Dd March 22, 2011
+.Dd July 1, 2015
.Dt AUDITDISTD.CONF 5
.Os
.Sh NAME
@@ -37,19 +37,21 @@
daemon.
.Sh DESCRIPTION
Note: the configuration file may contain passwords.
-Care should be taken to configure proper permissions on this file
-.Li ( eg. 0600 ) .
+Care should be taken to configure proper permissions for this file
+.Li ( e.g., 0600 ) .
.Pp
-Every line starting with # is treated as comment and ignored.
+Every line starting with
+.Li #
+gets treated as a comment and is ignored.
.Sh CONFIGURATION FILE SYNTAX
-General syntax of the
+The general syntax of the
.Nm
-file is following:
-.Bd -literal -offset
+file is as follows:
+.Bd -literal
## Global section.
# Our name.
-# The default is first part of the hostname.
+# The default is the first part of the hostname.
name "<name>"
# Connection timeout.
@@ -71,11 +73,11 @@
# The default is /var/audit/dist.
directory "<dir>"
.\"
-.\" # Checksum algorithm for data send over the wire.
+.\" # Checksum algorithm for data sent over the wire.
.\" # The default is none.
.\" checksum "<algorithm>"
.\"
-.\" # Compression algorithm for data send over the wire.
+.\" # Compression algorithm for data sent over the wire.
.\" # The default is none.
.\" compression "<algorithm>"
@@ -86,7 +88,7 @@
# Optional.
source "<addr>"
- # Address of auditdistd receiver.
+ # Address of the auditdistd receiver.
# No default. Obligatory.
remote "<addr>"
@@ -95,7 +97,7 @@
directory "<dir>"
# Fingerprint of the receiver's public key when using TLS
- # for connection.
+ # for connections.
# Example fingerprint:
# SHA256=8F:0A:FC:8A:3D:09:80:AF:D9:AA:38:CC:8A:86:53:E6:8F:B6:1C:55:30:14:D7:F9:AA:8B:3E:73:CD:F5:76:2B
fingerprint "<algorithm=hash>"
@@ -103,16 +105,16 @@
# Password used to authenticate in front of the receiver.
password "<password>"
.\"
-.\" # Checksum algorithm for data send over the wire.
+.\" # Checksum algorithm for data sent over the wire.
.\" # The default is none.
.\" checksum "<algorithm>"
.\"
-.\" # Compression algorithm for data send over the wire.
+.\" # Compression algorithm for data sent over the wire.
.\" # The default is none.
.\" compression "<algorithm>"
}
- # Currently local audit trail files can be send only to one remote
+ # Currently local audit trail files can be sent only to one remote
# auditdistd receiver, but this can change in the future.
}
@@ -119,21 +121,21 @@
receiver {
## Receiver section.
- # Address to listen on. Multiple listen addresses might be specified.
+ # Address to listen on. Multiple listen addresses may be specified.
# The defaults are "tcp4://0.0.0.0:7878" and "tcp6://[::]:7878".
listen "<addr>"
# Base directory.
- # If directory in host section is no absolute, it will be concatenated
- # with this base directory.
+ # If the directory in the host section is not absolute, it will be
+ # concatenated with this base directory.
# The default is "/var/audit/remote".
directory "<basedir>"
- # Path to receiver's certificate file.
+ # Path to the receiver's certificate file.
# The default is "/etc/security/auditdistd.cert.pem".
certfile "<path>"
- # Path to receiver's private key file.
+ # Path to the receiver's private key file.
# The default is "/etc/security/auditdistd.key.pem".
keyfile "<path>"
@@ -158,7 +160,7 @@
.Ed
.Pp
Most of the various available configuration parameters are optional.
-If parameter is not defined in the particular section, it will be
+If a parameter is not defined in the particular section, it will be
inherited from the parent section if possible.
For example, if the
.Ic source
@@ -172,14 +174,14 @@
section does not define the
.Ic source
parameter at all, the default value will be used.
-.Sh CONFIGURATION FILE DESCRIPTION
+.Sh CONFIGURATION OPTION DESCRIPTION
The following statements are available:
.Bl -tag -width ".Ic xxxx"
.It Ic name Aq name
.Pp
This host's name.
-It is send to the receiver, so it can properly recognize us if there are
-more than one sender coming from the same IP address.
+It is sent to the receiver, so it can properly recognize us if there are
+multiple senders coming from the same IP address.
.It Ic timeout Aq seconds
.Pp
Connection timeout in seconds.
@@ -198,17 +200,17 @@
Local address to bind to before connecting to the remote
.Nm auditdistd
daemon.
-Format is the same as for the
+The format is the same as for the
.Ic listen
statement.
.It Ic directory Aq path
.Pp
-Directory where to look for audit trail files in case of sender mode or
-directory where to store received audit trail files.
+The directory where to look for audit trail files in case of sender mode, or
+the directory where to store received audit trail files.
The provided path has to be an absolute path.
-The only exception is when directory is provided in the
+The only exception is when the directory is provided in the
.Ic receiver
-section, then path provided in the
+section; then the path provided in the
.Ic host
subsections can be relative to the directory in the
.Ic receiver
@@ -229,13 +231,13 @@
.Ic receiver
section where
.Aq name
-is host's name.
+is the host's name.
.\".It Ic checksum Aq algorithm
.\".Pp
.\"Checksum algorithm should be one of the following:
.\".Bl -tag -width ".Ic sha256"
.\".It Ic none
-.\"No checksum will be calculated for the data being send over the network.
+.\"No checksum will be calculated for the data being sent over the network.
.\"This is the default setting.
.\".It Ic crc32
.\"CRC32 checksum will be calculated.
@@ -247,7 +249,7 @@
.\"Compression algorithm should be one of the following:
.\".Bl -tag -width ".Ic none"
.\".It Ic none
-.\"Data send over the network will not be compressed.
+.\"Data sent over the network will not be compressed.
.\"This is the default setting.
.\".It Ic lzf
.\"The
@@ -254,9 +256,9 @@
.\".Nm LZF
.\"algorithm by
.\".An Marc Alexander Lehmann
-.\"will be used to compress the data send over the network.
+.\"will be used to compress the data sent over the network.
.\".Nm LZF
-.\"is very fast, general purpose compression algorithm.
+.\"is a very fast, general purpose compression algorithm.
.\".El
.It Ic remote Aq addr
.Pp
@@ -263,14 +265,14 @@
Address of the remote
.Nm auditdistd
daemon.
-Format is the same as for the
+The format is the same as for the
.Ic listen
statement.
-When operating in the
+When operating in
.Ic sender
mode this address will be used to connect to the
.Ic receiver .
-When operating in the
+When operating in
.Ic receiver
mode only connections from this address will be accepted.
.It Ic listen Aq addr
@@ -296,21 +298,22 @@
listens on
.Pa tcp4://0.0.0.0:7878
and
-.Pa tcp6://[::]:7878
-if kernel supports IPv4 and IPv6 respectively.
+.Pa tcp6://[::]:7878 ,
+if the kernel supports IPv4 and IPv6 respectively.
.It Ic keyfile Aq path
.Pp
-Path to a file that contains private key for TLS communication.
+Path to a file that contains the private key for TLS communication.
.It Ic certfile Aq path
.Pp
-Path to a file that contains certificate for TLS communication.
+Path to a file that contains the certificate for TLS communication.
.It Ic fingerprint Aq algo=hash
.Pp
-Finger print of the receiver's public key.
-Currently only SHA256 algorithm is supported.
-Certificate public key's fingerprint ready to be pasted into auditdistd
+Fingerprint of the receiver's public key.
+Currently only the SHA256 algorithm is supported.
+The certificate public key's fingerprint ready to be pasted into the
+.Nm auditdistd
configuration file can be obtained by running:
-.Bd -literal -offset
+.Bd -literal
# openssl x509 -in /etc/security/auditdistd.cert.pem -noout -fingerprint -sha256 | awk -F '[ =]' '{printf("%s=%s\\n", $1, $3)}'
.Ed
.It Ic password Aq password
@@ -352,10 +355,10 @@
.Ed
.Sh SEE ALSO
.Xr audit 4 ,
-.Xr auditdistd 8 .
+.Xr auditdistd 8
.Sh AUTHORS
The
.Nm auditdistd
-was developed by
+daemon was developed by
.An Pawel Jakub Dawidek Aq pawel at dawidek.net
under sponsorship of the FreeBSD Foundation.
Modified: trunk/contrib/openbsm/bin/auditdistd/auditdistd.h
===================================================================
--- trunk/contrib/openbsm/bin/auditdistd/auditdistd.h 2018-06-27 22:43:21 UTC (rev 11165)
+++ trunk/contrib/openbsm/bin/auditdistd/auditdistd.h 2018-06-27 22:43:50 UTC (rev 11166)
@@ -25,8 +25,6 @@
* 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/bin/auditdistd/auditdistd.h#2 $
*/
#ifndef _AUDITDISTD_H_
Modified: trunk/contrib/openbsm/bin/auditdistd/faccessat.h
===================================================================
--- trunk/contrib/openbsm/bin/auditdistd/faccessat.h 2018-06-27 22:43:21 UTC (rev 11165)
+++ trunk/contrib/openbsm/bin/auditdistd/faccessat.h 2018-06-27 22:43:50 UTC (rev 11166)
@@ -25,8 +25,6 @@
* 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/bin/auditdistd/faccessat.h#1 $
*/
#ifndef _FACCESSAT_H_
Modified: trunk/contrib/openbsm/bin/auditdistd/fstatat.h
===================================================================
--- trunk/contrib/openbsm/bin/auditdistd/fstatat.h 2018-06-27 22:43:21 UTC (rev 11165)
+++ trunk/contrib/openbsm/bin/auditdistd/fstatat.h 2018-06-27 22:43:50 UTC (rev 11166)
@@ -25,8 +25,6 @@
* 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/bin/auditdistd/fstatat.h#1 $
*/
#ifndef _FSTATAT_H_
Modified: trunk/contrib/openbsm/bin/auditdistd/openat.h
===================================================================
--- trunk/contrib/openbsm/bin/auditdistd/openat.h 2018-06-27 22:43:21 UTC (rev 11165)
+++ trunk/contrib/openbsm/bin/auditdistd/openat.h 2018-06-27 22:43:50 UTC (rev 11166)
@@ -25,8 +25,6 @@
* 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/bin/auditdistd/openat.h#1 $
*/
#ifndef _OPENAT_H_
Modified: trunk/contrib/openbsm/bin/auditdistd/parse.y
===================================================================
--- trunk/contrib/openbsm/bin/auditdistd/parse.y 2018-06-27 22:43:21 UTC (rev 11165)
+++ trunk/contrib/openbsm/bin/auditdistd/parse.y 2018-06-27 22:43:50 UTC (rev 11166)
@@ -26,8 +26,6 @@
* 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/bin/auditdistd/parse.y#5 $
*/
#include <config/config.h>
@@ -56,7 +54,6 @@
extern FILE *yyin;
extern char *yytext;
-extern int yyparse(void);
static struct adist_config *lconfig;
static struct adist_host *curhost;
Modified: trunk/contrib/openbsm/bin/auditdistd/pjdlog.c
===================================================================
--- trunk/contrib/openbsm/bin/auditdistd/pjdlog.c 2018-06-27 22:43:21 UTC (rev 11165)
+++ trunk/contrib/openbsm/bin/auditdistd/pjdlog.c 2018-06-27 22:43:50 UTC (rev 11166)
@@ -26,8 +26,6 @@
* 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/bin/auditdistd/pjdlog.c#1 $
*/
#include <sys/types.h>
Modified: trunk/contrib/openbsm/bin/auditdistd/pjdlog.h
===================================================================
--- trunk/contrib/openbsm/bin/auditdistd/pjdlog.h 2018-06-27 22:43:21 UTC (rev 11165)
+++ trunk/contrib/openbsm/bin/auditdistd/pjdlog.h 2018-06-27 22:43:50 UTC (rev 11166)
@@ -26,8 +26,6 @@
* 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/bin/auditdistd/pjdlog.h#1 $
*/
#ifndef _PJDLOG_H_
Modified: trunk/contrib/openbsm/bin/auditdistd/proto.c
===================================================================
--- trunk/contrib/openbsm/bin/auditdistd/proto.c 2018-06-27 22:43:21 UTC (rev 11165)
+++ trunk/contrib/openbsm/bin/auditdistd/proto.c 2018-06-27 22:43:50 UTC (rev 11166)
@@ -25,8 +25,6 @@
* 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/bin/auditdistd/proto.c#1 $
*/
#include <sys/types.h>
Modified: trunk/contrib/openbsm/bin/auditdistd/proto.h
===================================================================
--- trunk/contrib/openbsm/bin/auditdistd/proto.h 2018-06-27 22:43:21 UTC (rev 11165)
+++ trunk/contrib/openbsm/bin/auditdistd/proto.h 2018-06-27 22:43:50 UTC (rev 11166)
@@ -25,8 +25,6 @@
* 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/bin/auditdistd/proto.h#1 $
*/
#ifndef _PROTO_H_
Modified: trunk/contrib/openbsm/bin/auditdistd/proto_common.c
===================================================================
--- trunk/contrib/openbsm/bin/auditdistd/proto_common.c 2018-06-27 22:43:21 UTC (rev 11165)
+++ trunk/contrib/openbsm/bin/auditdistd/proto_common.c 2018-06-27 22:43:50 UTC (rev 11166)
@@ -26,8 +26,6 @@
* 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/bin/auditdistd/proto_common.c#1 $
*/
#include <sys/types.h>
Modified: trunk/contrib/openbsm/bin/auditdistd/proto_impl.h
===================================================================
--- trunk/contrib/openbsm/bin/auditdistd/proto_impl.h 2018-06-27 22:43:21 UTC (rev 11165)
+++ trunk/contrib/openbsm/bin/auditdistd/proto_impl.h 2018-06-27 22:43:50 UTC (rev 11166)
@@ -25,8 +25,6 @@
* 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/bin/auditdistd/proto_impl.h#1 $
*/
#ifndef _PROTO_IMPL_H_
Modified: trunk/contrib/openbsm/bin/auditdistd/proto_socketpair.c
===================================================================
--- trunk/contrib/openbsm/bin/auditdistd/proto_socketpair.c 2018-06-27 22:43:21 UTC (rev 11165)
+++ trunk/contrib/openbsm/bin/auditdistd/proto_socketpair.c 2018-06-27 22:43:50 UTC (rev 11166)
@@ -25,8 +25,6 @@
* 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/bin/auditdistd/proto_socketpair.c#1 $
*/
#include <sys/types.h>
Modified: trunk/contrib/openbsm/bin/auditdistd/proto_tcp.c
===================================================================
--- trunk/contrib/openbsm/bin/auditdistd/proto_tcp.c 2018-06-27 22:43:21 UTC (rev 11165)
+++ trunk/contrib/openbsm/bin/auditdistd/proto_tcp.c 2018-06-27 22:43:50 UTC (rev 11166)
@@ -26,8 +26,6 @@
* 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/bin/auditdistd/proto_tcp.c#2 $
*/
#include <config/config.h>
Modified: trunk/contrib/openbsm/bin/auditdistd/proto_tls.c
===================================================================
--- trunk/contrib/openbsm/bin/auditdistd/proto_tls.c 2018-06-27 22:43:21 UTC (rev 11165)
+++ trunk/contrib/openbsm/bin/auditdistd/proto_tls.c 2018-06-27 22:43:50 UTC (rev 11166)
@@ -25,8 +25,6 @@
* 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/bin/auditdistd/proto_tls.c#2 $
*/
#include <config/config.h>
Modified: trunk/contrib/openbsm/bin/auditdistd/proto_uds.c
===================================================================
--- trunk/contrib/openbsm/bin/auditdistd/proto_uds.c 2018-06-27 22:43:21 UTC (rev 11165)
+++ trunk/contrib/openbsm/bin/auditdistd/proto_uds.c 2018-06-27 22:43:50 UTC (rev 11166)
@@ -25,8 +25,6 @@
* 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/bin/auditdistd/proto_uds.c#2 $
*/
/* UDS - UNIX Domain Socket */
Modified: trunk/contrib/openbsm/bin/auditdistd/receiver.c
===================================================================
--- trunk/contrib/openbsm/bin/auditdistd/receiver.c 2018-06-27 22:43:21 UTC (rev 11165)
+++ trunk/contrib/openbsm/bin/auditdistd/receiver.c 2018-06-27 22:43:50 UTC (rev 11166)
@@ -25,8 +25,6 @@
* 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/bin/auditdistd/receiver.c#3 $
*/
#include <config/config.h>
Modified: trunk/contrib/openbsm/bin/auditdistd/renameat.h
===================================================================
--- trunk/contrib/openbsm/bin/auditdistd/renameat.h 2018-06-27 22:43:21 UTC (rev 11165)
+++ trunk/contrib/openbsm/bin/auditdistd/renameat.h 2018-06-27 22:43:50 UTC (rev 11166)
@@ -25,8 +25,6 @@
* 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/bin/auditdistd/renameat.h#1 $
*/
#ifndef _RENAMEAT_H_
Modified: trunk/contrib/openbsm/bin/auditdistd/sandbox.c
===================================================================
--- trunk/contrib/openbsm/bin/auditdistd/sandbox.c 2018-06-27 22:43:21 UTC (rev 11165)
+++ trunk/contrib/openbsm/bin/auditdistd/sandbox.c 2018-06-27 22:43:50 UTC (rev 11166)
@@ -25,8 +25,6 @@
* 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/bin/auditdistd/sandbox.c#3 $
*/
#include <config/config.h>
Modified: trunk/contrib/openbsm/bin/auditdistd/sandbox.h
===================================================================
--- trunk/contrib/openbsm/bin/auditdistd/sandbox.h 2018-06-27 22:43:21 UTC (rev 11165)
+++ trunk/contrib/openbsm/bin/auditdistd/sandbox.h 2018-06-27 22:43:50 UTC (rev 11166)
@@ -25,8 +25,6 @@
* 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/bin/auditdistd/sandbox.h#1 $
*/
#ifndef _SANDBOX_H_
Modified: trunk/contrib/openbsm/bin/auditdistd/sender.c
===================================================================
--- trunk/contrib/openbsm/bin/auditdistd/sender.c 2018-06-27 22:43:21 UTC (rev 11165)
+++ trunk/contrib/openbsm/bin/auditdistd/sender.c 2018-06-27 22:43:50 UTC (rev 11166)
@@ -25,8 +25,6 @@
* 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/bin/auditdistd/sender.c#3 $
*/
#include <config/config.h>
@@ -394,6 +392,7 @@
mtx_lock(&adist_remote_mtx);
if (adhost->adh_reset) {
+reset:
adhost->adh_reset = false;
if (trail_filefd(adist_trail) != -1)
trail_close(adist_trail);
@@ -408,6 +407,14 @@
while (trail_filefd(adist_trail) == -1) {
newfile = true;
wait_for_dir();
+ /*
+ * We may have been disconnected and reconnected in the
+ * meantime, check if reset is set.
+ */
+ mtx_lock(&adist_remote_mtx);
+ if (adhost->adh_reset)
+ goto reset;
+ mtx_unlock(&adist_remote_mtx);
if (trail_filefd(adist_trail) == -1)
trail_next(adist_trail);
}
Modified: trunk/contrib/openbsm/bin/auditdistd/sigtimedwait.h
===================================================================
--- trunk/contrib/openbsm/bin/auditdistd/sigtimedwait.h 2018-06-27 22:43:21 UTC (rev 11165)
+++ trunk/contrib/openbsm/bin/auditdistd/sigtimedwait.h 2018-06-27 22:43:50 UTC (rev 11166)
@@ -25,8 +25,6 @@
* 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/bin/auditdistd/sigtimedwait.h#2 $
*/
#ifndef _SIGTIMEDWAIT_H_
Modified: trunk/contrib/openbsm/bin/auditdistd/strndup.h
===================================================================
--- trunk/contrib/openbsm/bin/auditdistd/strndup.h 2018-06-27 22:43:21 UTC (rev 11165)
+++ trunk/contrib/openbsm/bin/auditdistd/strndup.h 2018-06-27 22:43:50 UTC (rev 11166)
@@ -25,8 +25,6 @@
* 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/bin/auditdistd/strndup.h#1 $
*/
#ifndef _STRNDUP_H_
Modified: trunk/contrib/openbsm/bin/auditdistd/subr.c
===================================================================
--- trunk/contrib/openbsm/bin/auditdistd/subr.c 2018-06-27 22:43:21 UTC (rev 11165)
+++ trunk/contrib/openbsm/bin/auditdistd/subr.c 2018-06-27 22:43:50 UTC (rev 11166)
@@ -22,8 +22,6 @@
* 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/bin/auditdistd/subr.c#3 $
*/
#include <config/config.h>
@@ -228,6 +226,11 @@
PJDLOG_ASSERT(fd != -1);
#ifdef HAVE_KQUEUE
+ if (wait_for_file_kq != -1) {
+ close(wait_for_file_kq);
+ wait_for_file_kq = -1;
+ }
+
kq = kqueue();
if (kq == -1) {
pjdlog_errno(LOG_WARNING, "kqueue() failed");
Modified: trunk/contrib/openbsm/bin/auditdistd/subr.h
===================================================================
--- trunk/contrib/openbsm/bin/auditdistd/subr.h 2018-06-27 22:43:21 UTC (rev 11165)
+++ trunk/contrib/openbsm/bin/auditdistd/subr.h 2018-06-27 22:43:50 UTC (rev 11166)
@@ -22,8 +22,6 @@
* 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/bin/auditdistd/subr.h#1 $
*/
#ifndef _AUDITDISTD_SUBR_H_
Modified: trunk/contrib/openbsm/bin/auditdistd/synch.h
===================================================================
--- trunk/contrib/openbsm/bin/auditdistd/synch.h 2018-06-27 22:43:21 UTC (rev 11165)
+++ trunk/contrib/openbsm/bin/auditdistd/synch.h 2018-06-27 22:43:50 UTC (rev 11166)
@@ -25,8 +25,6 @@
* 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/bin/auditdistd/synch.h#3 $
*/
#ifndef _SYNCH_H_
Modified: trunk/contrib/openbsm/bin/auditdistd/token.l
===================================================================
--- trunk/contrib/openbsm/bin/auditdistd/token.l 2018-06-27 22:43:21 UTC (rev 11165)
+++ trunk/contrib/openbsm/bin/auditdistd/token.l 2018-06-27 22:43:50 UTC (rev 11166)
@@ -26,8 +26,6 @@
* 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/bin/auditdistd/token.l#2 $
*/
#include <config/config.h>
@@ -75,7 +73,7 @@
source { DP; return SOURCE; }
timeout { DP; return TIMEOUT; }
[0-9]+ { DP; yylval.num = atoi(yytext); return NUM; }
-\"[a-zA-Z0-9_/ !@#\$%\^\&\*\(\)\+\=\|\;\?\,\.\-\:]*\" { DP; yylval.str = strndup(yytext + 1, strlen(yytext) - 2); return STR; }
+\"[a-zA-Z0-9_/ !@#\$%\^\&\*\(\)\+\=\|\;\?\,\.\[\]\-\:]*\" { DP; yylval.str = strndup(yytext + 1, strlen(yytext) - 2); return STR; }
\{ { DP; depth++; return OB; }
\} { DP; depth--; return CB; }
#.*$ /* ignore comments */;
Modified: trunk/contrib/openbsm/bin/auditdistd/trail.c
===================================================================
--- trunk/contrib/openbsm/bin/auditdistd/trail.c 2018-06-27 22:43:21 UTC (rev 11165)
+++ trunk/contrib/openbsm/bin/auditdistd/trail.c 2018-06-27 22:43:50 UTC (rev 11166)
@@ -25,8 +25,6 @@
* 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/bin/auditdistd/trail.c#3 $
*/
#include <config/config.h>
Modified: trunk/contrib/openbsm/bin/auditdistd/trail.h
===================================================================
--- trunk/contrib/openbsm/bin/auditdistd/trail.h 2018-06-27 22:43:21 UTC (rev 11165)
+++ trunk/contrib/openbsm/bin/auditdistd/trail.h 2018-06-27 22:43:50 UTC (rev 11166)
@@ -25,8 +25,6 @@
* 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/bin/auditdistd/trail.h#1 $
*/
#ifndef _AUDITDISTD_TRAIL_H_
Modified: trunk/contrib/openbsm/bin/auditdistd/unlinkat.h
===================================================================
--- trunk/contrib/openbsm/bin/auditdistd/unlinkat.h 2018-06-27 22:43:21 UTC (rev 11165)
+++ trunk/contrib/openbsm/bin/auditdistd/unlinkat.h 2018-06-27 22:43:50 UTC (rev 11166)
@@ -25,8 +25,6 @@
* 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/bin/auditdistd/unlinkat.h#1 $
*/
#ifndef _UNLINKAT_H_
Modified: trunk/contrib/openbsm/bsm/auditd_lib.h
===================================================================
--- trunk/contrib/openbsm/bsm/auditd_lib.h 2018-06-27 22:43:21 UTC (rev 11165)
+++ trunk/contrib/openbsm/bsm/auditd_lib.h 2018-06-27 22:43:50 UTC (rev 11166)
@@ -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/bsm/auditd_lib.h#5 $
*/
#ifndef _BSM_AUDITD_LIB_H_
Modified: trunk/contrib/openbsm/compat/closefrom.h
===================================================================
--- trunk/contrib/openbsm/compat/closefrom.h 2018-06-27 22:43:21 UTC (rev 11165)
+++ trunk/contrib/openbsm/compat/closefrom.h 2018-06-27 22:43:50 UTC (rev 11166)
@@ -25,8 +25,6 @@
* 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/compat/closefrom.h#1 $
*/
#ifndef _CLOSEFROM_H_
Modified: trunk/contrib/openbsm/compat/compat.h
===================================================================
--- trunk/contrib/openbsm/compat/compat.h 2018-06-27 22:43:21 UTC (rev 11165)
+++ trunk/contrib/openbsm/compat/compat.h 2018-06-27 22:43:50 UTC (rev 11166)
@@ -25,8 +25,6 @@
* 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/compat/compat.h#1 $
*/
#ifndef _COMPAT_H_
Modified: trunk/contrib/openbsm/compat/endian_enc.h
===================================================================
--- trunk/contrib/openbsm/compat/endian_enc.h 2018-06-27 22:43:21 UTC (rev 11165)
+++ trunk/contrib/openbsm/compat/endian_enc.h 2018-06-27 22:43:50 UTC (rev 11166)
@@ -25,7 +25,6 @@
* SUCH DAMAGE.
*
* Derived from FreeBSD src/sys/sys/endian.h:1.6.
- * $P4: //depot/projects/trustedbsd/openbsm/compat/endian_enc.h#1 $
*/
#ifndef _COMPAT_ENDIAN_ENC_H_
Modified: trunk/contrib/openbsm/compat/flopen.h
===================================================================
--- trunk/contrib/openbsm/compat/flopen.h 2018-06-27 22:43:21 UTC (rev 11165)
+++ trunk/contrib/openbsm/compat/flopen.h 2018-06-27 22:43:50 UTC (rev 11166)
@@ -25,7 +25,6 @@
* SUCH DAMAGE.
*
* Derived from FreeBSD head/lib/libutil/flopen.c r193591
- * $P4: //depot/projects/trustedbsd/openbsm/compat/flopen.h#1 $
*/
#include <sys/file.h>
Modified: trunk/contrib/openbsm/compat/pidfile.h
===================================================================
--- trunk/contrib/openbsm/compat/pidfile.h 2018-06-27 22:43:21 UTC (rev 11165)
+++ trunk/contrib/openbsm/compat/pidfile.h 2018-06-27 22:43:50 UTC (rev 11166)
@@ -24,7 +24,6 @@
* SUCH DAMAGE.
*
* Derived from FreeBSD head/lib/libutil/pidfile.c r231938
- * $P4: //depot/projects/trustedbsd/openbsm/compat/pidfile.h#1 $
*/
#include <sys/param.h>
Modified: trunk/contrib/openbsm/compat/strlcat.h
===================================================================
--- trunk/contrib/openbsm/compat/strlcat.h 2018-06-27 22:43:21 UTC (rev 11165)
+++ trunk/contrib/openbsm/compat/strlcat.h 2018-06-27 22:43:50 UTC (rev 11166)
@@ -25,7 +25,6 @@
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* dollar OpenBSD: strlcat.c,v 1.2 1999/06/17 16:28:58 millert Exp dollar
- * $P4: //depot/projects/trustedbsd/openbsm/compat/strlcat.h#3 $
*/
/*
Modified: trunk/contrib/openbsm/compat/strlcpy.h
===================================================================
--- trunk/contrib/openbsm/compat/strlcpy.h 2018-06-27 22:43:21 UTC (rev 11165)
+++ trunk/contrib/openbsm/compat/strlcpy.h 2018-06-27 22:43:50 UTC (rev 11166)
@@ -25,7 +25,6 @@
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* dollar OpenBSD: strlcpy.c,v 1.4 1999/05/01 18:56:41 millert Exp dollar
- * $P4: //depot/projects/trustedbsd/openbsm/compat/strlcpy.h#1 $
*/
/*
Modified: trunk/contrib/openbsm/configure
===================================================================
--- trunk/contrib/openbsm/configure 2018-06-27 22:43:21 UTC (rev 11165)
+++ trunk/contrib/openbsm/configure 2018-06-27 22:43:50 UTC (rev 11166)
@@ -594,7 +594,6 @@
PACKAGE_STRING='OpenBSM 1.2-alpha4'
PACKAGE_BUGREPORT='trustedbsd-audit at TrustedBSD.org'
PACKAGE_URL=''
-PACKAGE_URL=''
ac_unique_file="bin/auditreduce/auditreduce.c"
# Factoring default headers for most tests.
@@ -2344,7 +2343,6 @@
-
ac_aux_dir=
for ac_dir in config "$srcdir"/config; do
if test -f "$ac_dir/install-sh"; then
Modified: trunk/contrib/openbsm/libauditd/Makefile.am
===================================================================
--- trunk/contrib/openbsm/libauditd/Makefile.am 2018-06-27 22:43:21 UTC (rev 11165)
+++ trunk/contrib/openbsm/libauditd/Makefile.am 2018-06-27 22:43:50 UTC (rev 11166)
@@ -1,7 +1,3 @@
-##
-## $P4: //depot/projects/trustedbsd/openbsm/libauditd/Makefile.am#3 $
-##
-
if USE_NATIVE_INCLUDES
INCLUDES = -I$(top_builddir) -I$(top_srcdir)
else
Modified: trunk/contrib/openbsm/libauditd/auditd_lib.c
===================================================================
--- trunk/contrib/openbsm/libauditd/auditd_lib.c 2018-06-27 22:43:21 UTC (rev 11165)
+++ trunk/contrib/openbsm/libauditd/auditd_lib.c 2018-06-27 22:43:50 UTC (rev 11166)
@@ -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/libauditd/auditd_lib.c#18 $
*/
#include <sys/param.h>
@@ -402,12 +400,13 @@
* ADE_NOERR on success or there is nothing to do.
* ADE_PARSE if error parsing audit_control(5).
* ADE_NOMEM if could not allocate memory.
- * ADE_EXPIRE if there was an unespected error.
+ * ADE_READLINK if could not read link file.
+ * ADE_EXPIRE if there was an unexpected error.
*/
int
auditd_expire_trails(int (*warn_expired)(char *))
{
- int andflg, ret = ADE_NOERR;
+ int andflg, len, ret = ADE_NOERR;
size_t expire_size, total_size = 0L;
time_t expire_age, oldest_time, current_time = time(NULL);
struct dir_ent *traildir;
@@ -431,7 +430,9 @@
* Read the 'current' trail file name. Trim off directory path.
*/
activefn[0] = '\0';
- readlink(AUDIT_CURRENT_LINK, activefn, MAXPATHLEN - 1);
+ len = readlink(AUDIT_CURRENT_LINK, activefn, MAXPATHLEN - 1);
+ if (len < 0)
+ return (ADE_READLINK);
if ((afnp = strrchr(activefn, '/')) != NULL)
afnp++;
Modified: trunk/contrib/openbsm/libauditd/libauditd.3
===================================================================
--- trunk/contrib/openbsm/libauditd/libauditd.3 2018-06-27 22:43:21 UTC (rev 11165)
+++ trunk/contrib/openbsm/libauditd/libauditd.3 2018-06-27 22:43:50 UTC (rev 11166)
@@ -26,8 +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/libauditd/libauditd.3#1 $
-.\"
.Dd December 27, 2008
.Dt LIBAUDITD 3
.Os
@@ -45,7 +43,7 @@
There are no public interfaces in
.Nm .
.Sh SEE ALSO
-.Xr auditd 8 .
+.Xr auditd 8
.Sh HISTORY
The OpenBSM implementation was created by McAfee Research, the security
division of McAfee Inc., under contract to Apple Computer, Inc., in 2004.
Modified: trunk/contrib/openbsm/libbsm/au_domain.3
===================================================================
--- trunk/contrib/openbsm/libbsm/au_domain.3 2018-06-27 22:43:21 UTC (rev 11165)
+++ trunk/contrib/openbsm/libbsm/au_domain.3 2018-06-27 22:43:50 UTC (rev 11166)
@@ -26,8 +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/libbsm/au_domain.3#2 $
-.\"
.Dd December 28, 2008
.Dt AU_BSM_TO_DOMAIN 3
.Os
Modified: trunk/contrib/openbsm/libbsm/au_errno.3
===================================================================
--- trunk/contrib/openbsm/libbsm/au_errno.3 2018-06-27 22:43:21 UTC (rev 11165)
+++ trunk/contrib/openbsm/libbsm/au_errno.3 2018-06-27 22:43:50 UTC (rev 11166)
@@ -26,8 +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/libbsm/au_errno.3#4 $
-.\"
.Dd December 8, 2008
.Dt AU_BSM_TO_ERRNO 3
.Os
@@ -54,7 +52,7 @@
The
.Fn au_bsm_to_errno
function accepts a BSM error value,
-.Fa bsm_error,
+.Fa bsm_error ,
and converts it to an
.Xr errno 2
that will be stored in the integer pointed to by
Modified: trunk/contrib/openbsm/libbsm/au_fcntl_cmd.3
===================================================================
--- trunk/contrib/openbsm/libbsm/au_fcntl_cmd.3 2018-06-27 22:43:21 UTC (rev 11165)
+++ trunk/contrib/openbsm/libbsm/au_fcntl_cmd.3 2018-06-27 22:43:50 UTC (rev 11166)
@@ -26,8 +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/libbsm/au_fcntl_cmd.3#2 $
-.\"
.Dd March 5, 2009
.Dt AU_BSM_TO_FCNTL_CMD 3
.Os
@@ -79,8 +77,8 @@
.Sh SEE ALSO
.Xr fcntl 2 ,
.Xr au_bsm_to_domain 3 ,
+.Xr au_bsm_to_socket_type 3 ,
.Xr au_domain_to_bsm 3 ,
-.Xr au_bsm_to_socket_type 3 ,
.Xr au_socket_type_to_bsm 3 ,
.Xr libbsm 3
.Sh HISTORY
Modified: trunk/contrib/openbsm/libbsm/au_socket_type.3
===================================================================
--- trunk/contrib/openbsm/libbsm/au_socket_type.3 2018-06-27 22:43:21 UTC (rev 11165)
+++ trunk/contrib/openbsm/libbsm/au_socket_type.3 2018-06-27 22:43:50 UTC (rev 11166)
@@ -26,8 +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/libbsm/au_socket_type.3#1 $
-.\"
.Dd December 28, 2008
.Dt AU_BSM_TO_SOCKET_TYPE 3
.Os
Modified: trunk/contrib/openbsm/libbsm/bsm_domain.c
===================================================================
--- trunk/contrib/openbsm/libbsm/bsm_domain.c 2018-06-27 22:43:21 UTC (rev 11165)
+++ trunk/contrib/openbsm/libbsm/bsm_domain.c 2018-06-27 22:43:50 UTC (rev 11166)
@@ -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/types.h>
Modified: trunk/contrib/openbsm/libbsm/bsm_errno.c
===================================================================
--- trunk/contrib/openbsm/libbsm/bsm_errno.c 2018-06-27 22:43:21 UTC (rev 11165)
+++ trunk/contrib/openbsm/libbsm/bsm_errno.c 2018-06-27 22:43:50 UTC (rev 11166)
@@ -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/types.h>
Modified: trunk/contrib/openbsm/libbsm/bsm_fcntl.c
===================================================================
--- trunk/contrib/openbsm/libbsm/bsm_fcntl.c 2018-06-27 22:43:21 UTC (rev 11165)
+++ trunk/contrib/openbsm/libbsm/bsm_fcntl.c 2018-06-27 22:43:50 UTC (rev 11166)
@@ -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/param.h>
Modified: trunk/contrib/openbsm/libbsm/bsm_socket_type.c
===================================================================
--- trunk/contrib/openbsm/libbsm/bsm_socket_type.c 2018-06-27 22:43:21 UTC (rev 11165)
+++ trunk/contrib/openbsm/libbsm/bsm_socket_type.c 2018-06-27 22:43:50 UTC (rev 11166)
@@ -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/types.h>
Modified: trunk/contrib/openbsm/man/Makefile.in
===================================================================
--- trunk/contrib/openbsm/man/Makefile.in 2018-06-27 22:43:21 UTC (rev 11165)
+++ trunk/contrib/openbsm/man/Makefile.in 2018-06-27 22:43:50 UTC (rev 11166)
@@ -536,7 +536,6 @@
$(LN_S) -f getaudit.2 getaudit_addr.2 && \
$(LN_S) -f setaudit.2 setaudit_addr.2
-
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
Modified: trunk/contrib/openbsm/sys/Makefile.am
===================================================================
--- trunk/contrib/openbsm/sys/Makefile.am 2018-06-27 22:43:21 UTC (rev 11165)
+++ trunk/contrib/openbsm/sys/Makefile.am 2018-06-27 22:43:50 UTC (rev 11166)
@@ -1,7 +1,3 @@
-##
-## $P4: //depot/projects/trustedbsd/openbsm/sys/Makefile.am#2 $
-##
-
SUBDIRS = \
bsm
Modified: trunk/contrib/openbsm/sys/bsm/Makefile.am
===================================================================
--- trunk/contrib/openbsm/sys/bsm/Makefile.am 2018-06-27 22:43:21 UTC (rev 11165)
+++ trunk/contrib/openbsm/sys/bsm/Makefile.am 2018-06-27 22:43:50 UTC (rev 11166)
@@ -1,8 +1,3 @@
-##
-## $P4: //depot/projects/trustedbsd/openbsm/sys/bsm/Makefile.am#5 $
-##
-
-
if ! USE_NATIVE_INCLUDES
openbsmdir = $(includedir)/bsm
Modified: trunk/contrib/openbsm/sys/bsm/audit.h
===================================================================
--- trunk/contrib/openbsm/sys/bsm/audit.h 2018-06-27 22:43:21 UTC (rev 11165)
+++ trunk/contrib/openbsm/sys/bsm/audit.h 2018-06-27 22:43:50 UTC (rev 11166)
@@ -25,8 +25,6 @@
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, 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/sys/bsm/audit.h#10 $
*/
#ifndef _BSM_AUDIT_H
Modified: trunk/contrib/openbsm/sys/bsm/audit_domain.h
===================================================================
--- trunk/contrib/openbsm/sys/bsm/audit_domain.h 2018-06-27 22:43:21 UTC (rev 11165)
+++ trunk/contrib/openbsm/sys/bsm/audit_domain.h 2018-06-27 22:43:50 UTC (rev 11166)
@@ -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/sys/bsm/audit_domain.h#2 $
*/
#ifndef _BSM_AUDIT_DOMAIN_H_
Modified: trunk/contrib/openbsm/sys/bsm/audit_errno.h
===================================================================
--- trunk/contrib/openbsm/sys/bsm/audit_errno.h 2018-06-27 22:43:21 UTC (rev 11165)
+++ trunk/contrib/openbsm/sys/bsm/audit_errno.h 2018-06-27 22:43:50 UTC (rev 11166)
@@ -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/sys/bsm/audit_errno.h#7 $
*/
#ifndef _BSM_AUDIT_ERRNO_H_
Modified: trunk/contrib/openbsm/sys/bsm/audit_fcntl.h
===================================================================
--- trunk/contrib/openbsm/sys/bsm/audit_fcntl.h 2018-06-27 22:43:21 UTC (rev 11165)
+++ trunk/contrib/openbsm/sys/bsm/audit_fcntl.h 2018-06-27 22:43:50 UTC (rev 11166)
@@ -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/sys/bsm/audit_fcntl.h#2 $
*/
#ifndef _BSM_AUDIT_FCNTL_H_
Modified: trunk/contrib/openbsm/sys/bsm/audit_internal.h
===================================================================
--- trunk/contrib/openbsm/sys/bsm/audit_internal.h 2018-06-27 22:43:21 UTC (rev 11165)
+++ trunk/contrib/openbsm/sys/bsm/audit_internal.h 2018-06-27 22:43:50 UTC (rev 11166)
@@ -29,8 +29,6 @@
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, 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/sys/bsm/audit_internal.h#6 $
*/
#ifndef _AUDIT_INTERNAL_H
Modified: trunk/contrib/openbsm/sys/bsm/audit_kevents.h
===================================================================
--- trunk/contrib/openbsm/sys/bsm/audit_kevents.h 2018-06-27 22:43:21 UTC (rev 11165)
+++ trunk/contrib/openbsm/sys/bsm/audit_kevents.h 2018-06-27 22:43:50 UTC (rev 11166)
@@ -25,8 +25,6 @@
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, 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/sys/bsm/audit_kevents.h#10 $
*/
#ifndef _BSM_AUDIT_KEVENTS_H_
@@ -33,10 +31,10 @@
#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))
+#define AUE_IS_A_KEVENT(e) (((e) > 0 && (e) < 2048) || \
+ ((e) > 43000 && (e) < 45000))
/*
* Values marked as AUE_NULL are not required to be audited as per CAPP.
@@ -587,7 +585,8 @@
#define AUE_OPENAT 43184 /* FreeBSD. */
#define AUE_POSIX_OPENPT 43185 /* FreeBSD. */
#define AUE_CAP_NEW 43186 /* TrustedBSD. */
-#define AUE_CAP_GETRIGHTS 43187 /* TrustedBSD. */
+#define AUE_CAP_RIGHTS_GET 43187 /* TrustedBSD. */
+#define AUE_CAP_GETRIGHTS AUE_CAP_RIGHTS_GET
#define AUE_CAP_ENTER 43188 /* TrustedBSD. */
#define AUE_CAP_GETMODE 43189 /* TrustedBSD. */
#define AUE_POSIX_SPAWN 43190 /* Darwin. */
@@ -602,6 +601,14 @@
#define AUE_PDGETPID 43199 /* FreeBSD. */
#define AUE_PDWAIT 43200 /* FreeBSD. */
#define AUE_WAIT6 43201 /* FreeBSD. */
+#define AUE_CAP_RIGHTS_LIMIT 43202 /* TrustedBSD. */
+#define AUE_CAP_IOCTLS_LIMIT 43203 /* TrustedBSD. */
+#define AUE_CAP_IOCTLS_GET 43204 /* TrustedBSD. */
+#define AUE_CAP_FCNTLS_LIMIT 43205 /* TrustedBSD. */
+#define AUE_CAP_FCNTLS_GET 43206 /* TrustedBSD. */
+#define AUE_BINDAT 43207 /* TrustedBSD. */
+#define AUE_CONNECTAT 43208 /* TrustedBSD. */
+#define AUE_CHFLAGSAT 43209 /* FreeBSD-specific. */
/*
* Darwin BSM uses a number of AUE_O_* definitions, which are aliased to the
Modified: trunk/contrib/openbsm/sys/bsm/audit_record.h
===================================================================
--- trunk/contrib/openbsm/sys/bsm/audit_record.h 2018-06-27 22:43:21 UTC (rev 11165)
+++ trunk/contrib/openbsm/sys/bsm/audit_record.h 2018-06-27 22:43:50 UTC (rev 11166)
@@ -25,8 +25,6 @@
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, 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/sys/bsm/audit_record.h#12 $
*/
#ifndef _BSM_AUDIT_RECORD_H_
Modified: trunk/contrib/openbsm/sys/bsm/audit_socket_type.h
===================================================================
--- trunk/contrib/openbsm/sys/bsm/audit_socket_type.h 2018-06-27 22:43:21 UTC (rev 11165)
+++ trunk/contrib/openbsm/sys/bsm/audit_socket_type.h 2018-06-27 22:43:50 UTC (rev 11166)
@@ -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/sys/bsm/audit_socket_type.h#1 $
*/
#ifndef _BSM_AUDIT_SOCKET_TYPE_H_
More information about the Midnightbsd-cvs
mailing list