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

Do not set utmp_user if we did not actually allocate a pty.

Browse Source
This commit is contained in:
Todd C. Miller
2017-09-07 11:00:19 -06:00
parent 87eba6c892
commit 2c2476f07f
1 changed files with 23 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/exec_pty.c
View File

@@ -131,26 +131,32 @@ pty_cleanup(void)
* Fills in io_fds[SFD_USERTTY], io_fds[SFD_MASTER], io_fds[SFD_SLAVE] * Fills in io_fds[SFD_USERTTY], io_fds[SFD_MASTER], io_fds[SFD_SLAVE]
* and slavename globals. * and slavename globals.
*/ */
static void static bool
pty_setup(uid_t uid, const char *tty) pty_setup(uid_t uid, const char *tty)
{ {
debug_decl(pty_setup, SUDO_DEBUG_EXEC); debug_decl(pty_setup, SUDO_DEBUG_EXEC);
io_fds[SFD_USERTTY] = open(_PATH_TTY, O_RDWR); io_fds[SFD_USERTTY] = open(_PATH_TTY, O_RDWR);
if (io_fds[SFD_USERTTY] != -1) { if (io_fds[SFD_USERTTY] == -1) {
if (!get_pty(&io_fds[SFD_MASTER], &io_fds[SFD_SLAVE], sudo_debug_printf(SUDO_DEBUG_INFO, "%s: no %s, not allocating a pty",
slavename, sizeof(slavename), uid)) __func__, _PATH_TTY);
sudo_fatal(U_("unable to allocate pty")); debug_return_bool(false);
/* Add entry to utmp/utmpx? */
if (utmp_user != NULL)
utmp_login(tty, slavename, io_fds[SFD_SLAVE], utmp_user);
sudo_debug_printf(SUDO_DEBUG_INFO,
"%s: %s fd %d, pty master fd %d, pty slave fd %d",
__func__, _PATH_TTY, io_fds[SFD_USERTTY], io_fds[SFD_MASTER],
io_fds[SFD_SLAVE]);
} }
debug_return; if (!get_pty(&io_fds[SFD_MASTER], &io_fds[SFD_SLAVE],
slavename, sizeof(slavename), uid))
sudo_fatal(U_("unable to allocate pty"));
/* Add entry to utmp/utmpx? */
if (utmp_user != NULL)
utmp_login(tty, slavename, io_fds[SFD_SLAVE], utmp_user);
sudo_debug_printf(SUDO_DEBUG_INFO,
"%s: %s fd %d, pty master fd %d, pty slave fd %d",
__func__, _PATH_TTY, io_fds[SFD_USERTTY], io_fds[SFD_MASTER],
io_fds[SFD_SLAVE]);
debug_return_bool(true);
} }
int int
@@ -1160,10 +1166,10 @@ exec_pty(struct command_details *details, struct command_status *cstat)
/* /*
* Allocate a pty. * Allocate a pty.
*/ */
if (ISSET(details->flags, CD_SET_UTMP)) if (pty_setup(details->euid, user_details.tty)) {
utmp_user = details->utmp_user ? details->utmp_user : user_details.username; if (ISSET(details->flags, CD_SET_UTMP))
sudo_debug_printf(SUDO_DEBUG_INFO, "allocate pty for I/O logging"); utmp_user = details->utmp_user ? details->utmp_user : user_details.username;
pty_setup(details->euid, user_details.tty); }
/* /*
* We communicate with the monitor over a bi-directional pair of sockets. * We communicate with the monitor over a bi-directional pair of sockets.