PERFORCE change 85352 for review

[Wayne Salamon]

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

Change 85352 by wsalamon at gretsch on 2005/10/15 22:15:17

	Initialize some globals that weren't previously be initialized.
	Rearrange the globals into groups of related bits.
	       Reported by: panxj <xuejian03 at ios dot cn>

Affected files ...

.. //depot/projects/trustedbsd/audit3/sys/security/audit/kern_audit.c#46 edit

Differences ...

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

@@ -102,9 +102,9 @@
 int					audit_fail_stop;
 
 /*
- * Audit queue control settings (minimum free, low/high water marks, etc.)
+ * Are we currently "failing stop" due to out of disk space?
  */
-struct au_qctrl				audit_qctrl;
+static int				 audit_in_failure;
 
 /*
  * Global audit statistiscs. 
@@ -135,6 +135,11 @@
 static int				audit_pre_q_len;
 
 /*
+ * Audit queue control settings (minimum free, low/high water marks, etc.)
+ */
+struct au_qctrl				audit_qctrl;
+
+/*
  * Condition variable to signal to the worker that it has work to do:
  * either new records are in the queue, or a log replacement is taking
  * place.
@@ -188,11 +193,6 @@
 static int			audit_file_rotate_wait;
 
 /*
- * Are we currently "failing stop" due to out of disk space?
- */
-static int			 audit_in_failure;
-
-/*
  * Perform a deep free of an audit record (core record and referenced objects)
  */
 static void
@@ -594,17 +594,24 @@
 	int error;
 
 	printf("Security auditing service present\n");
-	TAILQ_INIT(&audit_q);
-	audit_q_len = 0;
-	audit_pre_q_len = 0;
 	audit_enabled = 0;
 	audit_suspended = 0;
+	audit_panic_on_write_fail = 0;
+	audit_fail_stop = 0;
+	audit_in_failure = 0;
+
+	audit_replacement_vp = NULL;
 	audit_replacement_cred = NULL;
 	audit_replacement_flag = 0;
-	audit_file_rotate_wait = 0;
-	audit_replacement_vp = NULL;
+
 	audit_fstat.af_filesz = 0;	/* '0' means unset, unbounded */
 	audit_fstat.af_currsz = 0; 
+	audit_nae_mask.am_success = AU_NULL;
+	audit_nae_mask.am_failure = AU_NULL;
+
+	TAILQ_INIT(&audit_q);
+	audit_q_len = 0;
+	audit_pre_q_len = 0;
 	audit_qctrl.aq_hiwater = AQ_HIWATER;
 	audit_qctrl.aq_lowater = AQ_LOWATER;
 	audit_qctrl.aq_bufsz = AQ_BUFSZ;
@@ -619,6 +626,7 @@
 	/* Initialize the BSM audit subsystem. */
 	kau_init();
 
+	audit_file_rotate_wait = 0;
 	audit_trigger_init();
 
 	/* Register shutdown handler. */