1207395 au_event_t is a currently a short. It should be redefined to be a u_short

2 files changed, 7 insertions, 9 deletions

diff --git a/usr/src/lib/auditd_plugins/syslog/sysplugin.c b/usr/src/lib/auditd_plugins/syslog/sysplugin.c
index 83b4b5623e..745f512555 100644
--- a/usr/src/lib/auditd_plugins/syslog/sysplugin.c
+++ b/usr/src/lib/auditd_plugins/syslog/sysplugin.c
@@ -19,14 +19,13 @@
  * CDDL HEADER END
  */
 /*
- * Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  *
  * convert binary audit records to syslog messages and
  * send them off to syslog
  *
  */
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
 
 /*
  * auditd_plugin_open(), auditd_plugin() and auditd_plugin_close()
@@ -566,7 +565,7 @@ filter(const char *input, uint32_t sequence, char *output,
 
 			if (cacheauevent(&event, ctx.out.sf_eventid) < 0)
 				(void) snprintf(event_name, EVENT_NAME_LEN,
-				    "%d", ctx.out.sf_eventid);
+				    "%hu", ctx.out.sf_eventid);
 			else
 				(void) strlcpy(event_name, event->ae_desc,
 				    EVENT_NAME_LEN);
@@ -599,13 +598,13 @@ filter(const char *input, uint32_t sequence, char *output,
 #if DEBUG
 			if (ctx.out.sf_sequence != -1)
 				fprintf(dbfp,
-				    "syslog tossed (event=%d) record %u "
+				    "syslog tossed (event=%hu) record %u "
 				    "/ buffer %u\n",
 				    ctx.out.sf_eventid, ctx.out.sf_sequence,
 				    sequence);
 			else
 				fprintf(dbfp,
-				    "syslog tossed (event=%d) buffer %u\n",
+				    "syslog tossed (event=%hu) buffer %u\n",
 				    ctx.out.sf_eventid, sequence);
 #endif
 
@@ -652,7 +651,7 @@ filter(const char *input, uint32_t sequence, char *output,
 			au_event_ent_t	*event;
 
 			if (cacheauevent(&event, ctx.out.sf_eventid) < 0)
-				used = snprintf(bp, remaining, "%d",
+				used = snprintf(bp, remaining, "%hu",
 				    ctx.out.sf_eventid);
 			else
 				used = strlcpy(bp, event->ae_desc, remaining);
diff --git a/usr/src/lib/auditd_plugins/syslog/systoken.c b/usr/src/lib/auditd_plugins/syslog/systoken.c
index f5c6117728..23e245ffb6 100644
--- a/usr/src/lib/auditd_plugins/syslog/systoken.c
+++ b/usr/src/lib/auditd_plugins/syslog/systoken.c
@@ -19,11 +19,10 @@
  * CDDL HEADER END
  */
 /*
- * Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
 
 /*
  * Token processing for sysupd; each token function does one
@@ -128,7 +127,7 @@ common_header(parse_context_t *ctx)
 {
 	adrm_u_int32(&(ctx->adr), &(ctx->out.sf_reclen), 1);
 	ctx->adr.adr_now += sizeof (char);		/* version number */
-	adrm_short(&(ctx->adr), &(ctx->out.sf_eventid), 1);
+	adrm_u_short(&(ctx->adr), &(ctx->out.sf_eventid), 1);
 	ctx->adr.adr_now += sizeof (short);		/* modifier */
 }