diff options
author | Colin Watson <cjwatson@debian.org> | 2012-05-18 12:16:05 +0100 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2012-05-18 12:16:05 +0100 |
commit | dabbdfacc9f6995b0739772a47704186dcf34ea5 (patch) | |
tree | 0a0b306a637bc85eb719261b74884f0b9573ec41 /readconf.c | |
parent | 1e0d51b642cac9a6bfb719e6320905625aa5f943 (diff) | |
parent | dd5ed53e20d218607260916a6b04d1c8c5b3d88f (diff) |
* New upstream release (http://www.openssh.org/txt/release-6.0).
- Fix IPQoS not being set on non-mapped v4-in-v6 addressed connections
(closes: #643312, #650512).
- Add a new privilege separation sandbox implementation for Linux's new
seccomp sandbox, automatically enabled on platforms that support it.
(Note: privilege separation sandboxing is still experimental.)
Diffstat (limited to 'readconf.c')
-rw-r--r-- | readconf.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/readconf.c b/readconf.c index 7a26e923b..a34cbe707 100644 --- a/readconf.c +++ b/readconf.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: readconf.c,v 1.193 2011/05/24 07:15:47 djm Exp $ */ | 1 | /* $OpenBSD: readconf.c,v 1.194 2011/09/23 07:45:05 markus Exp $ */ |
2 | /* | 2 | /* |
3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland | 4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland |
@@ -312,6 +312,7 @@ add_remote_forward(Options *options, const Forward *newfwd) | |||
312 | fwd->listen_port = newfwd->listen_port; | 312 | fwd->listen_port = newfwd->listen_port; |
313 | fwd->connect_host = newfwd->connect_host; | 313 | fwd->connect_host = newfwd->connect_host; |
314 | fwd->connect_port = newfwd->connect_port; | 314 | fwd->connect_port = newfwd->connect_port; |
315 | fwd->handle = newfwd->handle; | ||
315 | fwd->allocated_port = 0; | 316 | fwd->allocated_port = 0; |
316 | } | 317 | } |
317 | 318 | ||