- Make the code actually do, what the comments say (i.e. skip PAM acc…

…ount

  management, if we don't have the privileges to do so, anyway)
- Make ssl.h compile again, even if OpenSSL is not found at compile time.


git-svn-id: https://shellinabox.googlecode.com/svn/trunk@115 0da03de8-d603-11dd-86c2-0f8696b7b6f9

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"

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

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, [email protected])
-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])

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");
 };

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

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);

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 ?

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");
 };