diff options
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | src/frontend/mosh-server.cc | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/configure.ac b/configure.ac index d02062b..f796de9 100644 --- a/configure.ac +++ b/configure.ac @@ -149,7 +149,7 @@ AC_ARG_WITH([utempter], [with_utempter="$withval"], [with_utempter="check"]) AS_IF([test x"$with_utempter" != xno], - [AC_SEARCH_LIBS([utempter_remove_added_record], [utempter], + [AC_SEARCH_LIBS([utempter_remove_record], [utempter], [AC_DEFINE([HAVE_UTEMPTER], [1], [Define if libutempter is available.])], [AS_IF([test x"$with_utempter" = xcheck], [AC_MSG_WARN([Unable to find libutempter; utmp entries will not be made.])], diff --git a/src/frontend/mosh-server.cc b/src/frontend/mosh-server.cc index 77bc3f3..c68d339 100644 --- a/src/frontend/mosh-server.cc +++ b/src/frontend/mosh-server.cc @@ -388,16 +388,16 @@ int run_server( const char *desired_ip, const char *desired_port, e.text.c_str() ); } + #ifdef HAVE_UTEMPTER + utempter_remove_record( master ); + #endif + if ( close( master ) < 0 ) { perror( "close" ); exit( 1 ); } delete network; - - #ifdef HAVE_UTEMPTER - utempter_remove_added_record(); - #endif } printf( "\n[mosh-server is exiting.]\n" ); @@ -510,7 +510,7 @@ void serve( int host_fd, Terminal::Complete &terminal, ServerConnection &network /* update utmp entry if we have become "connected" */ if ( (!connected_utmp) || ( saved_addr.s_addr != network.get_remote_ip().s_addr ) ) { - utempter_remove_added_record(); + utempter_remove_record( host_fd ); saved_addr = network.get_remote_ip(); @@ -607,7 +607,7 @@ void serve( int host_fd, Terminal::Complete &terminal, ServerConnection &network /* update utmp if has been more than 10 seconds since heard from client */ if ( connected_utmp ) { if ( time_since_remote_state > 10000 ) { - utempter_remove_added_record(); + utempter_remove_record( host_fd ); char tmp[ 64 ]; snprintf( tmp, 64, "mosh [%d]", getpid() ); |