Make audit_success and audit_failure generic functions in preparation

for integrating linux audit support.

diff --git a/Makefile.in b/Makefile.in
index 836e2e9630f2322b36bc175c071abae4b7d55246..947289203df71a444084ce04aed570eff214a0ee 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -102,15 +102,15 @@ SHELL = /bin/sh
 
 PROGS = @PROGS@
 
-SRCS = aix.c alias.c alloc.c bsm_audit.c check.c closefrom.c def_data.c \
-       defaults.c env.c error.c fileops.c find_path.c fnmatch.c getcwd.c \
-       getprogname.c getspwuid.c gettime.c glob.c goodpath.c gram.c gram.y \
-       interfaces.c isblank.c lbuf.c ldap.c list.c logging.c match.c mkstemp.c \
-       memrchr.c parse.c pwutil.c  set_perms.c sigaction.c snprintf.c \
-       strcasecmp.c strerror.c strlcat.c strlcpy.c sudo.c sudo_noexec.c \
-       sudo_edit.c sudo_nss.c term.c testsudoers.c tgetpass.c toke.c toke.l \
-       tsgetgrpw.c utimes.c visudo.c zero_bytes.c redblack.c selinux.c sesh.c \
-       $(AUTH_SRCS)
+SRCS = aix.c alias.c alloc.c audit.c bsm_audit.c check.c closefrom.c \
+       def_data.c defaults.c env.c error.c fileops.c find_path.c fnmatch.c \
+       getcwd.c getprogname.c getspwuid.c gettime.c glob.c goodpath.c gram.c \
+       gram.y interfaces.c isblank.c lbuf.c ldap.c list.c logging.c match.c \
+       mkstemp.c memrchr.c parse.c pwutil.c  set_perms.c sigaction.c \
+       snprintf.c strcasecmp.c strerror.c strlcat.c strlcpy.c sudo.c \
+       sudo_noexec.c sudo_edit.c sudo_nss.c term.c testsudoers.c tgetpass.c \
+       toke.c toke.l tsgetgrpw.c utimes.c visudo.c zero_bytes.c redblack.c \
+       selinux.c sesh.c $(AUTH_SRCS)
 
 AUTH_SRCS = auth/afs.c auth/aix_auth.c auth/bsdauth.c auth/dce.c auth/fwtk.c \
            auth/kerb4.c auth/kerb5.c auth/pam.c auth/passwd.c auth/rfc1938.c \
@@ -129,7 +129,7 @@ AUTH_OBJS = sudo_auth.o @AUTH_OBJS@
 COMMON_OBJS = gram.o alias.o alloc.o defaults.o error.o list.o match.o \
              toke.o redblack.o zero_bytes.o
 
-SUDO_OBJS = $(COMMON_OBJS) $(AUTH_OBJS) @SUDO_OBJS@ check.o env.o \
+SUDO_OBJS = $(COMMON_OBJS) $(AUTH_OBJS) @SUDO_OBJS@ audit.o check.o env.o \
            getspwuid.o gettime.o goodpath.o fileops.o find_path.o \
            interfaces.o lbuf.o logging.o parse.o pwutil.o set_perms.o \
            sudo.o sudo_edit.o sudo_nss.o term.o tgetpass.o
@@ -227,6 +227,8 @@ alias.o: $(srcdir)/alias.c $(SUDODEP) $(srcdir)/parse.h $(srcdir)/list.h $(srcdi
        $(CC) -c $(CPPFLAGS) $(CFLAGS) $(DEFS) $(OPTIONS) $(srcdir)/alias.c
 alloc.o: $(srcdir)/alloc.c $(SUDODEP)
        $(CC) -c $(CPPFLAGS) $(CFLAGS) $(DEFS) $(OPTIONS) $(srcdir)/alloc.c
+audit.o: $(srcdir)/audit.c $(SUDODEP)
+       $(CC) -c $(CPPFLAGS) $(CFLAGS) $(DEFS) $(OPTIONS) $(srcdir)/audit.c
 bsm_audit.o: $(srcdir)/bsm_audit.c $(SUDODEP) bsm_audit.h
        $(CC) -c $(CPPFLAGS) $(CFLAGS) $(DEFS) $(OPTIONS) $(srcdir)/bsm_audit.c
 check.o: $(srcdir)/check.c $(SUDODEP)

diff --git a/audit.c b/audit.c
new file mode 100644 (file)
index 0000000..df33c81
--- /dev/null
+++ b/audit.c
@@ -0,0 +1,75 @@
+/*
+ * Copyright (c) 2009 Todd C. Miller <Todd.Miller@courtesan.com>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#include <config.h>
+
+#include <sys/types.h>
+#include <stdio.h>
+#ifdef STDC_HEADERS
+# include <stdlib.h>
+# include <stddef.h>
+#else
+# ifdef HAVE_STDLIB_H
+#  include <stdlib.h>
+# endif
+#endif /* STDC_HEADERS */
+#ifdef __STDC__
+# include <stdarg.h>
+#else
+# include <varargs.h>
+#endif
+
+#include "logging.h"
+
+#ifdef HAVE_BSM_AUDIT
+# include "bsm_audit.h"
+#endif
+
+void
+#ifdef __STDC__
+audit_success(char **exec_args)
+#else
+audit_success(exec_args)
+    const char **exec_args;
+#endif
+{
+#ifdef HAVE_BSM_AUDIT
+    bsm_audit_success(exec_args);
+#endif
+}
+
+void
+#ifdef __STDC__
+audit_failure(char **exec_args, char const *const fmt, ...)
+#else
+audit_failure(exec_args, fmt, va_alist)
+    const char **exec_args;
+    char const *const fmt;
+    va_dcl;
+#endif
+{
+    va_list ap;
+
+#ifdef __STDC__
+    va_start(ap, fmt);
+#else
+    va_start(ap);
+#endif
+#ifdef HAVE_BSM_AUDIT
+    bsm_audit_failure(exec_args, fmt, ap);
+#endif
+    va_end(ap);
+}

diff --git a/bsm_audit.c b/bsm_audit.c
index 50296928397c82f76e01cb84c007c66643cbcaf5..054d621b331cec6b2f22ba4fd561408f89c0a05c 100644 (file)
--- a/bsm_audit.c
+++ b/bsm_audit.c
@@ -29,7 +29,7 @@
 #include <errno.h>
 #include <unistd.h>
 
-#include "logging.h"
+void log_error(int flags, const char *fmt, ...) __attribute__((__noreturn__));
 
 static int
 audit_sudo_selected(int sf)
@@ -54,7 +54,7 @@ audit_sudo_selected(int sf)
 }
 
 void
-audit_success(const char **exec_args)
+bsm_audit_success(char **exec_args)
 {
        auditinfo_addr_t ainfo_addr;
        auditinfo_t ainfo;
@@ -114,7 +114,7 @@ audit_success(const char **exec_args)
 }
 
 void
-audit_failure(const char **exec_args, char const *const fmt, ...)
+bsm_audit_failure(char **exec_args, char const *const fmt, va_list ap)
 {
        auditinfo_addr_t ainfo_addr;
        auditinfo_t ainfo;
@@ -122,7 +122,6 @@ audit_failure(const char **exec_args, char const *const fmt, ...)
        token_t *tok;
        long au_cond;
        au_id_t auid;
-       va_list ap;
        pid_t pid;
        int aufd;
 
@@ -160,9 +159,7 @@ audit_failure(const char **exec_args, char const *const fmt, ...)
        if (tok == NULL)
                log_error(0, "au_to_exec_args: failed");
        au_write(aufd, tok);
-       va_start(ap, fmt);
        (void) vsnprintf(text, sizeof(text), fmt, ap);
-       va_end(ap);
        tok = au_to_text(text);
        if (tok == NULL)
                log_error(0, "au_to_text: failed");

diff --git a/bsm_audit.h b/bsm_audit.h
index 87be890ffdd742fe31f0a9345910a94ebe840811..6ccb79db2585df137f94fb071e893a8861d234df 100644 (file)
--- a/bsm_audit.h
+++ b/bsm_audit.h
@@ -17,7 +17,7 @@
 #ifndef _SUDO_BSM_AUDIT_H
 #define        _SUDO_BSM_AUDIT_H
 
-void   audit_success(const char **);
-void   audit_failure(const char **, char const * const, ...);
+void   bsm_audit_success(char **);
+void   bsm_audit_failure(char **, char const * const, va_list);
 
 #endif /* _SUDO_BSM_AUDIT_H */

diff --git a/logging.h b/logging.h
index 4e3cd5796aeac0b89f070b59ab5be12f56c84668..8e6867782404899d5bf31472fa8b4d9375c24e92 100644 (file)
--- a/logging.h
+++ b/logging.h
@@ -49,6 +49,8 @@
 # define MAXSYSLOGLEN          960
 #endif
 
+void audit_success             __P((char **));
+void audit_failure             __P((char **, char const * const, ...));
 void log_allowed               __P((int));
 void log_denial                        __P((int, int));
 void log_error                 __P((int flags, const char *fmt, ...))

diff --git a/sudo.c b/sudo.c
index 921399ae6f20aff45fcdaa37a63cb8a3928a547d..6ff8096b14a2377243c74ed6b0ab373a8bcb00a2 100644 (file)
--- a/sudo.c
+++ b/sudo.c
@@ -101,10 +101,6 @@
 #include "interfaces.h"
 #include "version.h"
 
-#ifdef HAVE_BSM_AUDIT
-# include "bsm_audit.h"
-#endif
-
 #ifndef lint
 __unused static const char rcsid[] = "$Sudo$";
 #endif /* lint */
@@ -387,9 +383,7 @@ main(argc, argv, envp)
     /* Bail if a tty is required and we don't have one.  */
     if (def_requiretty) {
        if ((fd = open(_PATH_TTY, O_RDWR|O_NOCTTY)) == -1) {
-#ifdef HAVE_BSM_AUDIT
            audit_failure(NewArgv, "no tty");
-#endif
            log_error(NO_MAIL, "sorry, you must have a tty to run sudo");
        } else
            (void) close(fd);
@@ -427,14 +421,10 @@ main(argc, argv, envp)
     if (ISSET(validated, VALIDATE_OK)) {
        /* Finally tell the user if the command did not exist. */
        if (cmnd_status == NOT_FOUND_DOT) {
-#ifdef HAVE_BSM_AUDIT
            audit_failure(NewArgv, "command in current directory");
-#endif
            errorx(1, "ignoring `%s' found in '.'\nUse `sudo ./%s' if this is the `%s' you wish to run.", user_cmnd, user_cmnd, user_cmnd);
        } else if (cmnd_status == NOT_FOUND) {
-#ifdef HAVE_BSM_AUDIT
            audit_failure(NewArgv, "%s: command not found", user_cmnd);
-#endif
            errorx(1, "%s: command not found", user_cmnd);
        }
 
@@ -524,10 +514,8 @@ main(argc, argv, envp)
 
 #ifndef PROFILING
        if (ISSET(sudo_mode, MODE_BACKGROUND) && fork() > 0) {
-#ifdef HAVE_BSM_AUDIT
-               syslog(LOG_AUTH|LOG_ERR, "fork");
+           syslog(LOG_AUTH|LOG_ERR, "fork");
            audit_success(NewArgv);
-#endif
            exit(0);
        } else {
 #ifdef HAVE_SELINUX
@@ -535,9 +523,7 @@ main(argc, argv, envp)
                selinux_exec(user_role, user_type, NewArgv,
                    ISSET(sudo_mode, MODE_LOGIN_SHELL));
 #endif
-#ifdef HAVE_BSM_AUDIT
            audit_success(NewArgv);
-#endif
            execv(safe_cmnd, NewArgv);
        }
 #else
@@ -554,9 +540,7 @@ main(argc, argv, envp)
        } warning("unable to execute %s", safe_cmnd);
        exit(127);
     } else if (ISSET(validated, FLAG_NO_USER | FLAG_NO_HOST)) {
-#ifdef HAVE_BSM_AUDIT
        audit_failure(NewArgv, "No user or host");
-#endif
        log_denial(validated, 1);
        exit(1);
     } else {
@@ -578,9 +562,7 @@ main(argc, argv, envp)
            /* Just tell the user they are not allowed to run foo. */
            log_denial(validated, 1);
        }
-#ifdef HAVE_BSM_AUDIT
        audit_failure(NewArgv, "validation failure");
-#endif
        exit(1);
     }
     exit(0);   /* not reached */
@@ -1346,9 +1328,7 @@ set_runaspw(user)
            runas_pw = sudo_fakepwnam(user, runas_gr ? runas_gr->gr_gid : 0);
     } else {
        if ((runas_pw = sudo_getpwnam(user)) == NULL) {
-#ifdef HAVE_BSM_AUDIT
            audit_failure(NewArgv, "unknown user: %s", user);
-#endif
            log_error(NO_MAIL|MSG_ONLY, "unknown user: %s", user);
        }
     }