svn commit: r189033 - in stable/7/sys: . contrib/pf dev/ath/ath_hal
dev/cxgb security/audit
Robert Watson
rwatson at FreeBSD.org
Wed Feb 25 04:32:17 PST 2009
Author: rwatson
Date: Wed Feb 25 12:32:15 2009
New Revision: 189033
URL: http://svn.freebsd.org/changeset/base/189033
Log:
Merge 3184510 from head to stable/7:
Since there is no longer the opportunity for record truncation, just
return 0 if the truncation counter is queried on an audit pipe.
Sponsored by: Apple, Inc.
Modified:
stable/7/sys/ (props changed)
stable/7/sys/contrib/pf/ (props changed)
stable/7/sys/dev/ath/ath_hal/ (props changed)
stable/7/sys/dev/cxgb/ (props changed)
stable/7/sys/security/audit/audit_pipe.c
Modified: stable/7/sys/security/audit/audit_pipe.c
==============================================================================
--- stable/7/sys/security/audit/audit_pipe.c Wed Feb 25 12:00:15 2009 (r189032)
+++ stable/7/sys/security/audit/audit_pipe.c Wed Feb 25 12:32:15 2009 (r189033)
@@ -144,7 +144,6 @@ struct audit_pipe {
u_int64_t ap_inserts; /* Records added. */
u_int64_t ap_reads; /* Records read. */
u_int64_t ap_drops; /* Records dropped. */
- u_int64_t ap_truncates; /* Records too long. */
/*
* Fields relating to pipe interest: global masks for unmatched
@@ -924,7 +923,7 @@ audit_pipe_ioctl(struct cdev *dev, u_lon
break;
case AUDITPIPE_GET_TRUNCATES:
- *(u_int *)data = ap->ap_truncates;
+ *(u_int *)data = 0;
error = 0;
break;
More information about the svn-src-stable-7
mailing list