Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 22 Jul 2012 13:26:14 GMT
From:      Robert Watson <rwatson@FreeBSD.org>
To:        Perforce Change Reviews <perforce@freebsd.org>
Subject:   PERFORCE change 214755 for review
Message-ID:  <201207221326.q6MDQE9w063126@skunkworks.freebsd.org>

next in thread | raw e-mail | index | archive | help
http://p4web.freebsd.org/@@214755?ac=10

Change 214755 by rwatson@rwatson_lethe on 2012/07/22 13:25:11

	Add FreeBSD vis(3) to OpenBSM compat routines to assist with
	XML rendering.

Affected files ...

.. //depot/projects/trustedbsd/openbsm/compat/vis.h#1 add
.. //depot/projects/trustedbsd/openbsm/configure.ac#60 edit
.. //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#74 edit

Differences ...

==== //depot/projects/trustedbsd/openbsm/configure.ac#60 (text+ko) ====

@@ -3,7 +3,7 @@
 
 AC_PREREQ(2.59)
 AC_INIT([OpenBSM], [1.2alpha1], [trustedbsd-audit@TrustesdBSD.org],[openbsm])
-AC_REVISION([$P4: //depot/projects/trustedbsd/openbsm/configure.ac#59 $])
+AC_REVISION([$P4: //depot/projects/trustedbsd/openbsm/configure.ac#60 $])
 AC_CONFIG_SRCDIR([bin/auditreduce/auditreduce.c])
 AC_CONFIG_AUX_DIR(config)
 AC_CONFIG_MACRO_DIR([m4])
@@ -86,7 +86,7 @@
 AC_TYPE_SIGNAL
 AC_FUNC_STAT
 AC_FUNC_STRFTIME
-AC_CHECK_FUNCS([bzero clock_gettime ftruncate gettimeofday inet_ntoa memset strchr strerror strlcat strlcpy strrchr strstr strtol strtoul pthread_mutex_lock])
+AC_CHECK_FUNCS([bzero clock_gettime ftruncate gettimeofday inet_ntoa memset strchr strerror strlcat strlcpy strrchr strstr strtol strtoul pthread_mutex_lock vis])
 
 # 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/openbsm/libbsm/bsm_io.c#74 (text+ko) ====

@@ -32,7 +32,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_io.c#73 $
+ * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#74 $
  */
 
 #include <sys/types.h>
@@ -76,7 +76,12 @@
 #include <string.h>
 #include <pwd.h>
 #include <grp.h>
+
+#ifdef HAVE_VIS
 #include <vis.h>
+#else
+#include <compat/vis.h>
+#endif
 
 #include <bsm/audit_internal.h>
 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201207221326.q6MDQE9w063126>