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

Fix setting of utmp entry when running command in a pty.

Browse Source 
Regression introduced in sudo 1.8.22.
This commit is contained in:
Todd C. Miller
2019-01-02 07:39:33 -07:00
parent efe35e5b1e
commit b2f7983c84
1 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/exec_pty.c
View File

@@ -140,7 +140,7 @@ pty_cleanup(void)
* and slavename globals. * and slavename globals.
*/ */
static bool static bool
pty_setup(uid_t uid, const char *tty) pty_setup(struct command_details *details, const char *tty)
{ {
debug_decl(pty_setup, SUDO_DEBUG_EXEC); debug_decl(pty_setup, SUDO_DEBUG_EXEC);
@@ -152,12 +152,15 @@ pty_setup(uid_t uid, const char *tty)
} }
if (!get_pty(&io_fds[SFD_MASTER], &io_fds[SFD_SLAVE], if (!get_pty(&io_fds[SFD_MASTER], &io_fds[SFD_SLAVE],
slavename, sizeof(slavename), uid)) slavename, sizeof(slavename), details->euid))
sudo_fatal(U_("unable to allocate pty")); sudo_fatal(U_("unable to allocate pty"));
/* Add entry to utmp/utmpx? */ /* Add entry to utmp/utmpx? */
if (utmp_user != NULL) if (ISSET(details->flags, CD_SET_UTMP)) {
utmp_user =
details->utmp_user ? details->utmp_user : user_details.username;
utmp_login(tty, slavename, io_fds[SFD_SLAVE], utmp_user); utmp_login(tty, slavename, io_fds[SFD_SLAVE], utmp_user);
}
sudo_debug_printf(SUDO_DEBUG_INFO, sudo_debug_printf(SUDO_DEBUG_INFO,
"%s: %s fd %d, pty master fd %d, pty slave fd %d", "%s: %s fd %d, pty master fd %d, pty slave fd %d",
@@ -1302,12 +1305,11 @@ exec_pty(struct command_details *details, struct command_status *cstat)
/* /*
* Allocate a pty. * Allocate a pty.
*/ */
if (pty_setup(details->euid, user_details.tty)) { if (!pty_setup(details, user_details.tty)) {
if (ISSET(details->flags, CD_SET_UTMP)) if (TAILQ_EMPTY(&io_plugins)) {
utmp_user = details->utmp_user ? details->utmp_user : user_details.username; /* Not logging I/O and didn't allocate a pty. */
} else if (TAILQ_EMPTY(&io_plugins)) { debug_return_bool(false);
/* Not logging I/O and didn't allocate a pty. */ }
debug_return_bool(false);
} }
/* /*