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, 1 insertions, 40 deletions

diff --git a/channels.c b/channels.c
index fecd4540e..bef8ad6aa 100644
--- a/channels.c
+++ b/channels.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: channels.c,v 1.355 2016/09/30 20:24:46 djm Exp $ */
+/* $OpenBSD: channels.c,v 1.356 2016/10/18 17:32:54 dtucker Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -3806,45 +3806,6 @@ channel_request_rforward_cancel(struct Forward *fwd)
 }
 
 /*
- * This is called after receiving CHANNEL_FORWARDING_REQUEST.  This initates
- * listening for the port, and sends back a success reply (or disconnect
- * message if there was an error).
- */
-int
-channel_input_port_forward_request(int is_root, struct ForwardOptions *fwd_opts)
-{
-        int success = 0;
-        struct Forward fwd;
-
-        /* Get arguments from the packet. */
-        memset(&fwd, 0, sizeof(fwd));
-        fwd.listen_port = packet_get_int();
-        fwd.connect_host = packet_get_string(NULL);
-        fwd.connect_port = packet_get_int();
-
-#ifndef HAVE_CYGWIN
-        /*
-         * Check that an unprivileged user is not trying to forward a
-         * privileged port.
-         */
-        if (fwd.listen_port < IPPORT_RESERVED && !is_root)
-                packet_disconnect(
-                    "Requested forwarding of port %d but user is not root.",
-                    fwd.listen_port);
-        if (fwd.connect_port == 0)
-                packet_disconnect("Dynamic forwarding denied.");
-#endif
-
-        /* Initiate forwarding */
-        success = channel_setup_local_fwd_listener(&fwd, fwd_opts);
-
-        /* Free the argument string. */
-        free(fwd.connect_host);
-
-        return (success ? 0 : -1);
-}
-
-/*
  * Permits opening to any host/port if permitted_opens[] is empty.  This is
  * usually called by the server, because the user could connect to any port
  * anyway, and the server has no way to know but to trust the client anyway.