- markus@cvs.openbsd.org 2003/07/02 12:56:34

     [channels.c]
     deny dynamic forwarding with -R for v1, too; ok djm@

diff --git a/ChangeLog b/ChangeLog
index 839d0a6d00ea4f24b3ebd41efaab6219b6fa0f7e..06c3b620fd33c034a87697793b5177b625282d02 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -12,6 +12,9 @@
    - markus@cvs.openbsd.org 2003/06/29 12:44:38
      [sshconnect.c]
      memset 0, not \0; andrushock@korovino.net
+   - markus@cvs.openbsd.org 2003/07/02 12:56:34
+     [channels.c]
+     deny dynamic forwarding with -R for v1, too; ok djm@
 
 20030630
  - (djm) Search for support functions necessary to build our 

diff --git a/channels.c b/channels.c
index 04ef6575c1e8090d401989b16eda483850c46d70..ce07db5c0225c13c6b8df0990be81a9000f82ca9 100644 (file)
--- a/channels.c
+++ b/channels.c
@@ -39,7 +39,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: channels.c,v 1.191 2003/06/24 08:23:46 markus Exp $");
+RCSID("$OpenBSD: channels.c,v 1.192 2003/07/02 12:56:34 markus Exp $");
 
 #include "ssh.h"
 #include "ssh1.h"
@@ -2201,9 +2201,13 @@ channel_input_port_forward_request(int is_root, int gateway_ports)
         * privileged port.
         */
        if (port < IPPORT_RESERVED && !is_root)
-               packet_disconnect("Requested forwarding of port %d but user is not root.",
-                                 port);
+               packet_disconnect(
+                   "Requested forwarding of port %d but user is not root.",
+                   port);
+       if (host_port == 0)
+               packet_disconnect("Dynamic forwarding denied.");
 #endif
+
        /* Initiate forwarding */
        channel_setup_local_fwd_listener(port, hostname, host_port, gateway_ports);