Fixed confusing error message when we fail to dynamically load PAM support.

diff --git a/config.h b/config.h
index 8e63c44e0a4d811e9b27fad79dcc53f0357c92c7..755a94b594677c0004a6d54bd08d30353f2291ef 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 "236"
+#define VCS_REVISION "237"
 
 /* Version number of package */
 #define VERSION "2.10"

diff --git a/configure b/configure
index 27505adefcb7f48b601babb99d170550d87c0bef..fcdca25cd04772a8b6db288310a96b6dc90f549c 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=236
+VCS_REVISION=237
 
 
 cat >>confdefs.h <<_ACEOF

diff --git a/configure.ac b/configure.ac
index ae02914f1846f6da6d5dee6ab9d465cb865f387f..04a95525640e9aed670ba1bb0d693255ac5ea4f8 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=236
+VCS_REVISION=237
 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 cd02a14be53c6667bb0184bce693f74cf9863deb..5f1ee93fe10b25383c3738bf6e8ce37942f4005c 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 236)" +
+  alert("VT100 Terminal Emulator " + "2.10 (revision 237)" +
         "\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 cb63cc3377f78f9ef11ee761c7e5818d94ea116a..92f08640f9d7b7643554a139b948a45aaf703366 100644 (file)
--- a/shellinabox/launcher.c
+++ b/shellinabox/launcher.c
@@ -437,7 +437,7 @@ static void loadPAM(void) {
       for (unsigned j = 0; j < sizeof(symbols)/sizeof(symbols[0]); j++) {
         *symbols[j].var = NULL;
       }
-      break;
+      return;
     }
   }
   debug("Loaded PAM suppport");

diff --git a/shellinabox/shell_in_a_box.js b/shellinabox/shell_in_a_box.js
index 7a6e93e5e63ee6b22a01c6a16f1241173159e70a..6a90cbffc3a521916e628acfafceb62ac4e2f36d 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 236)" +
+  alert("Shell In A Box version " + "2.10 (revision 237)" +
         "\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 cd02a14be53c6667bb0184bce693f74cf9863deb..5f1ee93fe10b25383c3738bf6e8ce37942f4005c 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 236)" +
+  alert("VT100 Terminal Emulator " + "2.10 (revision 237)" +
         "\nCopyright 2008-2010 by Markus Gutschke\n" +
         "For more information check http://shellinabox.com");
 };