isa/sudo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fold SUDO_DEBUG_PROGERR and SUDO_DEBUG_SYSERR into SUDO_DEBUG_ERROR

Browse Source
This commit is contained in:
Todd C. Miller
2011-11-07 16:33:49 -05:00
parent d0eb3ae6a0
commit 3ee9cef0da
6 changed files with 26 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
plugins/sudoers/logging.c
View File

@@ -425,7 +425,7 @@ send_mail(const char *fmt, ...)
case -1:
/* Error. */
mysyslog(LOG_ERR, _("unable to fork: %m"));
sudo_debug_printf(SUDO_DEBUG_SYSERR, "unable to fork: %s",
sudo_debug_printf(SUDO_DEBUG_ERROR, "unable to fork: %s",
strerror(errno));
_exit(1);
case 0:
@@ -477,7 +477,7 @@ send_mail(const char *fmt, ...)
if (pipe(pfd) == -1) {
mysyslog(LOG_ERR, _("unable to open pipe: %m"));
sudo_debug_printf(SUDO_DEBUG_SYSERR, "unable to open pipe: %s",
sudo_debug_printf(SUDO_DEBUG_ERROR, "unable to open pipe: %s",
strerror(errno));
sudo_debug_exit(__func__, __FILE__, __LINE__, sudo_debug_subsys);
_exit(1);
@@ -487,7 +487,7 @@ send_mail(const char *fmt, ...)
case -1:
/* Error. */
mysyslog(LOG_ERR, _("unable to fork: %m"));
sudo_debug_printf(SUDO_DEBUG_SYSERR, "unable to fork: %s",
sudo_debug_printf(SUDO_DEBUG_ERROR, "unable to fork: %s",
strerror(errno));
sudo_debug_exit(__func__, __FILE__, __LINE__, sudo_debug_subsys);
_exit(1);
@@ -502,7 +502,7 @@ send_mail(const char *fmt, ...)
if (pfd[0] != STDIN_FILENO) {
if (dup2(pfd[0], STDIN_FILENO) == -1) {
mysyslog(LOG_ERR, _("unable to dup stdin: %m"));
sudo_debug_printf(SUDO_DEBUG_SYSERR,
sudo_debug_printf(SUDO_DEBUG_ERROR,
"unable to dup stdin: %s", strerror(errno));
_exit(127);
}
@@ -538,7 +538,7 @@ send_mail(const char *fmt, ...)
execv(mpath, argv);
#endif /* NO_ROOT_MAILER */
mysyslog(LOG_ERR, _("unable to execute %s: %m"), mpath);
sudo_debug_printf(SUDO_DEBUG_SYSERR, "unable to execute %s: %s",
sudo_debug_printf(SUDO_DEBUG_ERROR, "unable to execute %s: %s",
mpath, strerror(errno));
_exit(127);
}