- markus@cvs.openbsd.org 2001/03/18 12:07:52

     [auth-options.c]
     ignore permitopen="host:port" if AllowTcpForwarding==no

diff --git a/ChangeLog b/ChangeLog
index 222f81e89e29002e59857175633b210046c3b155..7e9c613b684e3264f0b2e460bafa7f674f29f0df 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,10 @@
  - (djm) Seed PRNG at startup, rather than waiting for arc4random calls to 
    do it implicitly.
  - (djm) Add getusershell() functions from OpenBSD CVS
+ - OpenBSD CVS Sync
+   - markus@cvs.openbsd.org 2001/03/18 12:07:52
+     [auth-options.c]
+     ignore permitopen="host:port" if AllowTcpForwarding==no
 
 20010318
  - (bal) Fixed scp type casing issue which causes "scp: protocol error: 

diff --git a/auth-options.c b/auth-options.c
index 7ce1e4b0c5cc3584ff905055f738fb0c4e71ae0c..443f5414ad1ed1ce76d7599dc21081eedfe8b173 100644 (file)
--- a/auth-options.c
+++ b/auth-options.c
@@ -10,7 +10,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: auth-options.c,v 1.15 2001/03/16 19:06:28 markus Exp $");
+RCSID("$OpenBSD: auth-options.c,v 1.16 2001/03/18 12:07:52 markus Exp $");
 
 #include "packet.h"
 #include "xmalloc.h"
@@ -268,7 +268,8 @@ auth_parse_options(struct passwd *pw, char *opts, char *file, u_long linenum)
                                xfree(patterns);
                                goto bad_option;
                        }
-                       channel_add_permitted_opens(patterns, port);
+                       if (options.allow_tcp_forwarding)
+                               channel_add_permitted_opens(patterns, port);
                        xfree(patterns);
                        goto next_option;
                }