diff --git a/config.h b/config.h index d7e2ebb..13bf3c1 100644 --- a/config.h +++ b/config.h @@ -174,7 +174,7 @@ #define STDC_HEADERS 1 /* Most recent revision number in the version control system */ -#define VCS_REVISION "233" +#define VCS_REVISION "234" /* Version number of package */ #define VERSION "2.10" diff --git a/configure b/configure index 3656675..ca766c0 100755 --- a/configure +++ b/configure @@ -2328,7 +2328,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $ ac_compiler_gnu=$ac_cv_c_compiler_gnu -VCS_REVISION=233 +VCS_REVISION=234 cat >>confdefs.h <<_ACEOF diff --git a/configure.ac b/configure.ac index ef30c26..9fa4eb8 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ AC_PREREQ(2.57) dnl This is the one location where the authoritative version number is stored AC_INIT(shellinabox, 2.10, markus@shellinabox.com) -VCS_REVISION=233 +VCS_REVISION=234 AC_SUBST(VCS_REVISION) AC_DEFINE_UNQUOTED(VCS_REVISION, "${VCS_REVISION}", [Most recent revision number in the version control system]) diff --git a/demo/vt100.js b/demo/vt100.js index 4182edf..f34f0ad 100644 --- a/demo/vt100.js +++ b/demo/vt100.js @@ -2402,7 +2402,7 @@ VT100.prototype.toggleCursorBlinking = function() { }; VT100.prototype.about = function() { - alert("VT100 Terminal Emulator " + "2.10 (revision 233)" + + alert("VT100 Terminal Emulator " + "2.10 (revision 234)" + "\nCopyright 2008-2010 by Markus Gutschke\n" + "For more information check http://shellinabox.com"); }; diff --git a/shellinabox/launcher.c b/shellinabox/launcher.c index 49a51a7..4ef14da 100644 --- a/shellinabox/launcher.c +++ b/shellinabox/launcher.c @@ -497,7 +497,9 @@ void initUtmp(struct Utmp *utmp, int useLogin, const char *ptyPath, utmp->useLogin = useLogin; #ifdef HAVE_UTMPX_H utmp->utmpx.ut_type = useLogin ? LOGIN_PROCESS : USER_PROCESS; - dcheck(!strncmp(ptyPath, "/dev/pts", 8)); + dcheck(!strncmp(ptyPath, "/dev/pts", 8) || + !strncmp(ptyPath, "/dev/pty", 8) || + !strncmp(ptyPath, "/dev/tty", 8)); strncat(&utmp->utmpx.ut_line[0], ptyPath + 5, sizeof(utmp->utmpx.ut_line)); strncat(&utmp->utmpx.ut_id[0], ptyPath + 8, sizeof(utmp->utmpx.ut_id)); strncat(&utmp->utmpx.ut_user[0], "SHELLINABOX", sizeof(utmp->utmpx.ut_user)); @@ -1619,7 +1621,7 @@ int forkLauncher(void) { // Temporarily drop most permissions. We still retain the ability to // switch back to root, which is necessary for launching "login". lowerPrivileges(); - closeAllFds((int []){ pair[1] }, 1); + closeAllFds((int []){ pair[1], 2 }, 2); launcherDaemon(pair[1]); fatal("exit() failed!"); case -1: diff --git a/shellinabox/shell_in_a_box.js b/shellinabox/shell_in_a_box.js index 0d214f0..608b7ce 100644 --- a/shellinabox/shell_in_a_box.js +++ b/shellinabox/shell_in_a_box.js @@ -358,7 +358,7 @@ ShellInABox.prototype.extendContextMenu = function(entries, actions) { }; ShellInABox.prototype.about = function() { - alert("Shell In A Box version " + "2.10 (revision 233)" + + alert("Shell In A Box version " + "2.10 (revision 234)" + "\nCopyright 2008-2010 by Markus Gutschke\n" + "For more information check http://shellinabox.com" + (typeof serverSupportsSSL != 'undefined' && serverSupportsSSL ? diff --git a/shellinabox/vt100.js b/shellinabox/vt100.js index 4182edf..f34f0ad 100644 --- a/shellinabox/vt100.js +++ b/shellinabox/vt100.js @@ -2402,7 +2402,7 @@ VT100.prototype.toggleCursorBlinking = function() { }; VT100.prototype.about = function() { - alert("VT100 Terminal Emulator " + "2.10 (revision 233)" + + alert("VT100 Terminal Emulator " + "2.10 (revision 234)" + "\nCopyright 2008-2010 by Markus Gutschke\n" + "For more information check http://shellinabox.com"); };