diff options
author | Ben Lindstrom <mouring@eviladmin.org> | 2001-06-21 03:19:23 +0000 |
---|---|---|
committer | Ben Lindstrom <mouring@eviladmin.org> | 2001-06-21 03:19:23 +0000 |
commit | 601e43638e9e7889127634c3ba0949ba9fb917aa (patch) | |
tree | cf47af3b86f9260589980db64440cea4cd2d8dbd /clientloop.c | |
parent | 0a7ca6c7baf13265e86b98a40bfd00714d67c84e (diff) |
- markus@cvs.openbsd.org 2001/06/20 13:56:39
[channels.c channels.h clientloop.c packet.c serverloop.c]
move from channel_stop_listening to channel_free_all,
call channel_free_all before calling waitpid() in serverloop.
fixes the utmp handling; report from Lutz.Jaenicke@aet.TU-Cottbus.DE
Diffstat (limited to 'clientloop.c')
-rw-r--r-- | clientloop.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/clientloop.c b/clientloop.c index 3a1b43dda..a62a71131 100644 --- a/clientloop.c +++ b/clientloop.c | |||
@@ -59,7 +59,7 @@ | |||
59 | */ | 59 | */ |
60 | 60 | ||
61 | #include "includes.h" | 61 | #include "includes.h" |
62 | RCSID("$OpenBSD: clientloop.c,v 1.75 2001/06/04 23:07:20 markus Exp $"); | 62 | RCSID("$OpenBSD: clientloop.c,v 1.76 2001/06/20 13:56:39 markus Exp $"); |
63 | 63 | ||
64 | #include "ssh.h" | 64 | #include "ssh.h" |
65 | #include "ssh1.h" | 65 | #include "ssh1.h" |
@@ -546,7 +546,7 @@ process_escapes(Buffer *bin, Buffer *bout, Buffer *berr, char *buf, int len) | |||
546 | leave_raw_mode(); | 546 | leave_raw_mode(); |
547 | 547 | ||
548 | /* Stop listening for new connections. */ | 548 | /* Stop listening for new connections. */ |
549 | channel_stop_listening(); | 549 | channel_close_all(); /* proto1 only XXXX */ |
550 | 550 | ||
551 | printf("%c& [backgrounded]\n", escape_char); | 551 | printf("%c& [backgrounded]\n", escape_char); |
552 | 552 | ||
@@ -926,8 +926,7 @@ client_loop(int have_pty, int escape_char_arg, int ssh2_chan_id) | |||
926 | if (have_pty) | 926 | if (have_pty) |
927 | signal(SIGWINCH, SIG_DFL); | 927 | signal(SIGWINCH, SIG_DFL); |
928 | 928 | ||
929 | /* Stop listening for connections. */ | 929 | channel_free_all(); |
930 | channel_stop_listening(); | ||
931 | 930 | ||
932 | if (have_pty) | 931 | if (have_pty) |
933 | leave_raw_mode(); | 932 | leave_raw_mode(); |