From e62312b69263d9a3edcc6deaf63ed19f723df1f4 Mon Sep 17 00:00:00 2001 From: rwatson Date: Fri, 1 Jun 2007 13:53:37 +0000 Subject: Remove AUDIT_PRINTF() debugging statements and definition; clean up or remove associated comments. Slip audit_file_rotate_wait assignment in audit_rotate_vnode() before the drop of the global audit mutex. Obtained from: TrustedBSD Project --- sys/security/audit/audit.c | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) (limited to 'sys/security/audit/audit.c') diff --git a/sys/security/audit/audit.c b/sys/security/audit/audit.c index 97da0df..8a7e47f 100644 --- a/sys/security/audit/audit.c +++ b/sys/security/audit/audit.c @@ -427,16 +427,11 @@ audit_commit(struct kaudit_record *ar, int error, int retval) } /* - * Constrain the number of committed audit records based on - * the configurable parameter. + * Constrain the number of committed audit records based on the + * configurable parameter. */ - while (audit_q_len >= audit_qctrl.aq_hiwater) { - AUDIT_PRINTF(("audit_commit: sleeping to wait for " - "audit queue to drain below high water mark\n")); + while (audit_q_len >= audit_qctrl.aq_hiwater) cv_wait(&audit_watermark_cv, &audit_mtx); - AUDIT_PRINTF(("audit_commit: woke up waiting for " - "audit queue draining\n")); - } TAILQ_INSERT_TAIL(&audit_q, ar, k_q); audit_q_len++; @@ -540,11 +535,7 @@ audit_syscall_exit(int error, struct thread *td) retval = td->td_retval[0]; audit_commit(td->td_ar, error, retval); - if (td->td_ar != NULL) - AUDIT_PRINTF(("audit record committed by pid %d\n", - td->td_proc->p_pid)); td->td_ar = NULL; - } /* -- cgit v1.1