mir/sudo
2
0
Fork 0
mirror of https://github.com/sudo-project/sudo.git synced 2025-08-31 06:15:37 +00:00
Code Issues Releases Wiki Activity

Redo utmp handling. If no getutent()/getutxent() is available,

Browse Source 
assume a ttyslot-based utmp.  If getttyent() is available, use
that directly instead of ttyslot() so we don't have to do the
stdin dup2 dance.
This commit is contained in:
Todd C. Miller
2011-03-14 10:20:47 -04:00
parent 1e9def1efa
commit 8653ccc809
7 changed files with 431 additions and 241 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/exec_pty.c
View File

@@ -118,7 +118,7 @@ cleanup(int gotsignal)
#ifdef HAVE_SELINUX
selinux_restore_tty();
#endif
utmp_remove(slavename);
utmp_logout(slavename);
}
/*
@@ -131,24 +131,13 @@ pty_setup(uid_t uid, const char *tty)
{
io_fds[SFD_USERTTY] = open(_PATH_TTY, O_RDWR|O_NOCTTY, 0);
if (io_fds[SFD_USERTTY] != -1) {
int sfd;
if (!get_pty(&io_fds[SFD_MASTER], &io_fds[SFD_SLAVE],
slavename, sizeof(slavename), uid))
error(1, "Can't get pty");
/*
* Add entry to utmp/utmpx.
* Temporarily point stdin to the pty slave for the benefit of
* legacy utmp handling that uses ttyslot().
*/
if ((sfd = dup(STDIN_FILENO)) == -1)
error(1, "Can't save stdin");
if (dup2(io_fds[SFD_SLAVE], STDIN_FILENO) == -1)
error(1, "Can't dup2 stdin");
utmp_clone(tty, slavename);
if (dup2(sfd, STDIN_FILENO) == -1)
error(1, "Can't restore stdin");
close(sfd);
utmp_login(tty, slavename, io_fds[SFD_SLAVE]);
}
}
@@ -667,7 +656,7 @@ pty_close(struct command_status *cstat)
}
}
}
utmp_remove(slavename);
utmp_logout(slavename);
}
/*