Relax a check() that would trigger when using old-style (pre-Unix 98)

pseudo terminals.

diff --git a/config.h b/config.h
index d7e2ebb6b24ff5008e296f0b6fa69924400969a1..13bf3c164fa8f170f9b1cc812bd546a4b0779394 100644 (file)
--- 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 365667529cba515b905e347cdea1d036b4decfe8..ca766c019302973157a3606b25e430376c6a2f8c 100755 (executable)
--- 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 ef30c2615096774c96ac432b8911ce23be6a877c..9fa4eb84dcb04f3706f4f7914a0fb325192bc6ae 100644 (file)
--- 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 4182edf4285c3f75c8d5c6ce8000f68965e167b5..f34f0adbfc3966dff0543a38d234443be7ab8d6d 100644 (file)
--- 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 49a51a77ca32d904fa1a3c94110d4e59d33283e5..4ef14daf85aed54f2ad9e37631bef13a9b4ffc3c 100644 (file)
--- 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 0d214f03ff23c67c8b6d9a9b49ba0e0be3c443bb..608b7ceea3e916747d814a1bab59a1488ec49c3c 100644 (file)
--- 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 4182edf4285c3f75c8d5c6ce8000f68965e167b5..f34f0adbfc3966dff0543a38d234443be7ab8d6d 100644 (file)
--- 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");
 };