merge 6.0p1

1 files changed, 2 insertions, 1 deletions

diff --git a/readconf.c b/readconf.c
index 60befde59..99c04a9de 100644
--- a/readconf.c
+++ b/readconf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: readconf.c,v 1.193 2011/05/24 07:15:47 djm Exp $ */
+/* $OpenBSD: readconf.c,v 1.194 2011/09/23 07:45:05 markus Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -305,6 +305,7 @@ add_remote_forward(Options *options, const Forward *newfwd)
         fwd->listen_port = newfwd->listen_port;
         fwd->connect_host = newfwd->connect_host;
         fwd->connect_port = newfwd->connect_port;
+        fwd->handle = newfwd->handle;
         fwd->allocated_port = 0;
 }