From: mouring <mouring>
Date: Mon, 19 Mar 2001 00:13:46 +0000 (+0000)
Subject:    - markus@cvs.openbsd.org 2001/03/18 12:07:52
X-Git-Tag: V_2_5_2_P1~19
X-Git-Url: http://andersk.mit.edu/gitweb/openssh.git/commitdiff_plain/b1ed831300d074e1964992e1e43102842e778adf

   - 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 222f81e8..7e9c613b 100644
--- 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 7ce1e4b0..443f5414 100644
--- 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;
 		}