PERFORCE change 106413 for review

[Robert Watson]

http://perforce.freebsd.org/chv.cgi?CH=106413

Change 106413 by rwatson at rwatson_zoo on 2006/09/20 16:43:50

	Integrate remaining OpenBSM 1.0 alpha 11 changes to audit3 branch.

Affected files ...

.. //depot/projects/trustedbsd/audit3/contrib/openbsm/HISTORY#15 integrate
.. //depot/projects/trustedbsd/audit3/contrib/openbsm/compat/strlcat.h#1 branch
.. //depot/projects/trustedbsd/audit3/contrib/openbsm/config/config.h.in#7 integrate
.. //depot/projects/trustedbsd/audit3/contrib/openbsm/configure#13 integrate
.. //depot/projects/trustedbsd/audit3/contrib/openbsm/configure.ac#14 integrate
.. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_control.c#10 integrate
.. //depot/projects/trustedbsd/audit3/contrib/openbsm/test/reference/arg32_record#1 branch
.. //depot/projects/trustedbsd/audit3/contrib/openbsm/test/reference/arg32_token#1 branch
.. //depot/projects/trustedbsd/audit3/contrib/openbsm/test/reference/data_record#1 branch
.. //depot/projects/trustedbsd/audit3/contrib/openbsm/test/reference/data_token#1 branch
.. //depot/projects/trustedbsd/audit3/contrib/openbsm/test/reference/file_record#1 branch
.. //depot/projects/trustedbsd/audit3/contrib/openbsm/test/reference/file_token#1 branch
.. //depot/projects/trustedbsd/audit3/contrib/openbsm/test/reference/header32_token#1 branch
.. //depot/projects/trustedbsd/audit3/contrib/openbsm/test/reference/in_addr_record#1 branch
.. //depot/projects/trustedbsd/audit3/contrib/openbsm/test/reference/in_addr_token#1 branch
.. //depot/projects/trustedbsd/audit3/contrib/openbsm/test/reference/ip_record#1 branch
.. //depot/projects/trustedbsd/audit3/contrib/openbsm/test/reference/ip_token#1 branch
.. //depot/projects/trustedbsd/audit3/contrib/openbsm/test/reference/ipc_record#1 branch
.. //depot/projects/trustedbsd/audit3/contrib/openbsm/test/reference/ipc_token#1 branch
.. //depot/projects/trustedbsd/audit3/contrib/openbsm/test/reference/iport_record#1 branch
.. //depot/projects/trustedbsd/audit3/contrib/openbsm/test/reference/iport_token#1 branch
.. //depot/projects/trustedbsd/audit3/contrib/openbsm/test/reference/opaque_record#1 branch
.. //depot/projects/trustedbsd/audit3/contrib/openbsm/test/reference/opaque_token#1 branch
.. //depot/projects/trustedbsd/audit3/contrib/openbsm/test/reference/path_record#1 branch
.. //depot/projects/trustedbsd/audit3/contrib/openbsm/test/reference/path_token#1 branch
.. //depot/projects/trustedbsd/audit3/contrib/openbsm/test/reference/process32_record#1 branch
.. //depot/projects/trustedbsd/audit3/contrib/openbsm/test/reference/process32_token#1 branch
.. //depot/projects/trustedbsd/audit3/contrib/openbsm/test/reference/process32ex_record#1 branch
.. //depot/projects/trustedbsd/audit3/contrib/openbsm/test/reference/process32ex_token#1 branch
.. //depot/projects/trustedbsd/audit3/contrib/openbsm/test/reference/return32_record#1 branch
.. //depot/projects/trustedbsd/audit3/contrib/openbsm/test/reference/return32_token#1 branch
.. //depot/projects/trustedbsd/audit3/contrib/openbsm/test/reference/seq_record#1 branch
.. //depot/projects/trustedbsd/audit3/contrib/openbsm/test/reference/seq_token#1 branch
.. //depot/projects/trustedbsd/audit3/contrib/openbsm/test/reference/subject32_record#1 branch
.. //depot/projects/trustedbsd/audit3/contrib/openbsm/test/reference/subject32_token#1 branch
.. //depot/projects/trustedbsd/audit3/contrib/openbsm/test/reference/subject32ex_record#1 branch
.. //depot/projects/trustedbsd/audit3/contrib/openbsm/test/reference/subject32ex_token-IPv4#1 branch
.. //depot/projects/trustedbsd/audit3/contrib/openbsm/test/reference/subject32ex_token-IPv6#1 branch
.. //depot/projects/trustedbsd/audit3/contrib/openbsm/test/reference/text_record#1 branch
.. //depot/projects/trustedbsd/audit3/contrib/openbsm/test/reference/text_token#1 branch
.. //depot/projects/trustedbsd/audit3/contrib/openbsm/test/reference/trailer_token#1 branch
.. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm_token.c#26 integrate

Differences ...

==== //depot/projects/trustedbsd/audit3/contrib/openbsm/HISTORY#15 (text+ko) ====

@@ -29,6 +29,8 @@
   current default of setting AUDIT_CNT.
 - Fix bugs in the parsing of large execve(2) arguments and environmental
   variable tokens; increase maximum parsed argument and variable count.
+- configure now detects strlcat(), used by policy-related functions.
+- Reference token and record sample files added to test tree.
 
 OpenBSM 1.0 alpha 10
 
@@ -241,4 +243,4 @@
   to support reloading of kernel event table.
 - Allow comments in /etc/security configuration files.
 
-$P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/HISTORY#14 $
+$P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/HISTORY#15 $

==== //depot/projects/trustedbsd/audit3/contrib/openbsm/config/config.h.in#7 (text+ko) ====

@@ -86,6 +86,9 @@
 /* Define to 1 if you have the <string.h> header file. */
 #undef HAVE_STRING_H
 
+/* Define to 1 if you have the `strlcat' function. */
+#undef HAVE_STRLCAT
+
 /* Define to 1 if you have the `strrchr' function. */
 #undef HAVE_STRRCHR
 

==== //depot/projects/trustedbsd/audit3/contrib/openbsm/configure#13 (xtext) ====

@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.ac P4: //depot/projects/trustedbsd/openbsm/configure.ac#29 .
+# From configure.ac P4: //depot/projects/trustedbsd/openbsm/configure.ac#31 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.59 for OpenBSM 1.0a11.
 #
@@ -22834,7 +22834,8 @@
 
 
 
-for ac_func in bzero clock_gettime ftruncate gettimeofday inet_ntoa memset strchr strerror strrchr strstr strtol strtoul
+
+for ac_func in bzero clock_gettime ftruncate gettimeofday inet_ntoa memset strchr strerror strlcat strrchr strstr strtol strtoul
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
 echo "$as_me:$LINENO: checking for $ac_func" >&5

==== //depot/projects/trustedbsd/audit3/contrib/openbsm/configure.ac#14 (text+ko) ====

@@ -3,7 +3,7 @@
 
 AC_PREREQ(2.59)
 AC_INIT([OpenBSM], [1.0a11], [trustedbsd-audit at TrustesdBSD.org],[openbsm])
-AC_REVISION([$P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/configure.ac#13 $])
+AC_REVISION([$P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/configure.ac#14 $])
 AC_CONFIG_SRCDIR([bin/auditreduce/auditreduce.c])
 AC_CONFIG_AUX_DIR(config)
 AC_CONFIG_HEADER([config/config.h])
@@ -56,7 +56,7 @@
 AC_TYPE_SIGNAL
 AC_FUNC_STAT
 AC_FUNC_STRFTIME
-AC_CHECK_FUNCS([bzero clock_gettime ftruncate gettimeofday inet_ntoa memset strchr strerror strrchr strstr strtol strtoul])
+AC_CHECK_FUNCS([bzero clock_gettime ftruncate gettimeofday inet_ntoa memset strchr strerror strlcat strrchr strstr strtol strtoul])
 
 # sys/queue.h exists on most systems, but its capabilities vary a great deal.
 # test for LIST_FIRST and TAILQ_FOREACH_SAFE, which appears to not exist in

==== //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_control.c#10 (text+ko) ====

@@ -27,7 +27,7 @@
  * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_control.c#9 $
+ * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_control.c#10 $
  */
 
 #include <bsm/libbsm.h>
@@ -38,6 +38,11 @@
 #include <stdio.h>
 #include <stdlib.h>
 
+#include <config/config.h>
+#ifndef HAVE_STRLCAT
+#include <compat/strlcat.h>
+#endif
+
 /*
  * Parse the contents of the audit_control file to return the audit control
  * parameters.  These static fields are protected by 'mutex'.

==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm_token.c#26 (text+ko) ====

@@ -30,7 +30,7 @@
  * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- * $P4: //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm_token.c#25 $
+ * $P4: //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm_token.c#26 $
  * $FreeBSD: src/sys/security/audit/audit_bsm_token.c,v 1.7 2006/09/01 11:45:40 wsalamon Exp $
  */
 
@@ -49,7 +49,6 @@
 #include <netinet/in_systm.h>
 #include <netinet/ip.h>
 
-#include <sys/socketvar.h>
 
 #include <bsm/audit.h>
 #include <bsm/audit_internal.h>