diff options
author | Damien Miller <djm@mindrot.org> | 2003-05-14 13:45:42 +1000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2003-05-14 13:45:42 +1000 |
commit | b1ca8bb159bba7cedebe8fa467bf29e4ab1a65be (patch) | |
tree | bfd881a8f80929bb17f02aafe58e275bacfeb0de /clientloop.c | |
parent | db2747259c1a433a504085f733768d0d209eb50d (diff) |
- markus@cvs.openbsd.org 2003/05/11 20:30:25
[channels.c clientloop.c serverloop.c session.c ssh.c]
make channel_new() strdup the 'remote_name' (not the caller); ok theo
Diffstat (limited to 'clientloop.c')
-rw-r--r-- | clientloop.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/clientloop.c b/clientloop.c index e4ef71632..e5270aa57 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.109 2003/04/08 20:21:28 itojun Exp $"); | 62 | RCSID("$OpenBSD: clientloop.c,v 1.110 2003/05/11 20:30:24 markus Exp $"); |
63 | 63 | ||
64 | #include "ssh.h" | 64 | #include "ssh.h" |
65 | #include "ssh1.h" | 65 | #include "ssh1.h" |
@@ -1145,7 +1145,7 @@ client_request_forwarded_tcpip(const char *request_type, int rchan) | |||
1145 | c = channel_new("forwarded-tcpip", | 1145 | c = channel_new("forwarded-tcpip", |
1146 | SSH_CHANNEL_CONNECTING, sock, sock, -1, | 1146 | SSH_CHANNEL_CONNECTING, sock, sock, -1, |
1147 | CHAN_TCP_WINDOW_DEFAULT, CHAN_TCP_WINDOW_DEFAULT, 0, | 1147 | CHAN_TCP_WINDOW_DEFAULT, CHAN_TCP_WINDOW_DEFAULT, 0, |
1148 | xstrdup(originator_address), 1); | 1148 | originator_address, 1); |
1149 | xfree(originator_address); | 1149 | xfree(originator_address); |
1150 | xfree(listen_address); | 1150 | xfree(listen_address); |
1151 | return c; | 1151 | return c; |
@@ -1181,8 +1181,7 @@ client_request_x11(const char *request_type, int rchan) | |||
1181 | return NULL; | 1181 | return NULL; |
1182 | c = channel_new("x11", | 1182 | c = channel_new("x11", |
1183 | SSH_CHANNEL_X11_OPEN, sock, sock, -1, | 1183 | SSH_CHANNEL_X11_OPEN, sock, sock, -1, |
1184 | CHAN_TCP_WINDOW_DEFAULT, CHAN_X11_PACKET_DEFAULT, 0, | 1184 | CHAN_TCP_WINDOW_DEFAULT, CHAN_X11_PACKET_DEFAULT, 0, "x11", 1); |
1185 | xstrdup("x11"), 1); | ||
1186 | c->force_drain = 1; | 1185 | c->force_drain = 1; |
1187 | return c; | 1186 | return c; |
1188 | } | 1187 | } |
@@ -1204,7 +1203,7 @@ client_request_agent(const char *request_type, int rchan) | |||
1204 | c = channel_new("authentication agent connection", | 1203 | c = channel_new("authentication agent connection", |
1205 | SSH_CHANNEL_OPEN, sock, sock, -1, | 1204 | SSH_CHANNEL_OPEN, sock, sock, -1, |
1206 | CHAN_X11_WINDOW_DEFAULT, CHAN_TCP_WINDOW_DEFAULT, 0, | 1205 | CHAN_X11_WINDOW_DEFAULT, CHAN_TCP_WINDOW_DEFAULT, 0, |
1207 | xstrdup("authentication agent connection"), 1); | 1206 | "authentication agent connection", 1); |
1208 | c->force_drain = 1; | 1207 | c->force_drain = 1; |
1209 | return c; | 1208 | return c; |
1210 | } | 1209 | } |