fix compiler warnings on Solaris 11

diff --git a/plugins/sudoers/bsm_audit.c b/plugins/sudoers/bsm_audit.c
index 305fa5417b674b8cc063cca0183dc3814b9b5f63..80e4b2b1e0eecbe365ab1f3edb96cade0cb2c424 100644 (file)
--- a/plugins/sudoers/bsm_audit.c
+++ b/plugins/sudoers/bsm_audit.c
@@ -55,9 +55,6 @@ static int
 audit_sudo_selected(int sorf)
 {
        auditinfo_addr_t ainfo_addr;
-#ifdef BSM_AUDIT_COMPAT
-       auditinfo_t ainfo;
-#endif
        struct au_mask *mask;
        int rc;
        debug_decl(audit_sudo_selected, SUDOERS_DEBUG_AUDIT)
@@ -65,6 +62,8 @@ audit_sudo_selected(int sorf)
        if (getaudit_addr(&ainfo_addr, sizeof(ainfo_addr)) < 0) {
 #ifdef BSM_AUDIT_COMPAT
                if (errno == ENOSYS) {
+                       auditinfo_t ainfo;
+
                        /* Fall back to older BSM API. */
                        if (getaudit(&ainfo) < 0) {
                                sudo_warn("getaudit");
@@ -103,7 +102,6 @@ int
 bsm_audit_success(char *exec_args[])
 {
        auditinfo_addr_t ainfo_addr;
-       auditinfo_t ainfo;
        token_t *tok;
        au_id_t auid;
        long au_cond;
@@ -143,6 +141,8 @@ bsm_audit_success(char *exec_args[])
                    getuid(), pid, pid, &ainfo_addr.ai_termid);
 #ifdef BSM_AUDIT_COMPAT
        } else if (errno == ENOSYS) {
+               auditinfo_t ainfo;
+
                /*
                 * NB: We should probably watch out for ERANGE here.
                 */
@@ -193,7 +193,6 @@ int
 bsm_audit_failure(char *exec_args[], char const *const fmt, va_list ap)
 {
        auditinfo_addr_t ainfo_addr;
-       auditinfo_t ainfo;
        char text[256];
        token_t *tok;
        long au_cond;
@@ -229,6 +228,8 @@ bsm_audit_failure(char *exec_args[], char const *const fmt, va_list ap)
                    getuid(), pid, pid, &ainfo_addr.ai_termid);
 #ifdef BSM_AUDIT_COMPAT
        } else if (errno == ENOSYS) {
+               auditinfo_t ainfo;
+
                if (getaudit(&ainfo) < 0) {
                        sudo_warn("getaudit");
                        debug_return_int(-1);

diff --git a/plugins/sudoers/timestamp.c b/plugins/sudoers/timestamp.c
index f400387284727754294834b862859d11f834bd30..fa696075055b6be92ae93ff45c98e40df8cafb00 100644 (file)
--- a/plugins/sudoers/timestamp.c
+++ b/plugins/sudoers/timestamp.c
@@ -102,7 +102,7 @@ ts_match_record(struct timestamp_entry *key, struct timestamp_entry *entry,
        if (entry->u.ppid != key->u.ppid) {
            sudo_debug_printf(SUDO_DEBUG_DEBUG,
                "%s:%u record ppid mismatch (want %d, got %d)", __func__, recno,
-               key->u.ppid, entry->u.ppid);
+               (int)key->u.ppid, (int)entry->u.ppid);
            debug_return_bool(false);
        }
        if (sudo_timespeccmp(&entry->start_time, &key->start_time, !=)) {