PERFORCE change 79541 for review

[Wayne Salamon]

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

Change 79541 by wsalamon at rickenbacker on 2005/07/04 12:16:46

	Change the audit test library to use auitctl() to enable auditing
	and auditon() to disable auditing, matching the recent change to the
	syscalls.

Affected files ...

.. //depot/projects/trustedbsd/audit3/tools/regression/audit/test/lib/audittest.c#4 edit

Differences ...

==== //depot/projects/trustedbsd/audit3/tools/regression/audit/test/lib/audittest.c#4 (text+ko) ====

@@ -32,6 +32,7 @@
 #include <fcntl.h>
 #include <sys/types.h>
 #include <sys/stat.h>
+#include <sys/queue.h>
 #include <bsm/audit.h>
 #include <bsm/libbsm.h>
 #include <audittest.h>
@@ -58,7 +59,7 @@
 		exit(-1);
 	}
 	fn = logfile;
-	ret = auditctl(AC_SETLOGFILE, &fn, sizeof(fn));
+	ret = auditctl(fn);
 	if (ret != 0) {
 		perror("auditctl() failed");
 		exit(-1);
@@ -106,9 +107,10 @@
 {
 
 	int ret;
-	ret = auditctl(AC_SHUTDOWN, NULL, 0);
+	long cond = AUC_DISABLED;
+	ret = auditon(A_SETCOND, &cond, sizeof(cond));
 	if (ret != 0) {
-		perror("auditctl() shutdown failed");
+		perror("auditon() shutdown failed");
 		return (ret);
 	}
 	printf("Audit shutdown complete.\n");