PSARC/2009/613 auditon(2) clarification

6884238 The audit_policy variable should be a uint32_t.

4 files changed, 8 insertions, 11 deletions

diff --git a/usr/src/cmd/audit/audit.c b/usr/src/cmd/audit/audit.c
index bf31448d13..8616fe4a92 100644
--- a/usr/src/cmd/audit/audit.c
+++ b/usr/src/cmd/audit/audit.c
@@ -294,7 +294,7 @@ is_audit_control_ok(char *filename) {
 static boolean_t
 is_valid_zone(boolean_t show_err)
 {
-	long	policy;
+	uint32_t	policy;
 
 	if (auditon(A_GETPOLICY, (char *)&policy, 0) == -1) {
 		(void) fprintf(stderr, gettext(
diff --git a/usr/src/cmd/auditd/auditd.c b/usr/src/cmd/auditd/auditd.c
index a616ebd52b..14e76d88a4 100644
--- a/usr/src/cmd/auditd/auditd.c
+++ b/usr/src/cmd/auditd/auditd.c
@@ -599,7 +599,7 @@ loadauditlist()
 	int		acresult;
 	int		wait_count = 0;
 	kva_t		*kvlist;
-	long		policy;
+	uint32_t	policy;
 	int		cnt_flag;
 	struct au_qctrl	kqmax;
 	au_acinfo_t	*ach = NULL;
diff --git a/usr/src/cmd/smserverd/myaudit.c b/usr/src/cmd/smserverd/myaudit.c
index 845f53fe8b..041cfc9360 100644
--- a/usr/src/cmd/smserverd/myaudit.c
+++ b/usr/src/cmd/smserverd/myaudit.c
@@ -19,7 +19,7 @@
  * CDDL HEADER END
  */
 /*
- * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -78,7 +78,7 @@ can_audit(void)
 static int
 audit_save_policy(door_data_t *door_dp)
 {
-	int policy;
+	uint32_t policy;
 
 	if (auditon(A_GETPOLICY, (caddr_t)&policy, sizeof (policy))) {
 		return (-1);
diff --git a/usr/src/cmd/smserverd/smserver.h b/usr/src/cmd/smserverd/smserver.h
index cb82833719..691192e8f8 100644
--- a/usr/src/cmd/smserverd/smserver.h
+++ b/usr/src/cmd/smserverd/smserver.h
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -20,15 +19,13 @@
  * CDDL HEADER END
  */
 /*
- * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
 #ifndef	_SMSERVER_H_
 #define	_SMSERVER_H_
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -149,7 +146,7 @@ typedef struct door_data {
 	char 		*audit_user;	/* text version of audit_uid */
 	au_asid_t	audit_asid;	/* asid of process writing record */
 	char 		*audit_path;	/* path token */
-	int		audit_policy;	/* kernel audit policy */
+	uint32_t	audit_policy;	/* kernel audit policy */
 	struct auditpinfo_addr audit_ap;
 	char		audit_text[128];
 	char		audit_text1[128];