diff options
author | Ben Lindstrom <mouring@eviladmin.org> | 2000-12-06 01:42:49 +0000 |
---|---|---|
committer | Ben Lindstrom <mouring@eviladmin.org> | 2000-12-06 01:42:49 +0000 |
commit | 7ad971033417ac7d0fc49ccba89f70b3dec93b64 (patch) | |
tree | 9aca8f04c1d545d057185fc7675c554c1d92a216 /serverloop.c | |
parent | 3c51676a565badf61cb30def91d7a910e8ae41b7 (diff) |
20001206
- (bal) OpenSSH CVS updates:
- markus@cvs.openbsd.org 2000/12/05 20:34:09
[channels.c channels.h clientloop.c serverloop.c]
async connects for -R/-L; ok deraadt@
- todd@cvs.openssh.org 2000/12/05 16:47:28
[sshd.c]
tweak comment to reflect real location of pid file; ok provos@
Diffstat (limited to 'serverloop.c')
-rw-r--r-- | serverloop.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/serverloop.c b/serverloop.c index d1816b52c..79ef3607b 100644 --- a/serverloop.c +++ b/serverloop.c | |||
@@ -35,7 +35,7 @@ | |||
35 | */ | 35 | */ |
36 | 36 | ||
37 | #include "includes.h" | 37 | #include "includes.h" |
38 | RCSID("$OpenBSD: serverloop.c,v 1.35 2000/11/06 23:04:56 markus Exp $"); | 38 | RCSID("$OpenBSD: serverloop.c,v 1.36 2000/12/05 20:34:10 markus Exp $"); |
39 | 39 | ||
40 | #include "xmalloc.h" | 40 | #include "xmalloc.h" |
41 | #include "ssh.h" | 41 | #include "ssh.h" |
@@ -750,7 +750,7 @@ server_request_direct_tcpip(char *ctype) | |||
750 | xfree(originator); | 750 | xfree(originator); |
751 | if (sock < 0) | 751 | if (sock < 0) |
752 | return NULL; | 752 | return NULL; |
753 | newch = channel_new(ctype, SSH_CHANNEL_OPEN, | 753 | newch = channel_new(ctype, SSH_CHANNEL_CONNECTING, |
754 | sock, sock, -1, CHAN_TCP_WINDOW_DEFAULT, | 754 | sock, sock, -1, CHAN_TCP_WINDOW_DEFAULT, |
755 | CHAN_TCP_PACKET_DEFAULT, 0, xstrdup("direct-tcpip"), 1); | 755 | CHAN_TCP_PACKET_DEFAULT, 0, xstrdup("direct-tcpip"), 1); |
756 | return (newch >= 0) ? channel_lookup(newch) : NULL; | 756 | return (newch >= 0) ? channel_lookup(newch) : NULL; |