--- embedaddon/sudo/plugins/sudoers/bsm_audit.c	2013/07/22 10:46:12	1.1.1.3
+++ embedaddon/sudo/plugins/sudoers/bsm_audit.c	2014/06/15 16:12:54	1.1.1.5
@@ -30,8 +30,11 @@
 #include <errno.h>
 #include <unistd.h>
 
-#include "gettext.h"
-#include "error.h"
+#define DEFAULT_TEXT_DOMAIN	"sudoers"
+#include "gettext.h"		/* must be included before missing.h */
+
+#include "missing.h"
+#include "fatal.h"
 #include "sudo_debug.h"
 #include "bsm_audit.h"
 
@@ -87,7 +90,7 @@ bsm_audit_success(char **exec_args)
 	if (auditon(A_GETCOND, (caddr_t)&au_cond, sizeof(long)) < 0) {
 		if (errno == AUDIT_NOT_CONFIGURED)
 			return;
-		fatal(_("Could not determine audit condition"));
+		fatal(U_("Could not determine audit condition"));
 	}
 	if (au_cond == AUC_NOAUDIT)
 		debug_return;
@@ -125,8 +128,12 @@ bsm_audit_success(char **exec_args)
 	if (tok == NULL)
 		fatal("au_to_return32");
 	au_write(aufd, tok);
+#ifdef __sun
+	if (au_close(aufd, 1, AUE_sudo, 0) == -1)
+#else
 	if (au_close(aufd, 1, AUE_sudo) == -1)
-		fatal(_("unable to commit audit record"));
+#endif
+		fatal(U_("unable to commit audit record"));
 	debug_return;
 }
 
@@ -147,10 +154,10 @@ bsm_audit_failure(char **exec_args, char const *const 
 	/*
 	 * If we are not auditing, don't cut an audit record; just return.
 	 */
-	if (auditon(A_GETCOND, &au_cond, sizeof(long)) < 0) {
+	if (auditon(A_GETCOND, (caddr_t)&au_cond, sizeof(long)) < 0) {
 		if (errno == AUDIT_NOT_CONFIGURED)
 			debug_return;
-		fatal(_("Could not determine audit condition"));
+		fatal(U_("Could not determine audit condition"));
 	}
 	if (au_cond == AUC_NOAUDIT)
 		debug_return;
@@ -186,7 +193,11 @@ bsm_audit_failure(char **exec_args, char const *const 
 	if (tok == NULL)
 		fatal("au_to_return32");
 	au_write(aufd, tok);
+#ifdef __sun
+	if (au_close(aufd, 1, AUE_sudo, PAD_FAILURE) == -1)
+#else
 	if (au_close(aufd, 1, AUE_sudo) == -1)
-		fatal(_("unable to commit audit record"));
+#endif
+		fatal(U_("unable to commit audit record"));
 	debug_return;
 }