PERFORCE change 93570 for review

[Robert Watson]

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

Change 93570 by rwatson at rwatson_peppercorn on 2006/03/19 14:45:26

	Add audit pipe ioctls to query minimum and maximum audit queue
	lengths.

Affected files ...

.. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_ioctl.h#3 edit
.. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_pipe.c#13 edit

Differences ...

==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit_ioctl.h#3 (text+ko) ====

@@ -36,16 +36,18 @@
 /*
  * Ioctls to read and control the behavior of individual audit pipe devices.
  */
-#define	AUDITPIPE_GET_QLEN	_IOR(AUDITPIPE_IOBASE, 1, u_int)
-#define	AUDITPIPE_GET_QLIMIT	_IOR(AUDITPIPE_IOBASE, 2, u_int)
-#define	AUDITPIPE_SET_QLIMIT	_IOW(AUDITPIPE_IOBASE, 3, u_int)
+#define	AUDITPIPE_GET_QLEN		_IOR(AUDITPIPE_IOBASE, 1, u_int)
+#define	AUDITPIPE_GET_QLIMIT		_IOR(AUDITPIPE_IOBASE, 2, u_int)
+#define	AUDITPIPE_SET_QLIMIT		_IOW(AUDITPIPE_IOBASE, 3, u_int)
+#define	AUDITPIPE_GET_QLIMIT_MIN	_IOR(AUDITPIPE_IOBASE, 4, u_int)
+#define	AUDITPIPE_GET_QLIMIT_MAX	_IOR(AUDITPIPE_IOBASE, 5, u_int)
 
 /*
  * Ioctls to retrieve audit pipe statistics.
  */
-#define	AUDITPIPE_GET_INSERTS	_IOR(AUDITPIPE_IOBASE, 100, u_int64_t)
-#define	AUDITPIPE_GET_READS	_IOR(AUDITPIPE_IOBASE, 101, u_int64_t)
-#define	AUDITPIPE_GET_DROPS	_IOR(AUDITPIPE_IOBASE, 102, u_int64_t)
-#define	AUDITPIPE_GET_TRUNCATES	_IOR(AUDITPIPE_IOBASE, 103, u_int64_t)
+#define	AUDITPIPE_GET_INSERTS		_IOR(AUDITPIPE_IOBASE, 100, u_int64_t)
+#define	AUDITPIPE_GET_READS		_IOR(AUDITPIPE_IOBASE, 101, u_int64_t)
+#define	AUDITPIPE_GET_DROPS		_IOR(AUDITPIPE_IOBASE, 102, u_int64_t)
+#define	AUDITPIPE_GET_TRUNCATES		_IOR(AUDITPIPE_IOBASE, 103, u_int64_t)
 
 #endif /* _SECURITY_AUDIT_AUDIT_IOCTL_H_ */

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

@@ -457,6 +457,16 @@
 			error = EINVAL;
 		break;
 
+	case AUDITPIPE_GET_QLIMIT_MIN:
+		*(u_int *)data = AUDIT_PIPE_QLIMIT_MIN;
+		error = 0;
+		break;
+
+	case AUDITPIPE_GET_QLIMIT_MAX:
+		*(u_int *)data = AUDIT_PIPE_QLIMIT_MAX;
+		error = 0;
+		break;
+
 	case AUDITPIPE_GET_INSERTS:
 		*(u_int *)data = ap->ap_inserts;
 		error = 0;