upstream commit

Remove channel_input_port_forward_request(); the only caller
was the recently-removed SSH1 server code so it's now dead code.  ok markus@

Upstream-ID: 05453983230a1f439562535fec2818f63f297af9

1 files changed, 16 insertions, 0 deletions

diff --git a/channels.h.rej b/channels.h.rej
new file mode 100644
index 000000000..6e08ec640
--- /dev/null
+++ b/channels.h.rej
@@ -0,0 +1,16 @@
+--- channels.h
++++ channels.h
+@@ -1,4 +1,4 @@
+-/* $OpenBSD: channels.h,v 1.119 2016/09/30 09:19:13 markus Exp $ */
++/* $OpenBSD: channels.h,v 1.120 2016/10/18 17:32:54 dtucker Exp $ */
+ 
+ /*
+  * Author: Tatu Ylonen <ylo@cs.hut.fi>
+@@ -272,7 +272,6 @@ void         channel_update_permitted_opens(int, int);
+ void    channel_clear_permitted_opens(void);
+ void    channel_clear_adm_permitted_opens(void);
+ void    channel_print_adm_permitted_opens(void);
+-int      channel_input_port_forward_request(int, struct ForwardOptions *);
+ Channel        *channel_connect_to_port(const char *, u_short, char *, char *);
+ Channel *channel_connect_to_path(const char *, char *, char *);
+ Channel        *channel_connect_stdio_fwd(const char*, u_short, int, int);