diff options
Diffstat (limited to 'clientloop.c')
-rw-r--r-- | clientloop.c | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/clientloop.c b/clientloop.c index 1b9c28e9d..65a6682a6 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.95 2002/01/10 11:24:04 markus Exp $"); | 62 | RCSID("$OpenBSD: clientloop.c,v 1.96 2002/02/06 14:55:15 markus Exp $"); |
63 | 63 | ||
64 | #include "ssh.h" | 64 | #include "ssh.h" |
65 | #include "ssh1.h" | 65 | #include "ssh1.h" |
@@ -1072,10 +1072,6 @@ client_request_forwarded_tcpip(const char *request_type, int rchan) | |||
1072 | SSH_CHANNEL_CONNECTING, sock, sock, -1, | 1072 | SSH_CHANNEL_CONNECTING, sock, sock, -1, |
1073 | CHAN_TCP_WINDOW_DEFAULT, CHAN_TCP_WINDOW_DEFAULT, 0, | 1073 | CHAN_TCP_WINDOW_DEFAULT, CHAN_TCP_WINDOW_DEFAULT, 0, |
1074 | xstrdup(originator_address), 1); | 1074 | xstrdup(originator_address), 1); |
1075 | if (c == NULL) { | ||
1076 | error("client_request_forwarded_tcpip: channel_new failed"); | ||
1077 | close(sock); | ||
1078 | } | ||
1079 | xfree(originator_address); | 1075 | xfree(originator_address); |
1080 | xfree(listen_address); | 1076 | xfree(listen_address); |
1081 | return c; | 1077 | return c; |
@@ -1113,10 +1109,6 @@ client_request_x11(const char *request_type, int rchan) | |||
1113 | SSH_CHANNEL_X11_OPEN, sock, sock, -1, | 1109 | SSH_CHANNEL_X11_OPEN, sock, sock, -1, |
1114 | CHAN_TCP_WINDOW_DEFAULT, CHAN_X11_PACKET_DEFAULT, 0, | 1110 | CHAN_TCP_WINDOW_DEFAULT, CHAN_X11_PACKET_DEFAULT, 0, |
1115 | xstrdup("x11"), 1); | 1111 | xstrdup("x11"), 1); |
1116 | if (c == NULL) { | ||
1117 | error("client_request_x11: channel_new failed"); | ||
1118 | close(sock); | ||
1119 | } | ||
1120 | c->force_drain = 1; | 1112 | c->force_drain = 1; |
1121 | return c; | 1113 | return c; |
1122 | } | 1114 | } |
@@ -1139,10 +1131,6 @@ client_request_agent(const char *request_type, int rchan) | |||
1139 | SSH_CHANNEL_OPEN, sock, sock, -1, | 1131 | SSH_CHANNEL_OPEN, sock, sock, -1, |
1140 | CHAN_X11_WINDOW_DEFAULT, CHAN_TCP_WINDOW_DEFAULT, 0, | 1132 | CHAN_X11_WINDOW_DEFAULT, CHAN_TCP_WINDOW_DEFAULT, 0, |
1141 | xstrdup("authentication agent connection"), 1); | 1133 | xstrdup("authentication agent connection"), 1); |
1142 | if (c == NULL) { | ||
1143 | error("client_request_agent: channel_new failed"); | ||
1144 | close(sock); | ||
1145 | } | ||
1146 | c->force_drain = 1; | 1134 | c->force_drain = 1; |
1147 | return c; | 1135 | return c; |
1148 | } | 1136 | } |