diff options
| author | Damien Miller <djm@mindrot.org> | 2002-02-08 22:07:16 +1100 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2002-02-08 22:07:16 +1100 |
| commit | 699d003e3a7cddaa1dddc4c1a35428066316748e (patch) | |
| tree | c6b2ebee5588be70e0b3f12a3be7b4eec621ea02 /serverloop.c | |
| parent | f3dcf1fc88a55a916ace325e252c6f75ff53b71b (diff) | |
| download | openssh-git-699d003e3a7cddaa1dddc4c1a35428066316748e.tar.gz | |
- markus@cvs.openbsd.org 2002/02/06 14:55:16
[channels.c clientloop.c serverloop.c ssh.c]
channel_new never returns NULL, mouring@; ok djm@
Diffstat (limited to 'serverloop.c')
| -rw-r--r-- | serverloop.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/serverloop.c b/serverloop.c index b8a5f160..46b12ee3 100644 --- a/serverloop.c +++ b/serverloop.c @@ -35,7 +35,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: serverloop.c,v 1.97 2002/02/03 17:53:25 markus Exp $"); +RCSID("$OpenBSD: serverloop.c,v 1.98 2002/02/06 14:55:16 markus Exp $"); #include "xmalloc.h" #include "packet.h" @@ -870,10 +870,6 @@ server_request_direct_tcpip(char *ctype) c = channel_new(ctype, SSH_CHANNEL_CONNECTING, sock, sock, -1, CHAN_TCP_WINDOW_DEFAULT, CHAN_TCP_PACKET_DEFAULT, 0, xstrdup("direct-tcpip"), 1); - if (c == NULL) { - error("server_request_direct_tcpip: channel_new failed"); - close(sock); - } return c; } @@ -893,10 +889,6 @@ server_request_session(char *ctype) c = channel_new(ctype, SSH_CHANNEL_LARVAL, -1, -1, -1, /*window size*/0, CHAN_SES_PACKET_DEFAULT, 0, xstrdup("server-session"), 1); - if (c == NULL) { - error("server_request_session: channel_new failed"); - return NULL; - } if (session_open(xxx_authctxt, c->self) != 1) { debug("session open failed, free channel %d", c->self); channel_free(c); |