Make a best effort to close the PAM session properly. But if any failure is

reported, don't consider it fatal.

diff --git a/config.h b/config.h
index 547512cd4e6bc4429711d61b1f4f737c9cde59ba..79359d1cd0dfdc1159b4818da865f8693e345d4b 100644 (file)
--- a/config.h
+++ b/config.h
@@ -153,7 +153,7 @@
 #define STDC_HEADERS 1
 
 /* Most recent revision number in the version control system */
-#define VCS_REVISION "221"
+#define VCS_REVISION "222"
 
 /* Version number of package */
 #define VERSION "2.10"

diff --git a/configure b/configure
index ffd537eac697bbf447a7add09e022c6db3559cb8..5b7e0e765a4a55f62e8c779fd40db520e1f12a42 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=221
+VCS_REVISION=222
 
 
 cat >>confdefs.h <<_ACEOF

diff --git a/configure.ac b/configure.ac
index 64d38bb037df29d29ea5d322503999c2edfd0d18..1aad87594c78c8bb34253a9c44ac38a465663245 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=221
+VCS_REVISION=222
 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 5457b612a4c32416f13e0d3dcc5fff7aa72a20ea..e07066919977b005020622346e3fd8f0809cc21f 100644 (file)
--- a/demo/vt100.js
+++ b/demo/vt100.js
@@ -2384,7 +2384,7 @@ VT100.prototype.toggleCursorBlinking = function() {
 };
 
 VT100.prototype.about = function() {
-  alert("VT100 Terminal Emulator " + "2.10 (revision 221)" +
+  alert("VT100 Terminal Emulator " + "2.10 (revision 222)" +
         "\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 a4c861337b924d75d4c9dc4f4e7c39f4c39063ad..0bdb82222662c8bfe0f3c384c431bed1204e990e 100644 (file)
--- a/shellinabox/launcher.c
+++ b/shellinabox/launcher.c
@@ -1400,9 +1400,8 @@ static void childProcess(struct Service *service, int width, int height,
         // Finish all pending PAM operations.
         int status, rc;
         check(NOINTR(waitpid(pid, &status, 0)) == pid);
-        check((rc               = pam_close_session(pam, PAM_SILENT)) ==
-              PAM_SUCCESS);
-        check(pam_end(pam, rc) == PAM_SUCCESS);
+        pam_close_session(pam, PAM_SILENT);
+        pam_end(pam, rc);
         _exit(WIFEXITED(status) ? WEXITSTATUS(status) : -WTERMSIG(status));
       }
     }

diff --git a/shellinabox/shell_in_a_box.js b/shellinabox/shell_in_a_box.js
index babce31686603013866f8f0d634cf0d2935bfb0f..7fdda062183f08f8d3cdd94def15ae6f0959b867 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 221)" +
+  alert("Shell In A Box version " + "2.10 (revision 222)" +
         "\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 5457b612a4c32416f13e0d3dcc5fff7aa72a20ea..e07066919977b005020622346e3fd8f0809cc21f 100644 (file)
--- a/shellinabox/vt100.js
+++ b/shellinabox/vt100.js
@@ -2384,7 +2384,7 @@ VT100.prototype.toggleCursorBlinking = function() {
 };
 
 VT100.prototype.about = function() {
-  alert("VT100 Terminal Emulator " + "2.10 (revision 221)" +
+  alert("VT100 Terminal Emulator " + "2.10 (revision 222)" +
         "\nCopyright 2008-2010 by Markus Gutschke\n" +
         "For more information check http://shellinabox.com");
 };