From: Todd C. Miller <Todd.Miller@courtesan.com>
Date: Sun, 26 Apr 2015 01:44:52 +0000 (-0600)
Subject: Work around a problem on Mac OS X 10.10 which defines AUE_sudo but
X-Git-Tag: SUDO_1_8_14^2~156
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8a1838364493a449f99c92c61d7f95817544127d;p=sudo

Work around a problem on Mac OS X 10.10 which defines AUE_sudo but
where au_preselect() only accepts AUE_DARWIN_sudo (the old value).
---

diff --git a/plugins/sudoers/bsm_audit.c b/plugins/sudoers/bsm_audit.c
index 7349b7b52..ef0a0e175 100644
--- a/plugins/sudoers/bsm_audit.c
+++ b/plugins/sudoers/bsm_audit.c
@@ -43,6 +43,14 @@
 # define AUDIT_NOT_CONFIGURED	ENOSYS
 #endif
 
+/*
+ * Darwin defines AUE_sudo but au_preselect() only accepts AUE_DARWIN_sudo.
+ */
+#if defined(__APPLE__) && defined(AUE_DARWIN_sudo)
+# undef AUE_sudo
+# define AUE_sudo AUE_DARWIN_sudo
+#endif
+
 static int
 audit_sudo_selected(int sorf)
 {
@@ -68,6 +76,8 @@ audit_sudo_selected(int sorf)
 		mask = &ainfo_addr.ai_mask;
 	}
 	rc = au_preselect(AUE_sudo, mask, sorf, AU_PRS_REREAD);
+	if (rc == -1)
+		sudo_warn("au_preselect");
         debug_return_int(rc);
 }