diff options
author | Damien Miller <djm@mindrot.org> | 2011-06-23 08:31:57 +1000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2011-06-23 08:31:57 +1000 |
commit | 6d7b4377dd740a215ded149b5ffbc871ba7891f8 (patch) | |
tree | dbde34093e0e630dbaf229294855b2bee108b039 /ssh.c | |
parent | 69ff1df952eebf0489b775a60ede094eaf596a05 (diff) |
- djm@cvs.openbsd.org 2011/06/22 22:08:42
[channels.c channels.h clientloop.c clientloop.h mux.c ssh.c]
hook up a channel confirm callback to warn the user then requested X11
forwarding was refused by the server; ok markus@
Diffstat (limited to 'ssh.c')
-rw-r--r-- | ssh.c | 12 |
1 files changed, 7 insertions, 5 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssh.c,v 1.362 2011/06/03 00:54:38 djm Exp $ */ | 1 | /* $OpenBSD: ssh.c,v 1.363 2011/06/22 22:08:42 djm Exp $ */ |
2 | /* | 2 | /* |
3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland | 4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland |
@@ -1239,8 +1239,8 @@ ssh_session(void) | |||
1239 | /* Request forwarding with authentication spoofing. */ | 1239 | /* Request forwarding with authentication spoofing. */ |
1240 | debug("Requesting X11 forwarding with authentication " | 1240 | debug("Requesting X11 forwarding with authentication " |
1241 | "spoofing."); | 1241 | "spoofing."); |
1242 | x11_request_forwarding_with_spoofing(0, display, proto, data); | 1242 | x11_request_forwarding_with_spoofing(0, display, proto, |
1243 | 1243 | data, 0); | |
1244 | /* Read response from the server. */ | 1244 | /* Read response from the server. */ |
1245 | type = packet_read(); | 1245 | type = packet_read(); |
1246 | if (type == SSH_SMSG_SUCCESS) { | 1246 | if (type == SSH_SMSG_SUCCESS) { |
@@ -1338,9 +1338,11 @@ ssh_session2_setup(int id, int success, void *arg) | |||
1338 | /* Request forwarding with authentication spoofing. */ | 1338 | /* Request forwarding with authentication spoofing. */ |
1339 | debug("Requesting X11 forwarding with authentication " | 1339 | debug("Requesting X11 forwarding with authentication " |
1340 | "spoofing."); | 1340 | "spoofing."); |
1341 | x11_request_forwarding_with_spoofing(id, display, proto, data); | 1341 | x11_request_forwarding_with_spoofing(id, display, proto, |
1342 | data, 1); | ||
1343 | client_expect_confirm(id, "X11 forwarding", CONFIRM_WARN); | ||
1344 | /* XXX exit_on_forward_failure */ | ||
1342 | interactive = 1; | 1345 | interactive = 1; |
1343 | /* XXX wait for reply */ | ||
1344 | } | 1346 | } |
1345 | 1347 | ||
1346 | check_agent_present(); | 1348 | check_agent_present(); |