diff options
author | Ben Lindstrom <mouring@eviladmin.org> | 2001-04-14 23:08:36 +0000 |
---|---|---|
committer | Ben Lindstrom <mouring@eviladmin.org> | 2001-04-14 23:08:36 +0000 |
commit | d334b2768b80640d3b9aa229332482ae572d08ad (patch) | |
tree | 8395a8661e55575721b040bdf3b570fe398ffc1c | |
parent | da5d9b12256275411e34824a880f8ff471acd0e2 (diff) |
- markus@cvs.openbsd.org 2001/04/14 16:17:14
[channels.c]
remove some channels that are not appropriate for keepalive.
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | channels.c | 10 |
2 files changed, 9 insertions, 6 deletions
@@ -3,6 +3,9 @@ | |||
3 | - deraadt@cvs.openbsd.org 2001/04/14 04:31:01 | 3 | - deraadt@cvs.openbsd.org 2001/04/14 04:31:01 |
4 | [ssh-add.c] | 4 | [ssh-add.c] |
5 | do not double free | 5 | do not double free |
6 | - markus@cvs.openbsd.org 2001/04/14 16:17:14 | ||
7 | [channels.c] | ||
8 | remove some channels that are not appropriate for keepalive. | ||
6 | 9 | ||
7 | 20010414 | 10 | 20010414 |
8 | - Sync with OpenBSD glob.c, strlcat.c and vis.c changes | 11 | - Sync with OpenBSD glob.c, strlcat.c and vis.c changes |
@@ -5069,4 +5072,4 @@ | |||
5069 | - Wrote replacements for strlcpy and mkdtemp | 5072 | - Wrote replacements for strlcpy and mkdtemp |
5070 | - Released 1.0pre1 | 5073 | - Released 1.0pre1 |
5071 | 5074 | ||
5072 | $Id: ChangeLog,v 1.1111 2001/04/14 23:07:16 mouring Exp $ | 5075 | $Id: ChangeLog,v 1.1112 2001/04/14 23:08:36 mouring Exp $ |
diff --git a/channels.c b/channels.c index f4f2c4942..d86cb1f08 100644 --- a/channels.c +++ b/channels.c | |||
@@ -40,7 +40,7 @@ | |||
40 | */ | 40 | */ |
41 | 41 | ||
42 | #include "includes.h" | 42 | #include "includes.h" |
43 | RCSID("$OpenBSD: channels.c,v 1.107 2001/04/13 22:46:52 beck Exp $"); | 43 | RCSID("$OpenBSD: channels.c,v 1.108 2001/04/14 16:17:14 markus Exp $"); |
44 | 44 | ||
45 | #include <openssl/rsa.h> | 45 | #include <openssl/rsa.h> |
46 | #include <openssl/dsa.h> | 46 | #include <openssl/dsa.h> |
@@ -1852,16 +1852,16 @@ channel_find_open() | |||
1852 | for (i = 0; i < channels_alloc; i++) | 1852 | for (i = 0; i < channels_alloc; i++) |
1853 | switch (channels[i].type) { | 1853 | switch (channels[i].type) { |
1854 | case SSH_CHANNEL_CLOSED: | 1854 | case SSH_CHANNEL_CLOSED: |
1855 | continue; | ||
1856 | case SSH_CHANNEL_LARVAL: | ||
1857 | case SSH_CHANNEL_DYNAMIC: | 1855 | case SSH_CHANNEL_DYNAMIC: |
1858 | case SSH_CHANNEL_AUTH_SOCKET: | ||
1859 | case SSH_CHANNEL_CONNECTING: /* XXX ??? */ | ||
1860 | case SSH_CHANNEL_FREE: | 1856 | case SSH_CHANNEL_FREE: |
1861 | case SSH_CHANNEL_X11_LISTENER: | 1857 | case SSH_CHANNEL_X11_LISTENER: |
1862 | case SSH_CHANNEL_PORT_LISTENER: | 1858 | case SSH_CHANNEL_PORT_LISTENER: |
1863 | case SSH_CHANNEL_RPORT_LISTENER: | 1859 | case SSH_CHANNEL_RPORT_LISTENER: |
1864 | case SSH_CHANNEL_OPENING: | 1860 | case SSH_CHANNEL_OPENING: |
1861 | continue; | ||
1862 | case SSH_CHANNEL_LARVAL: | ||
1863 | case SSH_CHANNEL_AUTH_SOCKET: | ||
1864 | case SSH_CHANNEL_CONNECTING: /* XXX ??? */ | ||
1865 | case SSH_CHANNEL_OPEN: | 1865 | case SSH_CHANNEL_OPEN: |
1866 | case SSH_CHANNEL_X11_OPEN: | 1866 | case SSH_CHANNEL_X11_OPEN: |
1867 | return i; | 1867 | return i; |