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

Sprinkle some more O_NOCTTY and call grantpt() before unlockpt()

Browse Source
This commit is contained in:
Todd C. Miller
2009-10-15 21:48:19 +00:00
parent 3ece4c837f
commit 7d79b1da35
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
script.c
View File

@@ -864,15 +864,15 @@ get_pty(master, slave)
{ {
char *line; char *line;
*master = posix_openpt(O_RDWR); *master = posix_openpt(O_RDWR|O_NOCTTY);
if (*master == -1) if (*master == -1)
return(0); return(0);
(void) grantpt(*master);
if (unlockpt(*master) != 0) { if (unlockpt(*master) != 0) {
close(*master); close(*master);
return(0); return(0);
} }
(void) grantpt(*master);
line = ptsname(*master); line = ptsname(*master);
if (line == NULL) { if (line == NULL) {
close(*master); close(*master);
@@ -906,7 +906,7 @@ get_pty(master, slave)
slavename[sizeof("/dev/ptyX") - 2] = *bank; slavename[sizeof("/dev/ptyX") - 2] = *bank;
for (cp = "0123456789abcdef"; *cp != '\0'; cp++) { for (cp = "0123456789abcdef"; *cp != '\0'; cp++) {
slavename[sizeof("/dev/ptyXX") - 2] = *cp; slavename[sizeof("/dev/ptyXX") - 2] = *cp;
*master = open(slavename, O_RDWR, 0); *master = open(slavename, O_RDWR|O_NOCTTY, 0);
if (*master == -1) { if (*master == -1) {
if (errno == ENOENT) if (errno == ENOENT)
return(0); /* out of ptys */ return(0); /* out of ptys */