summaryrefslogtreecommitdiff
path: root/clientloop.c
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2002-02-08 22:07:16 +1100
committerDamien Miller <djm@mindrot.org>2002-02-08 22:07:16 +1100
commit699d003e3a7cddaa1dddc4c1a35428066316748e (patch)
treec6b2ebee5588be70e0b3f12a3be7b4eec621ea02 /clientloop.c
parentf3dcf1fc88a55a916ace325e252c6f75ff53b71b (diff)
- 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 'clientloop.c')
-rw-r--r--clientloop.c14
1 files changed, 1 insertions, 13 deletions
diff --git a/clientloop.c b/clientloop.c
index 1b9c28e9..65a6682a 100644
--- a/clientloop.c
+++ b/clientloop.c
@@ -59,7 +59,7 @@
*/
#include "includes.h"
-RCSID("$OpenBSD: clientloop.c,v 1.95 2002/01/10 11:24:04 markus Exp $");
+RCSID("$OpenBSD: clientloop.c,v 1.96 2002/02/06 14:55:15 markus Exp $");
#include "ssh.h"
#include "ssh1.h"
@@ -1072,10 +1072,6 @@ client_request_forwarded_tcpip(const char *request_type, int rchan)
SSH_CHANNEL_CONNECTING, sock, sock, -1,
CHAN_TCP_WINDOW_DEFAULT, CHAN_TCP_WINDOW_DEFAULT, 0,
xstrdup(originator_address), 1);
- if (c == NULL) {
- error("client_request_forwarded_tcpip: channel_new failed");
- close(sock);
- }
xfree(originator_address);
xfree(listen_address);
return c;
@@ -1113,10 +1109,6 @@ client_request_x11(const char *request_type, int rchan)
SSH_CHANNEL_X11_OPEN, sock, sock, -1,
CHAN_TCP_WINDOW_DEFAULT, CHAN_X11_PACKET_DEFAULT, 0,
xstrdup("x11"), 1);
- if (c == NULL) {
- error("client_request_x11: channel_new failed");
- close(sock);
- }
c->force_drain = 1;
return c;
}
@@ -1139,10 +1131,6 @@ client_request_agent(const char *request_type, int rchan)
SSH_CHANNEL_OPEN, sock, sock, -1,
CHAN_X11_WINDOW_DEFAULT, CHAN_TCP_WINDOW_DEFAULT, 0,
xstrdup("authentication agent connection"), 1);
- if (c == NULL) {
- error("client_request_agent: channel_new failed");
- close(sock);
- }
c->force_drain = 1;
return c;
}