summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Lindstrom <mouring@eviladmin.org>2001-03-19 00:13:46 +0000
committerBen Lindstrom <mouring@eviladmin.org>2001-03-19 00:13:46 +0000
commit2d70f98220c8aaac29ac6fb47b86750209dacb01 (patch)
treeb690b0a49a4501defe50232b524a392927ef0de0
parent9de61e8c596e1f7e52f780dd87bde2df779b1237 (diff)
- markus@cvs.openbsd.org 2001/03/18 12:07:52
[auth-options.c] ignore permitopen="host:port" if AllowTcpForwarding==no
-rw-r--r--ChangeLog6
-rw-r--r--auth-options.c5
2 files changed, 8 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index d06c8968..62f7b118 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:
@@ -4601,4 +4605,4 @@
- Wrote replacements for strlcpy and mkdtemp
- Released 1.0pre1
-$Id: ChangeLog,v 1.973 2001/03/18 23:09:27 djm Exp $
+$Id: ChangeLog,v 1.974 2001/03/19 00:13:46 mouring Exp $
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;
}