Mercurial > illumos > illumos-gate

changeset 10349:3180b36b9782

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
6823462 AUE_CRYPTOADM, AUE_CONFIGKSSL, AUE_PF_POLICY* don't properly include au_emod information
author Marek Pospisil <Marek.Pospisil@Sun.COM>
date Thu, 20 Aug 2009 07:41:22 -0700
parents 21d1dccbb74e
children 9f745889b170
files usr/src/uts/common/c2/audit.c
diffstat 1 files changed, 22 insertions(+), 22 deletions(-) [+]
line wrap: on
line diff
--- a/usr/src/uts/common/c2/audit.c	Thu Aug 20 02:13:19 2009 -0700
+++ b/usr/src/uts/common/c2/audit.c	Thu Aug 20 07:41:22 2009 -0700
@@ -283,10 +283,10 @@
 	 *	closes.
 	 */
 	if ((tad->tad_flag == 0 && !(tad->tad_ctrl & PAD_SAVPATH)) ||
-		((tad->tad_ctrl & PAD_PATHFND) &&
-		!(kctx->auk_policy & AUDIT_PATH)) ||
-		(tad->tad_ctrl & PAD_NOPATH)) {
-			return (0);
+	    ((tad->tad_ctrl & PAD_PATHFND) &&
+	    !(kctx->auk_policy & AUDIT_PATH)) ||
+	    (tad->tad_ctrl & PAD_NOPATH)) {
+		return (0);
 	}
 
 	tad->tad_ctrl |= PAD_NOPATH;		/* prevent possible reentry */
@@ -437,10 +437,10 @@
 	 *	closes.
 	 */
 	if ((tad->tad_flag == 0 && !(tad->tad_ctrl & PAD_SAVPATH)) ||
-		((tad->tad_ctrl & PAD_PATHFND) &&
-		!(kctx->auk_policy & AUDIT_PATH)) ||
-		(tad->tad_ctrl & PAD_NOPATH)) {
-			return;
+	    ((tad->tad_ctrl & PAD_PATHFND) &&
+	    !(kctx->auk_policy & AUDIT_PATH)) ||
+	    (tad->tad_ctrl & PAD_NOPATH)) {
+		return;
 	}
 
 	return;
@@ -499,10 +499,10 @@
 	 *	closes.
 	 */
 	if ((tad->tad_flag == 0 && !(tad->tad_ctrl & PAD_SAVPATH)) ||
-		((tad->tad_ctrl & PAD_PATHFND) &&
-		!(kctx->auk_policy & AUDIT_PATH)) ||
-		(tad->tad_ctrl & PAD_NOPATH)) {
-			return;
+	    ((tad->tad_ctrl & PAD_PATHFND) &&
+	    !(kctx->auk_policy & AUDIT_PATH)) ||
+	    (tad->tad_ctrl & PAD_NOPATH)) {
+		return;
 	}
 
 	if (flag) {
@@ -570,11 +570,11 @@
 	 *	closes.
 	 */
 	if ((tad->tad_flag == 0 &&
-		!(tad->tad_ctrl & PAD_SAVPATH)) ||
-		((tad->tad_ctrl & PAD_PATHFND) &&
-		!(kctx->auk_policy & AUDIT_PATH)) ||
-		(tad->tad_ctrl & PAD_NOPATH)) {
-			return;
+	    !(tad->tad_ctrl & PAD_SAVPATH)) ||
+	    ((tad->tad_ctrl & PAD_PATHFND) &&
+	    !(kctx->auk_policy & AUDIT_PATH)) ||
+	    (tad->tad_ctrl & PAD_NOPATH)) {
+		return;
 	}
 
 	/*
@@ -1391,7 +1391,7 @@
 		return;
 
 	error = VOP_LOOKUP(dvp, sname, &vp, NULL, 0, NULL, CRED(),
-			NULL, NULL, NULL);
+	    NULL, NULL, NULL);
 	if (error == 0) {
 		audit_attributes(vp);
 		VN_RELE(vp);
@@ -1448,7 +1448,7 @@
 	}
 
 	if (!error && ((tad->tad_event == AUE_MKNOD) ||
-			(tad->tad_event == AUE_MKDIR))) {
+	    (tad->tad_event == AUE_MKDIR))) {
 		audit_attributes(vp);
 	}
 
@@ -2224,7 +2224,7 @@
 	AS_INC(as_generated, 1, kctx);
 	AS_INC(as_kernel, 1, kctx);
 
-	au_close(kctx, (caddr_t *)&ad, AU_OK, AUE_CRYPTOADM, 0);
+	au_close(kctx, (caddr_t *)&ad, AU_OK, AUE_CRYPTOADM, tad->tad_evmod);
 }
 
 /*
@@ -2294,7 +2294,7 @@
 	AS_INC(as_generated, 1, kctx);
 	AS_INC(as_kernel, 1, kctx);
 
-	au_close(kctx, (caddr_t *)&ad, AU_OK, AUE_CONFIGKSSL, 0);
+	au_close(kctx, (caddr_t *)&ad, AU_OK, AUE_CONFIGKSSL, tad->tad_evmod);
 }
 
 /*
@@ -2426,7 +2426,7 @@
 		AS_INC(as_kernel, 1, kctx);
 
 	}
-	au_close(kctx, (caddr_t *)&ad, flag, tad->tad_event, 0);
+	au_close(kctx, (caddr_t *)&ad, flag, tad->tad_event, tad->tad_evmod);
 
 	/*
 	 * clear the ctrl flag so that we don't have spurious collection of