--- embedaddon/sudo/common/sudo_debug.c 2012/10/09 09:29:52 1.1.1.2 +++ embedaddon/sudo/common/sudo_debug.c 2013/10/14 07:56:33 1.1.1.4 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011 Todd C. Miller + * Copyright (c) 2011-2013 Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -17,7 +17,6 @@ #include #include -#include #include #include #include @@ -50,11 +49,13 @@ #include "missing.h" #include "alloc.h" -#include "error.h" -#include "gettext.h" +#include "fatal.h" #include "sudo_plugin.h" #include "sudo_debug.h" +#define DEFAULT_TEXT_DOMAIN "sudo" +#include "gettext.h" + /* * The debug priorities and subsystems are currently hard-coded. * In the future we might consider allowing plugins to register their @@ -118,8 +119,6 @@ static int sudo_debug_mode; static char sudo_debug_pidstr[(((sizeof(int) * 8) + 2) / 3) + 3]; static size_t sudo_debug_pidlen; -extern sudo_conv_t sudo_conv; - /* * Parse settings string from sudo.conf and open debugfile. * Returns 1 on success, 0 if cannot open debugfile. @@ -138,10 +137,17 @@ int sudo_debug_init(const char *debugfile, const char if (debugfile != NULL) { if (sudo_debug_fd != -1) close(sudo_debug_fd); - sudo_debug_fd = open(debugfile, O_WRONLY|O_APPEND|O_CREAT, - S_IRUSR|S_IWUSR); - if (sudo_debug_fd == -1) - return 0; + sudo_debug_fd = open(debugfile, O_WRONLY|O_APPEND, S_IRUSR|S_IWUSR); + if (sudo_debug_fd == -1) { + /* Create debug file as needed and set group ownership. */ + if (errno == ENOENT) { + sudo_debug_fd = open(debugfile, O_WRONLY|O_APPEND|O_CREAT, + S_IRUSR|S_IWUSR); + } + if (sudo_debug_fd == -1) + return 0; + ignore_result(fchown(sudo_debug_fd, (uid_t)-1, 0)); + } (void)fcntl(sudo_debug_fd, F_SETFD, FD_CLOEXEC); sudo_debug_mode = SUDO_DEBUG_MODE_FILE; } else { @@ -149,8 +155,14 @@ int sudo_debug_init(const char *debugfile, const char sudo_debug_mode = SUDO_DEBUG_MODE_CONV; } + /* Stash the pid string so we only have to format it once. */ + (void)snprintf(sudo_debug_pidstr, sizeof(sudo_debug_pidstr), "[%d] ", + (int)getpid()); + sudo_debug_pidlen = strlen(sudo_debug_pidstr); + /* Parse settings string. */ - buf = estrdup(settings); + if ((buf = strdup(settings)) == NULL) + return 0; for ((cp = strtok(buf, ",")); cp != NULL; (cp = strtok(NULL, ","))) { /* Should be in the form subsys@pri. */ subsys = cp; @@ -175,12 +187,8 @@ int sudo_debug_init(const char *debugfile, const char } } } - efree(buf); + free(buf); - (void)snprintf(sudo_debug_pidstr, sizeof(sudo_debug_pidstr), "[%d] ", - (int)getpid()); - sudo_debug_pidlen = strlen(sudo_debug_pidstr); - return 1; } @@ -206,28 +214,32 @@ sudo_debug_enter(const char *func, const char *file, i "-> %s @ %s:%d", func, file, line); } -void sudo_debug_exit(const char *func, const char *file, int line, +void +sudo_debug_exit(const char *func, const char *file, int line, int subsys) { sudo_debug_printf2(NULL, NULL, 0, subsys | SUDO_DEBUG_TRACE, "<- %s @ %s:%d", func, file, line); } -void sudo_debug_exit_int(const char *func, const char *file, int line, +void +sudo_debug_exit_int(const char *func, const char *file, int line, int subsys, int rval) { sudo_debug_printf2(NULL, NULL, 0, subsys | SUDO_DEBUG_TRACE, "<- %s @ %s:%d := %d", func, file, line, rval); } -void sudo_debug_exit_long(const char *func, const char *file, int line, +void +sudo_debug_exit_long(const char *func, const char *file, int line, int subsys, long rval) { sudo_debug_printf2(NULL, NULL, 0, subsys | SUDO_DEBUG_TRACE, "<- %s @ %s:%d := %ld", func, file, line, rval); } -void sudo_debug_exit_size_t(const char *func, const char *file, int line, +void +sudo_debug_exit_size_t(const char *func, const char *file, int line, int subsys, size_t rval) { /* XXX - should use %zu but our snprintf.c doesn't support it */ @@ -236,7 +248,8 @@ void sudo_debug_exit_size_t(const char *func, const ch } /* We use int, not bool, here for functions that return -1 on error. */ -void sudo_debug_exit_bool(const char *func, const char *file, int line, +void +sudo_debug_exit_bool(const char *func, const char *file, int line, int subsys, int rval) { if (rval == true || rval == false) { @@ -248,14 +261,16 @@ void sudo_debug_exit_bool(const char *func, const char } } -void sudo_debug_exit_str(const char *func, const char *file, int line, +void +sudo_debug_exit_str(const char *func, const char *file, int line, int subsys, const char *rval) { sudo_debug_printf2(NULL, NULL, 0, subsys | SUDO_DEBUG_TRACE, "<- %s @ %s:%d := %s", func, file, line, rval ? rval : "(null)"); } -void sudo_debug_exit_str_masked(const char *func, const char *file, int line, +void +sudo_debug_exit_str_masked(const char *func, const char *file, int line, int subsys, const char *rval) { static const char stars[] = "********************************************************************************"; @@ -265,7 +280,8 @@ void sudo_debug_exit_str_masked(const char *func, cons "<- %s @ %s:%d := %.*s", func, file, line, len, rval ? stars : "(null)"); } -void sudo_debug_exit_ptr(const char *func, const char *file, int line, +void +sudo_debug_exit_ptr(const char *func, const char *file, int line, int subsys, const void *rval) { sudo_debug_printf2(NULL, NULL, 0, subsys | SUDO_DEBUG_TRACE, @@ -276,36 +292,35 @@ static void sudo_debug_write_conv(const char *func, const char *file, int lineno, const char *str, int len, int errno_val) { - struct sudo_conv_message msg; - struct sudo_conv_reply repl; - char *buf = NULL; + /* Remove trailing newlines. */ + while (len > 0 && str[len - 1] == '\n') + len--; - /* Call conversation function */ - if (sudo_conv != NULL) { - /* Remove the newline at the end if appending extra info. */ - if (str[len - 1] == '\n') - len--; - - if (func != NULL && file != NULL && lineno != 0) { + if (len > 0) { + if (func != NULL && file != NULL) { if (errno_val) { - easprintf(&buf, "%.*s: %s @ %s() %s:%d", len, str, - strerror(errno_val), func, file, lineno); + sudo_printf(SUDO_CONV_DEBUG_MSG, "%.*s: %s @ %s() %s:%d", + len, str, strerror(errno_val), func, file, lineno); } else { - easprintf(&buf, "%.*s @ %s() %s:%d", len, str, - func, file, lineno); + sudo_printf(SUDO_CONV_DEBUG_MSG, "%.*s @ %s() %s:%d", + len, str, func, file, lineno); } - str = buf; - } else if (errno_val) { - easprintf(&buf, "%.*s: %s", len, str, strerror(errno_val)); - str = buf; + } else { + if (errno_val) { + sudo_printf(SUDO_CONV_DEBUG_MSG, "%.*s: %s", + len, str, strerror(errno_val)); + } else { + sudo_printf(SUDO_CONV_DEBUG_MSG, "%.*s", len, str); + } } - memset(&msg, 0, sizeof(msg)); - memset(&repl, 0, sizeof(repl)); - msg.msg_type = SUDO_CONV_DEBUG_MSG; - msg.msg = str; - sudo_conv(1, &msg, &repl); - if (buf != NULL) - efree(buf); + } else if (errno_val) { + /* Only print error string. */ + if (func != NULL && file != NULL) { + sudo_printf(SUDO_CONV_DEBUG_MSG, "%s @ %s() %s:%d", + strerror(errno_val), func, file, lineno); + } else { + sudo_printf(SUDO_CONV_DEBUG_MSG, "%s", strerror(errno_val)); + } } } @@ -316,8 +331,7 @@ sudo_debug_write_file(const char *func, const char *fi char *timestr, numbuf[(((sizeof(int) * 8) + 2) / 3) + 2]; time_t now; struct iovec iov[12]; - int iovcnt = 4; - bool need_newline = false; + int iovcnt = 3; /* Prepend program name and pid with a trailing space. */ iov[1].iov_base = (char *)getprogname(); @@ -326,25 +340,24 @@ sudo_debug_write_file(const char *func, const char *fi iov[2].iov_len = sudo_debug_pidlen; /* Add string along with newline if it doesn't have one. */ - iov[3].iov_base = (char *)str; - iov[3].iov_len = len; - if (str[len - 1] != '\n') - need_newline = true; + if (len > 0) { + iov[iovcnt].iov_base = (char *)str; + iov[iovcnt].iov_len = len; + while (len > 0 && str[len - 1] == '\n') + iov[iovcnt].iov_len--; + iovcnt++; + } /* Append error string if errno is specified. */ if (errno_val) { - iov[iovcnt].iov_base = ": "; - iov[iovcnt].iov_len = 2; - iovcnt++; + if (len > 0) { + iov[iovcnt].iov_base = ": "; + iov[iovcnt].iov_len = 2; + iovcnt++; + } iov[iovcnt].iov_base = strerror(errno_val); iov[iovcnt].iov_len = strlen(iov[iovcnt].iov_base); iovcnt++; - - /* Move newline to the end. */ - if (!need_newline) { - need_newline = true; - iov[3].iov_len--; - } } /* If function, file and lineno are specified, append them. */ @@ -369,24 +382,15 @@ sudo_debug_write_file(const char *func, const char *fi iov[iovcnt].iov_base = numbuf; iov[iovcnt].iov_len = strlen(numbuf); iovcnt++; - - /* Move newline to the end. */ - if (!need_newline) { - need_newline = true; - iov[3].iov_len--; - } } - /* Append newline as needed. */ - if (need_newline) { - /* force newline */ - iov[iovcnt].iov_base = "\n"; - iov[iovcnt].iov_len = 1; - iovcnt++; - } + /* Append newline. */ + iov[iovcnt].iov_base = "\n"; + iov[iovcnt].iov_len = 1; + iovcnt++; /* Do timestamp last due to ctime's static buffer. */ - now = time(NULL); + time(&now); timestr = ctime(&now) + 4; timestr[15] = ' '; /* replace year with a space */ timestr[16] = '\0'; @@ -401,9 +405,6 @@ void sudo_debug_write2(const char *func, const char *file, int lineno, const char *str, int len, int errno_val) { - if (len <= 0) - return; - switch (sudo_debug_mode) { case SUDO_DEBUG_MODE_CONV: sudo_debug_write_conv(func, file, lineno, str, len, errno_val); @@ -422,12 +423,11 @@ sudo_debug_write(const char *str, int len, int errno_v } void -sudo_debug_printf2(const char *func, const char *file, int lineno, int level, - const char *fmt, ...) +sudo_debug_vprintf2(const char *func, const char *file, int lineno, int level, + const char *fmt, va_list ap) { int buflen, pri, subsys, saved_errno = errno; - va_list ap; - char *buf; + char *buf = NULL; if (!sudo_debug_mode) return; @@ -438,9 +438,7 @@ sudo_debug_printf2(const char *func, const char *file, /* Make sure we want debug info at this level. */ if (subsys < NUM_SUBSYSTEMS && sudo_debug_settings[subsys] >= pri) { - va_start(ap, fmt); - buflen = vasprintf(&buf, fmt, ap); - va_end(ap); + buflen = fmt ? vasprintf(&buf, fmt, ap) : 0; if (buflen != -1) { int errcode = ISSET(level, SUDO_DEBUG_ERRNO) ? saved_errno : 0; if (ISSET(level, SUDO_DEBUG_LINENO)) @@ -452,6 +450,17 @@ sudo_debug_printf2(const char *func, const char *file, } errno = saved_errno; +} + +void +sudo_debug_printf2(const char *func, const char *file, int lineno, int level, + const char *fmt, ...) +{ + va_list ap; + + va_start(ap, fmt); + sudo_debug_vprintf2(func, file, lineno, level, fmt, ap); + va_end(ap); } void