summaryrefslogtreecommitdiff
path: root/usr.bin/ssh
diff options
context:
space:
mode:
authorMarkus Friedl <markus@cvs.openbsd.org>2001-03-18 12:07:53 +0000
committerMarkus Friedl <markus@cvs.openbsd.org>2001-03-18 12:07:53 +0000
commit6a2dec3b39835d7252920b8d227caecbf8e99b99 (patch)
tree8c09a694fc0c4860e0c463cacab493cc7f2bea4f /usr.bin/ssh
parent718c23ce74758c0a071e577907e08f7d3645acb0 (diff)
ignore permitopen="host:port" if AllowTcpForwarding==no
Diffstat (limited to 'usr.bin/ssh')
-rw-r--r--usr.bin/ssh/auth-options.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/usr.bin/ssh/auth-options.c b/usr.bin/ssh/auth-options.c
index 7ce1e4b0c5c..443f5414ad1 100644
--- a/usr.bin/ssh/auth-options.c
+++ b/usr.bin/ssh/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;
}