summaryrefslogtreecommitdiffstats
path: root/auth-options.c
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2012-12-02 23:50:54 +0100
committerDamien Miller <djm@mindrot.org>2012-12-02 23:50:54 +0100
commitaa5b3f831417bac9538d2b6f21d55fef278e8926 (patch)
treedfaa5a58efa8195f1f72761fb9e2ba4fad7021b4 /auth-options.c
parent - djm@cvs.openbsd.org 2012/12/02 20:42:15 (diff)
downloadopenssh-aa5b3f831417bac9538d2b6f21d55fef278e8926.tar.xz
openssh-aa5b3f831417bac9538d2b6f21d55fef278e8926.zip
- djm@cvs.openbsd.org 2012/12/02 20:46:11
[auth-options.c channels.c servconf.c servconf.h serverloop.c session.c] [sshd_config.5] make AllowTcpForwarding accept "local" and "remote" in addition to its current "yes"/"no" to allow the server to specify whether just local or remote TCP forwarding is enabled. ok markus@
Diffstat (limited to 'auth-options.c')
-rw-r--r--auth-options.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/auth-options.c b/auth-options.c
index 0e67bd8c0..23d0423e1 100644
--- a/auth-options.c
+++ b/auth-options.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: auth-options.c,v 1.56 2011/10/18 04:58:26 djm Exp $ */
+/* $OpenBSD: auth-options.c,v 1.57 2012/12/02 20:46:11 djm Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -349,7 +349,7 @@ auth_parse_options(struct passwd *pw, char *opts, char *file, u_long linenum)
xfree(patterns);
goto bad_option;
}
- if (options.allow_tcp_forwarding)
+ if ((options.allow_tcp_forwarding & FORWARD_LOCAL) != 0)
channel_add_permitted_opens(host, port);
xfree(patterns);
goto next_option;