tyler.durden/openssh-portable
1
0
Fork 0
mirror of https://github.com/PowerShell/openssh-portable.git synced 2025-07-31 01:35:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

- (djm) Revert SSH2 serverloop hack, will find a better way.

Browse Source
This commit is contained in:
Damien Miller 2000-10-14 12:33:48 +11:00
parent 60819b44bd
commit 15b2952cd8
4 changed files with 2 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -1,5 +1,6 @@
20001014 20001014
- (djm) Don't accept PAM_PROMPT_ECHO_ON messages during initial auth - (djm) Don't accept PAM_PROMPT_ECHO_ON messages during initial auth
- (djm) Revert SSH2 serverloop hack, will find a better way.
20001007 20001007
- (stevesk) Print PAM return value in PAM log messages to aid - (stevesk) Print PAM return value in PAM log messages to aid

2
serverloop.c
View File

@ -676,8 +676,6 @@ server_loop2(void)
session_close_by_pid(pid, status); session_close_by_pid(pid, status);
child_terminated = 0; child_terminated = 0;
signal(SIGCHLD, sigchld_handler2); signal(SIGCHLD, sigchld_handler2);
if (used_sessions() == 0)
break;
} }
channel_after_select(&readset, &writeset); channel_after_select(&readset, &writeset);
process_input(&readset); process_input(&readset);

11
session.c
View File

@ -150,7 +150,6 @@ char *original_command = NULL;
/* data */ /* data */
#define MAX_SESSIONS 10 #define MAX_SESSIONS 10
Session sessions[MAX_SESSIONS]; Session sessions[MAX_SESSIONS];
static int num_used_sessions;
#ifdef WITH_AIXAUTHENTICATE #ifdef WITH_AIXAUTHENTICATE
/* AIX's lastlogin message, set in auth1.c */ /* AIX's lastlogin message, set in auth1.c */
@ -1438,7 +1437,6 @@ session_new(void)
sessions[i].used = 0; sessions[i].used = 0;
sessions[i].self = i; sessions[i].self = i;
} }
num_used_sessions = 0;
did_init = 1; did_init = 1;
} }
for(i = 0; i < MAX_SESSIONS; i++) { for(i = 0; i < MAX_SESSIONS; i++) {
@ -1457,8 +1455,7 @@ session_new(void)
s->auth_proto = NULL; s->auth_proto = NULL;
s->used = 1; s->used = 1;
s->pw = NULL; s->pw = NULL;
num_used_sessions++; debug("session_new: session %d", i);
debug("session_new: session %d (%d used)", i, num_used_sessions);
return s; return s;
} }
} }
@ -1871,7 +1868,6 @@ session_close(Session *s)
session_pty_cleanup(s); session_pty_cleanup(s);
session_free(s); session_free(s);
session_proctitle(s); session_proctitle(s);
num_used_sessions--;
} }
void void
@ -1917,11 +1913,6 @@ session_close_by_channel(int id, void *arg)
} }
} }
int used_sessions(void)
{
return(num_used_sessions);
}
char * char *
session_tty_list(void) session_tty_list(void)
{ {

1
session.h
View File

@ -33,6 +33,5 @@ int session_open(int id);
void session_input_channel_req(int id, void *arg); void session_input_channel_req(int id, void *arg);
void session_close_by_pid(pid_t pid, int status); void session_close_by_pid(pid_t pid, int status);
void session_close_by_channel(int id, void *arg); void session_close_by_channel(int id, void *arg);
int used_sessions(void);
#endif #endif