diff --git a/config.h b/config.h index 9947ed1..88da9e7 100644 --- a/config.h +++ b/config.h @@ -95,7 +95,7 @@ #define STDC_HEADERS 1 /* Most recent revision number in the version control system */ -#define VCS_REVISION "113" +#define VCS_REVISION "115" /* Version number of package */ #define VERSION "2.6" diff --git a/configure b/configure index bfdd2bc..dd30dc8 100755 --- a/configure +++ b/configure @@ -2056,7 +2056,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $ ac_compiler_gnu=$ac_cv_c_compiler_gnu -VCS_REVISION=113 +VCS_REVISION=115 cat >>confdefs.h <<_ACEOF diff --git a/configure.ac b/configure.ac index 33e2341..66c0f67 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.6, markus@shellinabox.com) -VCS_REVISION=114 +VCS_REVISION=115 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 6b312c8..8a70a19 100644 --- a/demo/vt100.js +++ b/demo/vt100.js @@ -1500,7 +1500,7 @@ VT100.prototype.toggleBell = function() { }; VT100.prototype.about = function() { - alert("VT100 Terminal Emulator " + "2.6 (revision 113)" + + alert("VT100 Terminal Emulator " + "2.6 (revision 115)" + "\nCopyright 2008-2009 by Markus Gutschke\n" + "For more information check http://shellinabox.com"); }; diff --git a/libhttp/ssl.h b/libhttp/ssl.h index f7e49d6..62d585b 100644 --- a/libhttp/ssl.h +++ b/libhttp/ssl.h @@ -64,6 +64,7 @@ typedef struct BIO_METHOD BIO_METHOD; typedef struct SSL SSL; typedef struct SSL_CTX SSL_CTX; typedef struct SSL_METHOD SSL_METHOD; +typedef struct X509 X509; #define SSL_ERROR_WANT_READ 2 #define SSL_ERROR_WANT_WRITE 3 #endif diff --git a/shellinabox/launcher.c b/shellinabox/launcher.c index 73e41d5..ad7cb0a 100644 --- a/shellinabox/launcher.c +++ b/shellinabox/launcher.c @@ -769,7 +769,7 @@ static pam_handle_t *internalLogin(struct Service *service, struct Utmp *utmp, // PAM account management requires root access. Just skip it, if we // are running with lower privileges. - if (geteuid() && + if (!geteuid() && (rc = pam_acct_mgmt(pam, PAM_SILENT)) != PAM_SUCCESS) { pam_end(pam, rc); diff --git a/shellinabox/shell_in_a_box.js b/shellinabox/shell_in_a_box.js index c07aecc..7ea4039 100644 --- a/shellinabox/shell_in_a_box.js +++ b/shellinabox/shell_in_a_box.js @@ -355,7 +355,7 @@ ShellInABox.prototype.extendContextMenu = function(entries, actions) { }; ShellInABox.prototype.about = function() { - alert("Shell In A Box version " + "2.6 (revision 113)" + + alert("Shell In A Box version " + "2.6 (revision 115)" + "\nCopyright 2008-2009 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 6b312c8..8a70a19 100644 --- a/shellinabox/vt100.js +++ b/shellinabox/vt100.js @@ -1500,7 +1500,7 @@ VT100.prototype.toggleBell = function() { }; VT100.prototype.about = function() { - alert("VT100 Terminal Emulator " + "2.6 (revision 113)" + + alert("VT100 Terminal Emulator " + "2.6 (revision 115)" + "\nCopyright 2008-2009 by Markus Gutschke\n" + "For more information check http://shellinabox.com"); };