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 /clientloop.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 'clientloop.c')
-rw-r--r-- | clientloop.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/clientloop.c b/clientloop.c index 7b7349bd7..c19b01f19 100644 --- a/clientloop.c +++ b/clientloop.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: clientloop.c,v 1.235 2011/06/17 21:57:25 djm Exp $ */ | 1 | /* $OpenBSD: clientloop.c,v 1.236 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 |
@@ -174,7 +174,6 @@ struct escape_filter_ctx { | |||
174 | }; | 174 | }; |
175 | 175 | ||
176 | /* Context for channel confirmation replies */ | 176 | /* Context for channel confirmation replies */ |
177 | enum confirm_action { CONFIRM_WARN = 0, CONFIRM_CLOSE, CONFIRM_TTY }; | ||
178 | struct channel_reply_ctx { | 177 | struct channel_reply_ctx { |
179 | const char *request_type; | 178 | const char *request_type; |
180 | int id; | 179 | int id; |
@@ -801,7 +800,7 @@ client_abandon_status_confirm(Channel *c, void *ctx) | |||
801 | xfree(ctx); | 800 | xfree(ctx); |
802 | } | 801 | } |
803 | 802 | ||
804 | static void | 803 | void |
805 | client_expect_confirm(int id, const char *request, | 804 | client_expect_confirm(int id, const char *request, |
806 | enum confirm_action action) | 805 | enum confirm_action action) |
807 | { | 806 | { |