simono41/shellinabox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Added fallback on old-style pty's, if /dev/pts is not mounted.

Browse source 
git-svn-id: https://shellinabox.googlecode.com/svn/trunk@73 0da03de8-d603-11dd-86c2-0f8696b7b6f9
This commit is contained in:
zodiac 2009-02-28 05:34:21 +00:00
parent 86dc79030d
commit b0341e1549
3 changed files with 47 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ChangeLog
View file

@ -1,5 +1,7 @@
2009-02-27 Markus Gutschke <markus@shellinabox.com> 2009-02-27 Markus Gutschke <markus@shellinabox.com>
* Added fallback on old-style pty's, if /dev/pts is not mounted.
* Work-around for systems that don't define a "nogroup" group. * Work-around for systems that don't define a "nogroup" group.
* Remove the dependency on fdopendir, which does not exist * Remove the dependency on fdopendir, which does not exist

2
config.h
View file

@ -95,7 +95,7 @@
#define STDC_HEADERS 1 #define STDC_HEADERS 1
/* Most recent revision number in the version control system */ /* Most recent revision number in the version control system */
#define VCS_REVISION "72" #define VCS_REVISION "73"
/* Version number of package */ /* Version number of package */
#define VERSION "2.4" #define VERSION "2.4"

61
shellinabox/launcher.c
View file

@ -557,38 +557,65 @@ static int forkPty(int *pty, int useLogin, struct Utmp **utmp,
const char *peerName) { const char *peerName) {
int slave; int slave;
char ptyPath[PATH_MAX]; char ptyPath[PATH_MAX];
if ((*pty = posix_openpt(O_RDWR|O_NOCTTY)) < 0 || if ((*pty = posix_openpt(O_RDWR|O_NOCTTY)) < 0 ||
grantpt(*pty) < 0 || grantpt(*pty) < 0 ||
unlockpt(*pty) < 0 || unlockpt(*pty) < 0 ||
ptsname_r(*pty, ptyPath, sizeof(ptyPath)) < 0 || ptsname_r(*pty, ptyPath, sizeof(ptyPath)) < 0 ||
(slave = NOINTR(open(ptyPath, O_RDWR|O_NOCTTY))) < 0) { (slave = NOINTR(open(ptyPath, O_RDWR|O_NOCTTY))) < 0) {
if (*pty >= 0) { if (*pty >= 0) {
NOINTR(close(*pty)); NOINTR(close(*pty));
} }
*pty = -1;
*utmp = NULL; // Try old-style pty handling
char fname[40] = "/dev/ptyXX";
for (const char *ptr1 = "pqrstuvwxyzabcde"; *ptr1; ptr1++) {
fname[8] = *ptr1;
for (const char *ptr2 = "0123456789abcdef"; *ptr2; ptr2++) {
fname[9] = *ptr2;
if ((*pty = NOINTR(open(fname, O_RDWR, 0))) < 0) {
if (errno == ENOENT) {
goto failure;
}
}
grantpt(*pty);
unlockpt(*pty);
if (ptsname_r(*pty, ptyPath, sizeof(ptyPath)) < 0) {
strcpy(ptyPath, fname);
ptyPath[5] = 't';
}
if ((slave = NOINTR(open(ptyPath, O_RDWR|O_NOCTTY))) >= 0) {
debug("Opened old-style pty: %s", ptyPath);
goto success;
}
NOINTR(close(*pty));
}
}
failure:
*pty = -1;
*utmp = NULL;
return -1; return -1;
} }
success:
// Fill in utmp entry // Fill in utmp entry
*utmp = newUtmp(useLogin, ptyPath, peerName); *utmp = newUtmp(useLogin, ptyPath, peerName);
// Now, fork off the child process // Now, fork off the child process
pid_t pid; pid_t pid;
if ((pid = fork()) < 0) { if ((pid = fork()) < 0) {
NOINTR(close(slave)); NOINTR(close(slave));
NOINTR(close(*pty)); NOINTR(close(*pty));
*pty = -1; *pty = -1;
deleteUtmp(*utmp); deleteUtmp(*utmp);
*utmp = NULL; *utmp = NULL;
return -1; return -1;
} else if (pid == 0) { } else if (pid == 0) {
pid = getpid(); pid = getpid();
snprintf((char *)&(*utmp)->pid[0], sizeof((*utmp)->pid), "%d", pid); snprintf((char *)&(*utmp)->pid[0], sizeof((*utmp)->pid), "%d", pid);
#ifdef HAVE_UTMPX_H #ifdef HAVE_UTMPX_H
(*utmp)->utmpx.ut_pid = pid; (*utmp)->utmpx.ut_pid = pid;
#endif #endif
(*utmp)->pty = slave; (*utmp)->pty = slave;
closeAllFds((int []){ slave }, 1); closeAllFds((int []){ slave }, 1);
@ -607,7 +634,7 @@ static int forkPty(int *pty, int useLogin, struct Utmp **utmp,
NOINTR(close(slave)); NOINTR(close(slave));
} }
#endif #endif
*pty = 0; *pty = 0;
// Force the pty to be our control terminal // Force the pty to be our control terminal
NOINTR(close(NOINTR(open(ptyPath, O_RDWR)))); NOINTR(close(NOINTR(open(ptyPath, O_RDWR))));
@ -616,9 +643,9 @@ static int forkPty(int *pty, int useLogin, struct Utmp **utmp,
} else { } else {
snprintf((char *)&(*utmp)->pid[0], sizeof((*utmp)->pid), "%d", pid); snprintf((char *)&(*utmp)->pid[0], sizeof((*utmp)->pid), "%d", pid);
#ifdef HAVE_UTMPX_H #ifdef HAVE_UTMPX_H
(*utmp)->utmpx.ut_pid = pid; (*utmp)->utmpx.ut_pid = pid;
#endif #endif
(*utmp)->pty = *pty; (*utmp)->pty = *pty;
fcntl(*pty, F_SETFL, O_NONBLOCK|O_RDWR); fcntl(*pty, F_SETFL, O_NONBLOCK|O_RDWR);
NOINTR(close(slave)); NOINTR(close(slave));
return pid; return pid;