summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--auth-options.c5
2 files changed, 8 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index d06c89689..62f7b1186 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,10 @@
2 - (djm) Seed PRNG at startup, rather than waiting for arc4random calls to 2 - (djm) Seed PRNG at startup, rather than waiting for arc4random calls to
3 do it implicitly. 3 do it implicitly.
4 - (djm) Add getusershell() functions from OpenBSD CVS 4 - (djm) Add getusershell() functions from OpenBSD CVS
5 - OpenBSD CVS Sync
6 - markus@cvs.openbsd.org 2001/03/18 12:07:52
7 [auth-options.c]
8 ignore permitopen="host:port" if AllowTcpForwarding==no
5 9
620010318 1020010318
7 - (bal) Fixed scp type casing issue which causes "scp: protocol error: 11 - (bal) Fixed scp type casing issue which causes "scp: protocol error:
@@ -4601,4 +4605,4 @@
4601 - Wrote replacements for strlcpy and mkdtemp 4605 - Wrote replacements for strlcpy and mkdtemp
4602 - Released 1.0pre1 4606 - Released 1.0pre1
4603 4607
4604$Id: ChangeLog,v 1.973 2001/03/18 23:09:27 djm Exp $ 4608$Id: ChangeLog,v 1.974 2001/03/19 00:13:46 mouring Exp $
diff --git a/auth-options.c b/auth-options.c
index 7ce1e4b0c..443f5414a 100644
--- a/auth-options.c
+++ b/auth-options.c
@@ -10,7 +10,7 @@
10 */ 10 */
11 11
12#include "includes.h" 12#include "includes.h"
13RCSID("$OpenBSD: auth-options.c,v 1.15 2001/03/16 19:06:28 markus Exp $"); 13RCSID("$OpenBSD: auth-options.c,v 1.16 2001/03/18 12:07:52 markus Exp $");
14 14
15#include "packet.h" 15#include "packet.h"
16#include "xmalloc.h" 16#include "xmalloc.h"
@@ -268,7 +268,8 @@ auth_parse_options(struct passwd *pw, char *opts, char *file, u_long linenum)
268 xfree(patterns); 268 xfree(patterns);
269 goto bad_option; 269 goto bad_option;
270 } 270 }
271 channel_add_permitted_opens(patterns, port); 271 if (options.allow_tcp_forwarding)
272 channel_add_permitted_opens(patterns, port);
272 xfree(patterns); 273 xfree(patterns);
273 goto next_option; 274 goto next_option;
274 } 275 }