diff options
| -rw-r--r-- | ChangeLog | 1 | ||||
| -rw-r--r-- | serverloop.c | 2 | ||||
| -rw-r--r-- | session.c | 11 | ||||
| -rw-r--r-- | session.h | 1 |
4 files changed, 2 insertions, 13 deletions
@@ -1,5 +1,6 @@ 20001014 - (djm) Don't accept PAM_PROMPT_ECHO_ON messages during initial auth + - (djm) Revert SSH2 serverloop hack, will find a better way. 20001007 - (stevesk) Print PAM return value in PAM log messages to aid diff --git a/serverloop.c b/serverloop.c index 8ee93b3b..25320348 100644 --- a/serverloop.c +++ b/serverloop.c @@ -676,8 +676,6 @@ server_loop2(void) session_close_by_pid(pid, status); child_terminated = 0; signal(SIGCHLD, sigchld_handler2); - if (used_sessions() == 0) - break; } channel_after_select(&readset, &writeset); process_input(&readset); @@ -150,7 +150,6 @@ char *original_command = NULL; /* data */ #define MAX_SESSIONS 10 Session sessions[MAX_SESSIONS]; -static int num_used_sessions; #ifdef WITH_AIXAUTHENTICATE /* AIX's lastlogin message, set in auth1.c */ @@ -1438,7 +1437,6 @@ session_new(void) sessions[i].used = 0; sessions[i].self = i; } - num_used_sessions = 0; did_init = 1; } for(i = 0; i < MAX_SESSIONS; i++) { @@ -1457,8 +1455,7 @@ session_new(void) s->auth_proto = NULL; s->used = 1; s->pw = NULL; - num_used_sessions++; - debug("session_new: session %d (%d used)", i, num_used_sessions); + debug("session_new: session %d", i); return s; } } @@ -1871,7 +1868,6 @@ session_close(Session *s) session_pty_cleanup(s); session_free(s); session_proctitle(s); - num_used_sessions--; } void @@ -1917,11 +1913,6 @@ session_close_by_channel(int id, void *arg) } } -int used_sessions(void) -{ - return(num_used_sessions); -} - char * session_tty_list(void) { @@ -33,6 +33,5 @@ int session_open(int id); void session_input_channel_req(int id, void *arg); void session_close_by_pid(pid_t pid, int status); void session_close_by_channel(int id, void *arg); -int used_sessions(void); #endif |