From: Todd C. Miller <Todd.Miller@courtesan.com>
Date: Thu, 15 Aug 2013 16:39:40 +0000 (-0600)
Subject: Fix compilation on Solaris 11.
X-Git-Tag: SUDO_1_8_8^2~62
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2f251caf47281ca95173708371cc7b0634ea0766;p=sudo

Fix compilation on Solaris 11.
---

diff --git a/plugins/sudoers/bsm_audit.c b/plugins/sudoers/bsm_audit.c
index 7d0e805a5..e7dc5ce4c 100644
--- a/plugins/sudoers/bsm_audit.c
+++ b/plugins/sudoers/bsm_audit.c
@@ -126,7 +126,11 @@ 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)
+#endif
 		fatal(_("unable to commit audit record"));
 	debug_return;
 }
@@ -148,7 +152,7 @@ bsm_audit_failure(char **exec_args, char const *const fmt, va_list ap)
 	/*
 	 * 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"));
@@ -187,7 +191,11 @@ bsm_audit_failure(char **exec_args, char const *const fmt, va_list ap)
 	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)
+#endif
 		fatal(_("unable to commit audit record"));
 	debug_return;
 }