Removed non-standard fields from updwtmpx() wrapper function. This should improve

compatibility with systems that implement updwtmp() but not updwtmpx().

Also, changed Makefile rules in an attempt to improve compatibility with BSD
make utilities.

diff --git a/Makefile.am b/Makefile.am
index 8e3d86f754c83ad81fc1870244a6ccd959c58360..925dcbc4cf3649be8fdcaa178985f3bbf4b7551f 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -158,43 +158,43 @@ ${top_srcdir}/demo/demo.js: ${top_srcdir}/demo/beep.wav                       \
 
 ${top_srcdir}/demo/beep.wav: ${top_srcdir}/shellinabox/beep.wav
        @rm -f "$@"
-       ln "$<" "$@"
+       ln "$^" "$@"
 
 ${top_srcdir}/demo/enabled.gif: ${top_srcdir}/shellinabox/enabled.gif
        @rm -f "$@"
-       ln "$<" "$@"
+       ln "$^" "$@"
 
 ${top_srcdir}/demo/favicon.ico: ${top_srcdir}/shellinabox/favicon.ico
        @rm -f "$@"
-       ln "$<" "$@"
+       ln "$^" "$@"
 
 ${top_srcdir}/demo/styles.css: ${top_srcdir}/shellinabox/styles.css
        @rm -f "$@"
-       sed -e '/\[if DEFINES_COLORS\]/,/\[endif DEFINES_COLORS\]/d' "$<" >"$@"
+       sed -e '/\[if DEFINES_COLORS\]/,/\[endif DEFINES_COLORS\]/d' "$^" >"$@"
 
 ${top_srcdir}/demo/print-styles.css: ${top_srcdir}/shellinabox/print-styles.css
        @rm -f "$@"
-       ln "$<" "$@"
+       ln "$^" "$@"
 
 ${top_srcdir}/demo/usercss-0.css: ${top_srcdir}/shellinabox/white-on-black.css
        @rm -f "$@"
-       ln "$<" "$@"
+       ln "$^" "$@"
 
 ${top_srcdir}/demo/usercss-1.css: ${top_srcdir}/shellinabox/black-on-white.css
        @rm -f "$@"
-       ln "$<" "$@"
+       ln "$^" "$@"
 
 ${top_srcdir}/demo/usercss-2.css: ${top_srcdir}/shellinabox/monochrome.css
        @rm -f "$@"
-       ln "$<" "$@"
+       ln "$^" "$@"
 
 ${top_srcdir}/demo/usercss-3.css: ${top_srcdir}/shellinabox/color.css
        @rm -f "$@"
-       ln "$<" "$@"
+       ln "$^" "$@"
 
 ${top_srcdir}/demo/vt100.js: ${top_srcdir}/shellinabox/vt100.js
        @rm -f "$@"
-       ln "$<" "$@"
+       ln "$^" "$@"
 
 shellinaboxd.1: shellinabox/shellinaboxd.man.in config.h
        @src="${top_srcdir}/shellinabox/shellinaboxd.man.in";                 \

diff --git a/Makefile.in b/Makefile.in
index fdfe133df32fa581d1019afca91dfc701ae51f5d..f86e8eb97299394a7abf3b04def3c7a15045b4ce 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -1172,43 +1172,43 @@ ${top_srcdir}/demo/demo.js: ${top_srcdir}/demo/beep.wav                       \
 
 ${top_srcdir}/demo/beep.wav: ${top_srcdir}/shellinabox/beep.wav
        @rm -f "$@"
-       ln "$<" "$@"
+       ln "$^" "$@"
 
 ${top_srcdir}/demo/enabled.gif: ${top_srcdir}/shellinabox/enabled.gif
        @rm -f "$@"
-       ln "$<" "$@"
+       ln "$^" "$@"
 
 ${top_srcdir}/demo/favicon.ico: ${top_srcdir}/shellinabox/favicon.ico
        @rm -f "$@"
-       ln "$<" "$@"
+       ln "$^" "$@"
 
 ${top_srcdir}/demo/styles.css: ${top_srcdir}/shellinabox/styles.css
        @rm -f "$@"
-       sed -e '/\[if DEFINES_COLORS\]/,/\[endif DEFINES_COLORS\]/d' "$<" >"$@"
+       sed -e '/\[if DEFINES_COLORS\]/,/\[endif DEFINES_COLORS\]/d' "$^" >"$@"
 
 ${top_srcdir}/demo/print-styles.css: ${top_srcdir}/shellinabox/print-styles.css
        @rm -f "$@"
-       ln "$<" "$@"
+       ln "$^" "$@"
 
 ${top_srcdir}/demo/usercss-0.css: ${top_srcdir}/shellinabox/white-on-black.css
        @rm -f "$@"
-       ln "$<" "$@"
+       ln "$^" "$@"
 
 ${top_srcdir}/demo/usercss-1.css: ${top_srcdir}/shellinabox/black-on-white.css
        @rm -f "$@"
-       ln "$<" "$@"
+       ln "$^" "$@"
 
 ${top_srcdir}/demo/usercss-2.css: ${top_srcdir}/shellinabox/monochrome.css
        @rm -f "$@"
-       ln "$<" "$@"
+       ln "$^" "$@"
 
 ${top_srcdir}/demo/usercss-3.css: ${top_srcdir}/shellinabox/color.css
        @rm -f "$@"
-       ln "$<" "$@"
+       ln "$^" "$@"
 
 ${top_srcdir}/demo/vt100.js: ${top_srcdir}/shellinabox/vt100.js
        @rm -f "$@"
-       ln "$<" "$@"
+       ln "$^" "$@"
 
 shellinaboxd.1: shellinabox/shellinaboxd.man.in config.h
        @src="${top_srcdir}/shellinabox/shellinaboxd.man.in";                 \

diff --git a/config.h b/config.h
index df0cfbbb0c8142207c8e3149a404c857c9eb3677..31c1dcc07b62a6fa63cdf179448a962910f0e89f 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 "207"
+#define VCS_REVISION "208"
 
 /* Version number of package */
 #define VERSION "2.10"

diff --git a/configure b/configure
index 75ae8f9cf7ebdffdce0788d5cd003f143a6b2ea3..47f3cabab20ce9a52e03fb258e89bcd67a763bb9 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=207
+VCS_REVISION=208
 
 
 cat >>confdefs.h <<_ACEOF

diff --git a/configure.ac b/configure.ac
index 77c23c35fd31e8972ca8b3151fab528084cb7616..511cc3212a8b210a3f8a119415ffaf0d0cb1bac6 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=207
+VCS_REVISION=208
 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 2a382ac7d6710a5a7b1252ac38b0cc15903c31ee..0e83bb61a53b743fcdb2e1a24ac1edfb7163081a 100644 (file)
--- a/demo/vt100.js
+++ b/demo/vt100.js
@@ -1955,7 +1955,7 @@ VT100.prototype.toggleBell = function() {
 };
 
 VT100.prototype.about = function() {
-  alert("VT100 Terminal Emulator " + "2.10 (revision 207)" +
+  alert("VT100 Terminal Emulator " + "2.10 (revision 208)" +
         "\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 4ff1c5a6e99768a111d64d902e9bfe461ad3cb89..a4c861337b924d75d4c9dc4f4e7c39f4c39063ad 100644 (file)
--- a/shellinabox/launcher.c
+++ b/shellinabox/launcher.c
@@ -503,7 +503,6 @@ static void updwtmpx(const char *wtmpx_file, const struct utmpx *utx) {
   struct utmp ut   = { 0 };
   ut.ut_type       = utx->ut_type;
   ut.ut_pid        = utx->ut_pid;
-  ut.ut_session    = utx->ut_session;
   ut.ut_tv.tv_sec  = utx->ut_tv.tv_sec;
   ut.ut_tv.tv_usec = utx->ut_tv.tv_usec;
   memcpy(&ut.ut_line, &utx->ut_line,
@@ -514,10 +513,6 @@ static void updwtmpx(const char *wtmpx_file, const struct utmpx *utx) {
          min(sizeof(ut.ut_user), sizeof(utx->ut_user)));
   memcpy(&ut.ut_host, &utx->ut_host,
          min(sizeof(ut.ut_host), sizeof(utx->ut_host)));
-  memcpy(&ut.ut_exit, &utx->ut_exit,
-         min(sizeof(ut.ut_exit), sizeof(utx->ut_exit)));
-  memcpy(&ut.ut_addr_v6, &utx->ut_addr_v6,
-         min(sizeof(ut.ut_addr_v6), sizeof(utx->ut_addr_v6)));
   updwtmp(wtmpx_file, &ut);
 }
 #endif

diff --git a/shellinabox/shell_in_a_box.js b/shellinabox/shell_in_a_box.js
index 4cc7b5dd6e63d74e4e6d3f40fc73a91de0c4f6b8..ddf5c6314d813513183ad3b14a69100981f56aca 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 207)" +
+  alert("Shell In A Box version " + "2.10 (revision 208)" +
         "\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 2a382ac7d6710a5a7b1252ac38b0cc15903c31ee..0e83bb61a53b743fcdb2e1a24ac1edfb7163081a 100644 (file)
--- a/shellinabox/vt100.js
+++ b/shellinabox/vt100.js
@@ -1955,7 +1955,7 @@ VT100.prototype.toggleBell = function() {
 };
 
 VT100.prototype.about = function() {
-  alert("VT100 Terminal Emulator " + "2.10 (revision 207)" +
+  alert("VT100 Terminal Emulator " + "2.10 (revision 208)" +
         "\nCopyright 2008-2010 by Markus Gutschke\n" +
         "For more information check http://shellinabox.com");
 };