Date: Fri, 23 Nov 2012 23:04:27 GMT From: Robert Watson <rwatson@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 219833 for review Message-ID: <201211232304.qANN4RtH015615@skunkworks.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://p4web.freebsd.org/@@219833?ac=10 Change 219833 by rwatson@rwatson_cinnamon on 2012/11/23 23:04:13 Trickle a few more post-OpenBSM 1.2-alpha2 tweaks into the FreeBSD merge tree, such as config.h fixes. Affected files ... .. //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/autogen.sh#2 integrate .. //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/bin/auditd/audit_triggers.defs#2 integrate .. //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/bin/auditd/auditd.8#3 integrate .. //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/bin/auditd/auditd_darwin.c#2 integrate .. //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/bin/auditd/auditd_fbsd.c#2 integrate .. //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/bin/auditdistd/auditdistd.c#2 integrate .. //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/bin/auditdistd/parse.y#2 integrate .. //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/bin/auditdistd/proto_tcp.c#2 integrate .. //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/bin/auditdistd/proto_tls.c#2 integrate .. //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/bin/auditdistd/proto_uds.c#2 integrate .. //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/bin/auditdistd/receiver.c#2 integrate .. //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/bin/auditdistd/sandbox.c#2 integrate .. //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/bin/auditdistd/sender.c#2 integrate .. //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/bin/auditdistd/subr.c#2 integrate .. //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/bin/auditdistd/synch.h#2 integrate .. //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/bin/auditdistd/token.l#2 integrate .. //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/bin/auditdistd/trail.c#2 integrate .. //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/bin/auditfilterd/auditfilterd.8#2 integrate .. //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/bin/auditfilterd/auditfilterd.c#2 integrate .. //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/bin/auditfilterd/auditfilterd.h#2 integrate .. //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/bin/auditfilterd/auditfilterd_conf.c#2 integrate .. //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/bsm/audit_filter.h#2 integrate .. //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/compat/clock_gettime.h#2 integrate .. //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/compat/strlcpy.h#2 integrate .. //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/etc/audit_filter#2 integrate .. //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/libauditd/libauditd.3#2 integrate .. //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/libbsm/au_domain.3#2 integrate .. //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/libbsm/au_errno.3#2 integrate .. //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/libbsm/au_open.3#2 integrate .. //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/libbsm/au_socket_type.3#2 integrate .. //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/libbsm/bsm_domain.c#2 integrate .. //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/libbsm/bsm_fcntl.c#2 integrate .. //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/libbsm/bsm_socket_type.c#2 integrate .. //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/modules/auditfilter_noop/auditfilter_noop.c#2 integrate .. //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/sys/bsm/audit.h#2 integrate .. //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/sys/bsm/audit_domain.h#2 integrate .. //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/sys/bsm/audit_fcntl.h#2 integrate .. //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/sys/bsm/audit_internal.h#2 integrate .. //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/sys/bsm/audit_record.h#2 integrate .. //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/sys/bsm/audit_socket_type.h#2 integrate .. //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/test/bsm/generate.c#2 integrate Differences ... ==== //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/autogen.sh#2 (text) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $P4: //depot/projects/trustedbsd/openbsm/autogen.sh#1 $ +# $P4$ # libtoolize --copy --force ==== //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/bin/auditd/audit_triggers.defs#2 (text) ==== @@ -1,5 +1,5 @@ /* - * $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/audit_triggers.defs#1 $ + * $P4$ */ #include <mach/audit_triggers.defs> ==== //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/bin/auditd/auditd.8#3 (text) ==== @@ -122,6 +122,7 @@ .Xr audit_event 5 , .Xr audit_warn 5 , .Xr audit 8 , +.Xr auditdistd 8 , .Xr launchd 8 .Sh HISTORY The OpenBSM implementation was created by McAfee Research, the security ==== //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/bin/auditd/auditd_darwin.c#2 (text) ==== @@ -26,7 +26,7 @@ * (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 $ + * $P4$ */ #include <sys/types.h> ==== //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/bin/auditd/auditd_fbsd.c#2 (text) ==== @@ -26,7 +26,7 @@ * (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 $ + * $P4$ */ #include <sys/types.h> ==== //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/bin/auditdistd/auditdistd.c#2 (text+ko) ==== @@ -26,10 +26,10 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/bin/auditdistd/auditdistd.c#1 $ + * $P4: //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/bin/auditdistd/auditdistd.c#2 $ */ -#include "config.h" +#include <config/config.h> #include <sys/param.h> #if defined(HAVE_SYS_ENDIAN_H) && defined(HAVE_BSWAP) ==== //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/bin/auditdistd/parse.y#2 (text+ko) ==== @@ -27,10 +27,10 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/bin/auditdistd/parse.y#1 $ + * $P4: //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/bin/auditdistd/parse.y#2 $ */ -#include "config.h" +#include <config/config.h> #include <sys/types.h> #include <sys/queue.h> ==== //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/bin/auditdistd/proto_tcp.c#2 (text+ko) ==== @@ -27,12 +27,10 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/bin/auditdistd/proto_tcp.c#1 $ + * $P4: //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/bin/auditdistd/proto_tcp.c#2 $ */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include <config/config.h> #include <sys/param.h> /* MAXHOSTNAMELEN */ #include <sys/socket.h> ==== //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/bin/auditdistd/proto_tls.c#2 (text+ko) ==== @@ -26,12 +26,10 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/bin/auditdistd/proto_tls.c#1 $ + * $P4: //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/bin/auditdistd/proto_tls.c#2 $ */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include <config/config.h> #include <sys/param.h> /* MAXHOSTNAMELEN */ #include <sys/socket.h> ==== //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/bin/auditdistd/proto_uds.c#2 (text+ko) ==== @@ -26,14 +26,12 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/bin/auditdistd/proto_uds.c#1 $ + * $P4: //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/bin/auditdistd/proto_uds.c#2 $ */ /* UDS - UNIX Domain Socket */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include <config/config.h> #include <sys/types.h> #include <sys/socket.h> ==== //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/bin/auditdistd/receiver.c#2 (text+ko) ==== @@ -26,10 +26,10 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/bin/auditdistd/receiver.c#1 $ + * $P4: //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/bin/auditdistd/receiver.c#2 $ */ -#include "config.h" +#include <config/config.h> #include <sys/param.h> #if defined(HAVE_SYS_ENDIAN_H) && defined(HAVE_BSWAP) ==== //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/bin/auditdistd/sandbox.c#2 (text+ko) ==== @@ -26,12 +26,10 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/bin/auditdistd/sandbox.c#1 $ + * $P4: //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/bin/auditdistd/sandbox.c#2 $ */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include <config/config.h> #include <sys/param.h> #ifdef HAVE_JAIL ==== //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/bin/auditdistd/sender.c#2 (text+ko) ==== @@ -26,10 +26,10 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/bin/auditdistd/sender.c#1 $ + * $P4: //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/bin/auditdistd/sender.c#2 $ */ -#include "config.h" +#include <config/config.h> #include <sys/param.h> #if defined(HAVE_SYS_ENDIAN_H) && defined(HAVE_BSWAP) ==== //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/bin/auditdistd/subr.c#2 (text+ko) ==== @@ -23,10 +23,10 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/bin/auditdistd/subr.c#1 $ + * $P4: //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/bin/auditdistd/subr.c#2 $ */ -#include "config.h" +#include <config/config.h> #ifdef HAVE_KQUEUE #include <sys/types.h> ==== //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/bin/auditdistd/synch.h#2 (text+ko) ==== @@ -26,16 +26,12 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/bin/auditdistd/synch.h#1 $ + * $P4: //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/bin/auditdistd/synch.h#2 $ */ #ifndef _SYNCH_H_ #define _SYNCH_H_ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - #include <errno.h> #include <pthread.h> #ifdef HAVE_PTHREAD_NP_H ==== //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/bin/auditdistd/token.l#2 (text+ko) ==== @@ -27,10 +27,10 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/bin/auditdistd/token.l#1 $ + * $P4: //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/bin/auditdistd/token.l#2 $ */ -#include "config.h" +#include <config/config.h> #include <stdio.h> #include <string.h> ==== //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/bin/auditdistd/trail.c#2 (text+ko) ==== @@ -26,10 +26,10 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/bin/auditdistd/trail.c#1 $ + * $P4: //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/bin/auditdistd/trail.c#2 $ */ -#include "config.h" +#include <config/config.h> #include <sys/param.h> #include <sys/stat.h> ==== //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/bin/auditfilterd/auditfilterd.8#2 (text) ==== @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/openbsm/bin/auditfilterd/auditfilterd.8#6 $ +.\" $P4$ .\" .Dd October 3, 2006 .Dt AUDITFILTERD 8 ==== //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/bin/auditfilterd/auditfilterd.c#2 (text) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/bin/auditfilterd/auditfilterd.c#13 $ + * $P4$ */ /* ==== //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/bin/auditfilterd/auditfilterd.h#2 (text) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/bin/auditfilterd/auditfilterd.h#5 $ + * $P4$ */ #define AUDITFILTERD_CONFFILE "/etc/security/audit_filter" ==== //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/bin/auditfilterd/auditfilterd_conf.c#2 (text) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/bin/auditfilterd/auditfilterd_conf.c#5 $ + * $P4$ */ /* ==== //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/bsm/audit_filter.h#2 (text) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/bsm/audit_filter.h#4 $ + * $P4$ */ #ifndef _BSM_AUDIT_FILTER_H_ ==== //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/compat/clock_gettime.h#2 (text) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/compat/clock_gettime.h#3 $ + * $P4$ */ /* ==== //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/compat/strlcpy.h#2 (text) ==== @@ -25,7 +25,7 @@ * 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 $ + * $P4$ */ /* ==== //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/etc/audit_filter#2 (text) ==== @@ -1,5 +1,5 @@ # -# $P4: //depot/projects/trustedbsd/openbsm/etc/audit_filter#1 $ +# $P4$ # # modulename:various arguments here # ==== //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/libauditd/libauditd.3#2 (text) ==== @@ -26,7 +26,7 @@ .\" 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 $ +.\" $P4$ .\" .Dd December 27, 2008 .Dt LIBAUDITD 3 ==== //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/libbsm/au_domain.3#2 (text) ==== @@ -26,7 +26,7 @@ .\" 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 $ +.\" $P4$ .\" .Dd December 28, 2008 .Dt AU_BSM_TO_DOMAIN 3 ==== //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/libbsm/au_errno.3#2 (text) ==== @@ -26,7 +26,7 @@ .\" 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 $ +.\" $P4$ .\" .Dd December 8, 2008 .Dt AU_BSM_TO_ERRNO 3 ==== //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/libbsm/au_open.3#2 (text) ==== @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/openbsm/libbsm/au_open.3#8 $ +.\" $P4$ .\" .Dd March 4, 2006 .Dt AU_OPEN 3 ==== //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/libbsm/au_socket_type.3#2 (text) ==== @@ -26,7 +26,7 @@ .\" 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 $ +.\" $P4$ .\" .Dd December 28, 2008 .Dt AU_BSM_TO_SOCKET_TYPE 3 ==== //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/libbsm/bsm_domain.c#2 (text) ==== @@ -26,7 +26,7 @@ * 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 $ + * $P4$ */ #include <sys/types.h> ==== //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/libbsm/bsm_fcntl.c#2 (text) ==== @@ -26,7 +26,7 @@ * 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 $ + * $P4$ */ #include <sys/param.h> ==== //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/libbsm/bsm_socket_type.c#2 (text) ==== @@ -26,7 +26,7 @@ * 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 $ + * $P4$ */ #include <sys/types.h> ==== //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/modules/auditfilter_noop/auditfilter_noop.c#2 (text) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/modules/auditfilter_noop/auditfilter_noop.c#6 $ + * $P4$ */ /* ==== //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/sys/bsm/audit.h#2 (text) ==== @@ -26,7 +26,7 @@ * (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 $ + * $P4$ */ #ifndef _BSM_AUDIT_H ==== //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/sys/bsm/audit_domain.h#2 (text) ==== @@ -26,7 +26,7 @@ * 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 $ + * $P4$ */ #ifndef _BSM_AUDIT_DOMAIN_H_ ==== //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/sys/bsm/audit_fcntl.h#2 (text) ==== @@ -26,7 +26,7 @@ * 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 $ + * $P4$ */ #ifndef _BSM_AUDIT_FCNTL_H_ ==== //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/sys/bsm/audit_internal.h#2 (text) ==== @@ -30,7 +30,7 @@ * (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#5 $ + * $P4$ */ #ifndef _AUDIT_INTERNAL_H ==== //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/sys/bsm/audit_record.h#2 (text) ==== @@ -26,7 +26,7 @@ * (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 $ + * $P4$ */ #ifndef _BSM_AUDIT_RECORD_H_ ==== //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/sys/bsm/audit_socket_type.h#2 (text) ==== @@ -26,7 +26,7 @@ * 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 $ + * $P4$ */ #ifndef _BSM_AUDIT_SOCKET_TYPE_H_ ==== //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/test/bsm/generate.c#2 (text) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/test/bsm/generate.c#14 $ + * $P4$ */ /*
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201211232304.qANN4RtH015615>