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

Add some casts to quiet gcc warnings on Solaris and remove a

Browse Source 
now-useless debug printf.
This commit is contained in:
Todd C. Miller
2017-03-03 11:20:56 -07:00
parent a788144094
commit 00b4732c9d
2 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/sudoers/timestamp.c
View File

@@ -160,7 +160,7 @@ ts_mkdirs(char *path, uid_t owner, mode_t mode, mode_t parent_mode, bool quiet)
if (ret) { if (ret) {
/* Create final path component. */ /* Create final path component. */
sudo_debug_printf(SUDO_DEBUG_DEBUG|SUDO_DEBUG_LINENO, sudo_debug_printf(SUDO_DEBUG_DEBUG|SUDO_DEBUG_LINENO,
"mkdir %s, mode 0%o, uid %d, gid %d", path, mode, "mkdir %s, mode 0%o, uid %d, gid %d", path, (int)mode,
(int)owner, (int)parent_gid); (int)owner, (int)parent_gid);
if (mkdir(path, mode) != 0 && errno != EEXIST) { if (mkdir(path, mode) != 0 && errno != EEXIST) {
if (!quiet) if (!quiet)

10
src/exec_monitor.c
View File

@@ -211,29 +211,27 @@ handle_sigchld(int backchannel, struct command_status *cstat)
errno = ECHILD; errno = ECHILD;
/* FALLTHROUGH */ /* FALLTHROUGH */
case -1: case -1:
sudo_debug_printf(SUDO_DEBUG_DIAG,
"waitpid returned %d, expected pid %d", pid, cmnd_pid);
sudo_warn(U_("%s: %s"), __func__, "waitpid"); sudo_warn(U_("%s: %s"), __func__, "waitpid");
debug_return; debug_return;
} }
if (WIFCONTINUED(status)) { if (WIFCONTINUED(status)) {
sudo_debug_printf(SUDO_DEBUG_INFO, "%s: command (%d) resumed", sudo_debug_printf(SUDO_DEBUG_INFO, "%s: command (%d) resumed",
__func__, cmnd_pid); __func__, (int)cmnd_pid);
} else if (WIFSTOPPED(status)) { } else if (WIFSTOPPED(status)) {
if (sig2str(WSTOPSIG(status), signame) == -1) if (sig2str(WSTOPSIG(status), signame) == -1)
snprintf(signame, sizeof(signame), "%d", WSTOPSIG(status)); snprintf(signame, sizeof(signame), "%d", WSTOPSIG(status));
sudo_debug_printf(SUDO_DEBUG_INFO, "%s: command (%d) stopped, SIG%s", sudo_debug_printf(SUDO_DEBUG_INFO, "%s: command (%d) stopped, SIG%s",
__func__, cmnd_pid, signame); __func__, (int)cmnd_pid, signame);
} else if (WIFSIGNALED(status)) { } else if (WIFSIGNALED(status)) {
if (sig2str(WTERMSIG(status), signame) == -1) if (sig2str(WTERMSIG(status), signame) == -1)
snprintf(signame, sizeof(signame), "%d", WTERMSIG(status)); snprintf(signame, sizeof(signame), "%d", WTERMSIG(status));
sudo_debug_printf(SUDO_DEBUG_INFO, "%s: command (%d) killed, SIG%s", sudo_debug_printf(SUDO_DEBUG_INFO, "%s: command (%d) killed, SIG%s",
__func__, cmnd_pid, signame); __func__, (int)cmnd_pid, signame);
cmnd_pid = -1; cmnd_pid = -1;
} else if (WIFEXITED(status)) { } else if (WIFEXITED(status)) {
sudo_debug_printf(SUDO_DEBUG_INFO, "%s: command (%d) exited: %d", sudo_debug_printf(SUDO_DEBUG_INFO, "%s: command (%d) exited: %d",
__func__, cmnd_pid, WEXITSTATUS(status)); __func__, (int)cmnd_pid, WEXITSTATUS(status));
cmnd_pid = -1; cmnd_pid = -1;
} else { } else {
sudo_debug_printf(SUDO_DEBUG_WARN, sudo_debug_printf(SUDO_DEBUG_WARN,