PERFORCE change 104244 for review

Robert Watson rwatson at FreeBSD.org
Wed Aug 16 15:01:14 UTC 2006 

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

Change 104244 by rwatson at rwatson_zoo on 2006/08/16 15:00:06

	Integrate OpenBSM 1.0a8 changes into TrustedBSD audit3 branch.

Affected files ...

.. //depot/projects/trustedbsd/audit3/contrib/openbsm/HISTORY#9 integrate
.. //depot/projects/trustedbsd/audit3/contrib/openbsm/README#14 integrate
.. //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit.h#14 integrate
.. //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/libbsm.h#14 integrate
.. //depot/projects/trustedbsd/audit3/contrib/openbsm/config/config.h.in#5 integrate
.. //depot/projects/trustedbsd/audit3/contrib/openbsm/configure#8 integrate
.. //depot/projects/trustedbsd/audit3/contrib/openbsm/configure.ac#9 integrate
.. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_event.c#10 integrate
.. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_io.c#16 integrate
.. //depot/projects/trustedbsd/audit3/contrib/openbsm/test/bsm/generate.c#5 integrate
.. //depot/projects/trustedbsd/audit3/contrib/openbsm/tools/Makefile.am#3 integrate
.. //depot/projects/trustedbsd/audit3/contrib/openbsm/tools/Makefile.in#3 integrate

Differences ...

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

@@ -10,6 +10,10 @@
 - OpenBSM-specific events assigned numbers in the 43xxx range to avoid future
   collisions with Solaris.  Darwin events renamed to AUE_DARWIN_foo, as they
   are now deprecated numberings.
+- autoconf now detects clock_gettime(), which is not available on Darwin.
+- praudit output fixes relating to arg32 and arg64 tokens.
+- Maximum record size updated to 64k-1 to match Solaris record size limit.
+- Various style and comment cleanups in include files.
 
 OpenBSM 1.0 alpha 7
 
@@ -188,4 +192,4 @@
   to support reloading of kernel event table.
 - Allow comments in /etc/security configuration files.
 
-$P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/HISTORY#8 $
+$P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/HISTORY#9 $

==== //depot/projects/trustedbsd/audit3/contrib/openbsm/README#14 (text+ko) ====

@@ -74,6 +74,7 @@
     Olivier Houchard
     Christian Peron
     Martin Fong
+    Pawel Worach
 
 In addition, Coverity, Inc.'s Prevent(tm) static analysis tool and Gimpel
 Software's FlexeLint tool were used to identify a number of bugs in the
@@ -95,4 +96,4 @@
 
     http://www.TrustedBSD.org/
 
-$P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/README#13 $
+$P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/README#14 $

==== //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit.h#14 (text+ko) ====

@@ -30,7 +30,7 @@
  *
  * @APPLE_BSD_LICENSE_HEADER_END@
  *
- * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit.h#13 $
+ * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit.h#14 $
  */
 
 #ifndef _BSM_AUDIT_H
@@ -38,11 +38,12 @@
 
 #define	AUDIT_RECORD_MAGIC	0x828a0f1b
 #define	MAX_AUDIT_RECORDS	20
-#define	MAX_AUDIT_RECORD_SIZE	4096
+#define	MAXAUDITDATA		(0x8000 - 1)
+#define	MAX_AUDIT_RECORD_SIZE	MAXAUDITDATA
 #define	MIN_AUDIT_FILE_SIZE	(512 * 1024)
 
 /*
- * Triggers for the audit daemon
+ * Triggers for the audit daemon.
  */
 #define	AUDIT_TRIGGER_MIN		1
 #define	AUDIT_TRIGGER_LOW_SPACE		1
@@ -53,7 +54,8 @@
 #define	AUDIT_TRIGGER_MAX		5
 
 /*
- * File that will be read for trigger events from the kernel
+ * Special file that will be read for trigger events from the kernel
+ * (FreeBSD).
  */
 #define	AUDIT_TRIGGER_FILE	"/dev/audit"
 
@@ -101,7 +103,7 @@
 #define	AU_ALL		0xffffffff
 
 /*
- * IPC types
+ * IPC types.
  */
 #define	AT_IPC_MSG	((u_char)1)	/* Message IPC id. */
 #define	AT_IPC_SEM	((u_char)2)	/* Semaphore IPC id. */
@@ -146,19 +148,6 @@
 /*
  * Audit policy controls.
  */
-#ifdef OLD_WORLD_ORDER
-#define	AUDIT_CNT	0x0001
-#define	AUDIT_AHLT	0x0002
-#define	AUDIT_ARGV	0x0004
-#define	AUDIT_ARGE	0x0008
-#define	AUDIT_PASSWD	0x0010
-#define	AUDIT_SEQ	0x0020
-#define	AUDIT_WINDATA	0x0040
-#define	AUDIT_USER	0x0080
-#define	AUDIT_GROUP	0x0100
-#define	AUDIT_TRAIL	0x0200
-#define	AUDIT_PATH	0x0400
-#else	/* !OLD_WORLD_ORDER */
 #define	AUDIT_CNT	0x0001
 #define	AUDIT_AHLT	0x0002
 #define	AUDIT_ARGV	0x0004
@@ -173,10 +162,9 @@
 #define	AUDIT_PUBLIC	0x0800
 #define	AUDIT_ZONENAME	0x1000
 #define	AUDIT_PERZONE	0x2000
-#endif	/* !OLD_WORLD_ORDER */
 
 /*
- * Audit queue control parameters
+ * Audit queue control parameters.
  */
 #define	AQ_HIWATER	100
 #define	AQ_MAXHIGH	10000

==== //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/libbsm.h#14 (text+ko) ====

@@ -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/audit3/contrib/openbsm/bsm/libbsm.h#13 $
+ * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/libbsm.h#14 $
  */
 
 #ifndef _LIBBSM_H_
@@ -37,8 +37,8 @@
  * solely to allow OpenSSH to compile; Darwin/Apple code should not use them.
  */
 
-#define	MAX_ARGS	10
-#define	MAX_ENV		10
+#define	BSM_MAX_ARGS	10
+#define	BSM_MAX_ENV	10
 
 #include <sys/types.h>
 #include <sys/cdefs.h>
@@ -82,11 +82,10 @@
 #define	BSM_TEXTBUFSZ		MAX_AUDITSTRING_LEN	/* OpenSSH compatibility */
 
 /*
- * These are referenced in Solaris 9 au_open(3BSM); values are guesses.
- * Provided for OpenSSH compatibility.
+ * Arguments to au_close(3).
  */
-#define	AU_TO_NO_WRITE		0
-#define	AU_TO_WRITE		1
+#define	AU_TO_NO_WRITE		0	/* Abandon audit record. */
+#define	AU_TO_WRITE		1	/* Commit audit record. */
 
 __BEGIN_DECLS
 struct au_event_ent {
@@ -138,15 +137,6 @@
 
 __BEGIN_DECLS
 
-/*
- * Internal representation of audit user in libnsl.
- */
-typedef struct au_user_str_s {
-	char	*au_name;
-	char	*au_always;
-	char	*au_never;
-} au_user_str_t;
-
 typedef struct au_tid32 {
 	u_int32_t	port;
 	u_int32_t	addr;
@@ -228,7 +218,7 @@
  */
 typedef struct {
 	u_int32_t	 count;
-	char		*text[MAX_ARGS];
+	char		*text[BSM_MAX_ARGS];
 } au_execarg_t;
 
 /*
@@ -237,7 +227,7 @@
  */
 typedef struct {
 	u_int32_t	 count;
-	char		*text[MAX_ENV];
+	char		*text[BSM_MAX_ENV];
 } au_execenv_t;
 
 /*
@@ -729,8 +719,6 @@
 
 /*
  * Functions relating to querying audit event information.
- *
- * XXXRW: getauevnonam() has no _r version?
  */
 void			 setauevent(void);
 void			 endauevent(void);
@@ -770,6 +758,11 @@
 			    char *del, char raw, char sfrm);
 __END_DECLS
 
+/*
+ * The remaining APIs are associated with Apple's BSM implementation, in
+ * particular as relates to Mach IPC auditing and triggers passed via Mach
+ * IPC.
+ */
 #ifdef __APPLE__
 #include <sys/appleapiopts.h>
 

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

@@ -12,6 +12,9 @@
 /* Define to 1 if your system has a working `chown' function. */
 #undef HAVE_CHOWN
 
+/* Define to 1 if you have the `clock_gettime' function. */
+#undef HAVE_CLOCK_GETTIME
+
 /* Define to 1 if you have the <dlfcn.h> header file. */
 #undef HAVE_DLFCN_H
 

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

@@ -1,7 +1,7 @@
 #! /bin/sh
-# From configure.ac P4: //depot/projects/trustedbsd/openbsm/configure.ac#23 .
+# From configure.ac P4: //depot/projects/trustedbsd/openbsm/configure.ac#26 .
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for OpenBSM 1.0a7.
+# Generated by GNU Autoconf 2.59 for OpenBSM 1.0a8.
 #
 # Report bugs to <trustedbsd-audit at TrustesdBSD.org>.
 #
@@ -424,8 +424,8 @@
 # Identity of this package.
 PACKAGE_NAME='OpenBSM'
 PACKAGE_TARNAME='openbsm'
-PACKAGE_VERSION='1.0a7'
-PACKAGE_STRING='OpenBSM 1.0a7'
+PACKAGE_VERSION='1.0a8'
+PACKAGE_STRING='OpenBSM 1.0a8'
 PACKAGE_BUGREPORT='trustedbsd-audit at TrustesdBSD.org'
 
 ac_unique_file="bin/auditreduce/auditreduce.c"
@@ -955,7 +955,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures OpenBSM 1.0a7 to adapt to many kinds of systems.
+\`configure' configures OpenBSM 1.0a8 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1021,7 +1021,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of OpenBSM 1.0a7:";;
+     short | recursive ) echo "Configuration of OpenBSM 1.0a8:";;
    esac
   cat <<\_ACEOF
 
@@ -1162,7 +1162,7 @@
 test -n "$ac_init_help" && exit 0
 if $ac_init_version; then
   cat <<\_ACEOF
-OpenBSM configure 1.0a7
+OpenBSM configure 1.0a8
 generated by GNU Autoconf 2.59
 
 Copyright (C) 2003 Free Software Foundation, Inc.
@@ -1176,7 +1176,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by OpenBSM $as_me 1.0a7, which was
+It was created by OpenBSM $as_me 1.0a8, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 
   $ $0 $@
@@ -19278,7 +19278,7 @@
 
 # Define the identity of the package.
  PACKAGE=OpenBSM
- VERSION=1.0a7
+ VERSION=1.0a8
 
 
 cat >>confdefs.h <<_ACEOF
@@ -22833,7 +22833,8 @@
 
 
 
-for ac_func in bzero 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 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
@@ -23477,7 +23478,7 @@
 } >&5
 cat >&5 <<_CSEOF
 
-This file was extended by OpenBSM $as_me 1.0a7, which was
+This file was extended by OpenBSM $as_me 1.0a8, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -23540,7 +23541,7 @@
 
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-OpenBSM config.status 1.0a7
+OpenBSM config.status 1.0a8
 configured by $0, generated by GNU Autoconf 2.59,
   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
 

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

@@ -3,7 +3,7 @@
 
 AC_PREREQ(2.59)
 AC_INIT([OpenBSM], [1.0a8], [trustedbsd-audit at TrustesdBSD.org],[openbsm])
-AC_REVISION([$P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/configure.ac#8 $])
+AC_REVISION([$P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/configure.ac#9 $])
 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 ftruncate gettimeofday inet_ntoa memset strchr strerror strrchr strstr strtol strtoul])
+AC_CHECK_FUNCS([bzero clock_gettime ftruncate gettimeofday inet_ntoa memset strchr strerror 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_event.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_event.c#9 $
+ * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_event.c#10 $
  */
 
 #include <bsm/libbsm.h>
@@ -62,27 +62,32 @@
 	evdesc = strtok_r(NULL, eventdelim, &last);
 	evclass = strtok_r(NULL, eventdelim, &last);
 
-	if ((evno == NULL) || (evname == NULL) || (evdesc == NULL) ||
-	    (evclass == NULL))
+	if ((evno == NULL) || (evname == NULL))
 		return (NULL);
 
 	if (strlen(evname) >= AU_EVENT_NAME_MAX)
 		return (NULL);
 
 	strcpy(e->ae_name, evname);
-	if (strlen(evdesc) >= AU_EVENT_DESC_MAX)
-		return (NULL);
-	strcpy(e->ae_desc, evdesc);
+	if (evdesc != NULL) {
+		if (strlen(evdesc) >= AU_EVENT_DESC_MAX)
+			return (NULL);
+		strcpy(e->ae_desc, evdesc);
+	} else
+		strcpy(e->ae_desc, "");
 
 	e->ae_number = atoi(evno);
 
 	/*
 	 * Find out the mask that corresponds to the given list of classes.
 	 */
-	if (getauditflagsbin(evclass, &evmask) != 0)
+	if (evclass != NULL) {
+		if (getauditflagsbin(evclass, &evmask) != 0)
+			e->ae_class = AU_NULL;
+		else
+			e->ae_class = evmask.am_success;
+	} else
 		e->ae_class = AU_NULL;
-	else
-		e->ae_class = evmask.am_success;
 
 	return (e);
 }

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

@@ -31,7 +31,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_io.c#15 $
+ * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_io.c#16 $
  */
 
 #include <sys/types.h>
@@ -820,7 +820,7 @@
 	print_delim(fp, del);
 	print_1_byte(fp, tok->tt.arg32.no, "%u");
 	print_delim(fp, del);
-	print_4_bytes(fp, tok->tt.arg32.val, "%#x");
+	print_4_bytes(fp, tok->tt.arg32.val, "0x%x");
 	print_delim(fp, del);
 	print_string(fp, tok->tt.arg32.text, tok->tt.arg32.len);
 }
@@ -859,7 +859,7 @@
 	print_delim(fp, del);
 	print_1_byte(fp, tok->tt.arg64.no, "%u");
 	print_delim(fp, del);
-	print_8_bytes(fp, tok->tt.arg64.val, "%#llx");
+	print_8_bytes(fp, tok->tt.arg64.val, "0x%llx");
 	print_delim(fp, del);
 	print_string(fp, tok->tt.arg64.text, tok->tt.arg64.len);
 }

==== //depot/projects/trustedbsd/audit3/contrib/openbsm/test/bsm/generate.c#5 (text+ko) ====

@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/test/bsm/generate.c#4 $
+ * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/test/bsm/generate.c#5 $
  */
 
 /*
@@ -144,6 +144,17 @@
 	write_token(directory, token_filename, file_token);
 }
 
+static void
+generate_file_record(const char *directory, const char *record_filename)
+{
+	token_t *file_token;
+
+	file_token = au_to_file("test", file_token_timeval);
+	if (file_token == NULL)
+		err(EX_UNAVAILABLE, "au_to_file");
+	write_record(directory, record_filename, file_token, AUE_NULL);
+}
+
 /*
  * AUT_OHEADER
  */
@@ -326,6 +337,32 @@
 	write_token(directory, buf, subject32ex_token);
 }
 
+static void
+generate_subject32ex_record(const char *directory, const char *record_filename,
+    u_int32_t type)
+{
+	token_t *subject32ex_token;
+	char *buf;
+
+	buf = (char *)malloc(strlen(record_filename) + 6);
+	if (type == AU_IPv6) {
+		inet_pton(AF_INET6, "fe80::1", subject32_tid_addr.at_addr);
+		subject32_tid_addr.at_type = AU_IPv6;
+		sprintf(buf, "%s%s", record_filename, "-IPv6");
+	} else {
+		subject32_tid_addr.at_addr[0] = inet_addr("127.0.0.1");
+		subject32_tid_addr.at_type = AU_IPv4;
+		sprintf(buf, "%s%s", record_filename, "-IPv4");
+	}
+
+	subject32ex_token = au_to_subject32_ex(subject32_auid, subject32_euid,
+	    subject32_egid, subject32_ruid, subject32_rgid, subject32_pid,
+	    subject32_sid, &subject32_tid_addr);
+	if (subject32ex_token == NULL)
+		err(EX_UNAVAILABLE, "au_to_subject32_ex");
+	write_record(directory, record_filename, subject32ex_token, AUE_NULL);
+}
+
 static au_id_t		 process32_auid = 0x12345678;
 static uid_t		 process32_euid = 0x01234567;
 static gid_t		 process32_egid = 0x23456789;
@@ -382,6 +419,22 @@
 	write_token(directory, token_filename, process32ex_token);
 }
 
+static void
+generate_process32ex_record(const char *directory, const char *record_filename)
+{
+	token_t *process32ex_token;
+
+	process32_tid_addr.at_addr[0] = inet_addr("127.0.0.1");
+	process32_tid_addr.at_type = AU_IPv4;
+
+	process32ex_token = au_to_process32_ex(process32_auid, process32_euid,
+	    process32_egid, process32_ruid, process32_rgid, process32_pid,
+	    process32_sid, &process32_tid_addr);
+	if (process32ex_token == NULL)
+		err(EX_UNAVAILABLE, "au_to_process32_ex");
+	write_record(directory, record_filename, process32ex_token, AUE_NULL);
+}
+
 static char		 return32_status = 0xd7;
 static uint32_t		 return32_ret = 0x12345678;
 
@@ -777,29 +830,29 @@
 	}
 
 	if (do_records) {
-		generate_file_token(directory, "file_token");
-		generate_trailer_token(directory, "trailer_token");
-		generate_header32_token(directory, "header32_token");
-		generate_data_token(directory, "data_record");
-		generate_ipc_token(directory, "ipc_record");
-		generate_path_token(directory, "path_record");
-		generate_subject32_token(directory, "subject32_record");
-		generate_subject32ex_token(directory, "subject32ex_record", AU_IPv4);
-		generate_subject32ex_token(directory, "subject32ex_record", AU_IPv6);
-		generate_process32_token(directory, "process32_record");
-		generate_process32ex_token(directory, "process32ex_token");
-		generate_return32_token(directory, "return32_record");
-		generate_text_token(directory, "text_record");
-		generate_opaque_token(directory, "opaque_record");
-		generate_in_addr_token(directory, "in_addr_record");
-		generate_ip_token(directory, "ip_record");
-		generate_iport_token(directory, "iport_record");
-		generate_arg32_token(directory, "arg32_record");
-		generate_seq_token(directory, "seq_record");
-		generate_attr_token(directory,  "attr_record");
-		generate_ipc_perm_token(directory, "ipc_perm_record");
-		generate_groups_token(directory, "groups_record");
-		generate_attr32_token(directory, "attr32_record");
+		generate_file_record(directory, "file_record");
+		generate_data_record(directory, "data_record");
+		generate_ipc_record(directory, "ipc_record");
+		generate_path_record(directory, "path_record");
+		generate_subject32_record(directory, "subject32_record");
+		generate_subject32ex_record(directory, "subject32ex_record",
+		    AU_IPv4);
+		generate_subject32ex_record(directory, "subject32ex_record",
+		    AU_IPv6);
+		generate_process32_record(directory, "process32_record");
+		generate_process32ex_record(directory, "process32ex_record");
+		generate_return32_record(directory, "return32_record");
+		generate_text_record(directory, "text_record");
+		generate_opaque_record(directory, "opaque_record");
+		generate_in_addr_record(directory, "in_addr_record");
+		generate_ip_record(directory, "ip_record");
+		generate_iport_record(directory, "iport_record");
+		generate_arg32_record(directory, "arg32_record");
+		generate_seq_record(directory, "seq_record");
+		generate_attr_record(directory,  "attr_record");
+		generate_ipc_perm_record(directory, "ipc_perm_record");
+		generate_groups_record(directory, "groups_record");
+		generate_attr32_record(directory, "attr32_record");
 	}
 
 	return (0);

==== //depot/projects/trustedbsd/audit3/contrib/openbsm/tools/Makefile.am#3 (text+ko) ====

@@ -1,9 +1,9 @@
 #
-# $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/tools/Makefile.am#2 $
+# $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/tools/Makefile.am#3 $
 #
 
 INCLUDES = -I$(top_srcdir)
 
-bin_PROGRAMS = autool
-autool_SOURCES = autool.c
-autool_LDADD = $(top_builddir)/libbsm/libbsm.la
+bin_PROGRAMS = audump
+audump_SOURCES = audump.c
+audump_LDADD = $(top_builddir)/libbsm/libbsm.la

==== //depot/projects/trustedbsd/audit3/contrib/openbsm/tools/Makefile.in#3 (text+ko) ====

@@ -15,7 +15,7 @@
 @SET_MAKE@
 
 #
-# $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/tools/Makefile.in#2 $
+# $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/tools/Makefile.in#3 $
 #
 
 srcdir = @srcdir@
@@ -40,7 +40,7 @@
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-bin_PROGRAMS = autool$(EXEEXT)
+bin_PROGRAMS = audump$(EXEEXT)
 subdir = tools
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -53,9 +53,9 @@
 am__installdirs = "$(DESTDIR)$(bindir)"
 binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 PROGRAMS = $(bin_PROGRAMS)
-am_autool_OBJECTS = autool.$(OBJEXT)
-autool_OBJECTS = $(am_autool_OBJECTS)
-autool_DEPENDENCIES = $(top_builddir)/libbsm/libbsm.la
+am_audump_OBJECTS = audump.$(OBJEXT)
+audump_OBJECTS = $(am_audump_OBJECTS)
+audump_DEPENDENCIES = $(top_builddir)/libbsm/libbsm.la
 DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/config
 depcomp = $(SHELL) $(top_srcdir)/config/depcomp
 am__depfiles_maybe = depfiles
@@ -67,8 +67,8 @@
 CCLD = $(CC)
 LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-SOURCES = $(autool_SOURCES)
-DIST_SOURCES = $(autool_SOURCES)
+SOURCES = $(audump_SOURCES)
+DIST_SOURCES = $(audump_SOURCES)
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -174,8 +174,8 @@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 INCLUDES = -I$(top_srcdir)
-autool_SOURCES = autool.c
-autool_LDADD = $(top_builddir)/libbsm/libbsm.la
+audump_SOURCES = audump.c
+audump_LDADD = $(top_builddir)/libbsm/libbsm.la
 all: all-am
 
 .SUFFIXES:
@@ -237,9 +237,9 @@
 	  echo " rm -f $$p $$f"; \
 	  rm -f $$p $$f ; \
 	done
-autool$(EXEEXT): $(autool_OBJECTS) $(autool_DEPENDENCIES) 
-	@rm -f autool$(EXEEXT)
-	$(LINK) $(autool_LDFLAGS) $(autool_OBJECTS) $(autool_LDADD) $(LIBS)
+audump$(EXEEXT): $(audump_OBJECTS) $(audump_DEPENDENCIES) 
+	@rm -f audump$(EXEEXT)
+	$(LINK) $(audump_LDFLAGS) $(audump_OBJECTS) $(audump_LDADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -247,7 +247,7 @@
 distclean-compile:
 	-rm -f *.tab.c
 
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/autool.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/audump.Po at am__quote@
 
 .c.o:
 @am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \

More information about the trustedbsd-cvs mailing list