upstream commit

obliterate ssh1.h and some dead code that used it

ok markus@

Upstream-ID: 1ca9159a9fb95618f9d51e069ac8e1131a087343

1 files changed, 1 insertions, 9 deletions

diff --git a/channels.h b/channels.h
index 77ec4f966..4e9b77de1 100644
--- a/channels.h
+++ b/channels.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: channels.h,v 1.122 2017/04/30 23:13:25 djm Exp $ */
+/* $OpenBSD: channels.h,v 1.123 2017/04/30 23:28:41 djm Exp $ */
 
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -238,7 +238,6 @@ int	 channel_proxy_upstream(Channel *, int, u_int32_t, void *);
 
 /* protocol handler */
 
-int      channel_input_close(int, u_int32_t, void *);
 int      channel_input_close_confirmation(int, u_int32_t, void *);
 int      channel_input_data(int, u_int32_t, void *);
 int      channel_input_extended_data(int, u_int32_t, void *);
@@ -246,7 +245,6 @@ int	 channel_input_ieof(int, u_int32_t, void *);
 int      channel_input_oclose(int, u_int32_t, void *);
 int      channel_input_open_confirmation(int, u_int32_t, void *);
 int      channel_input_open_failure(int, u_int32_t, void *);
-int      channel_input_port_open(int, u_int32_t, void *);
 int      channel_input_window_adjust(int, u_int32_t, void *);
 int      channel_input_status_confirm(int, u_int32_t, void *);
 
@@ -295,14 +293,8 @@ int	 permitopen_port(const char *);
 void     channel_set_x11_refuse_time(u_int);
 int      x11_connect_display(void);
 int      x11_create_display_inet(int, int, int, u_int *, int **);
-int      x11_input_open(int, u_int32_t, void *);
 void     x11_request_forwarding_with_spoofing(int, const char *, const char *,
              const char *, int);
-int      deny_input_open(int, u_int32_t, void *);
-
-/* agent forwarding */
-
-void     auth_request_forwarding(void);
 
 /* channel close */