2 files changed, 9 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index a8074f04a..8100e9745 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+20051220
+ - (dtucker) OpenBSD CVS Sync
+   - reyk@cvs.openbsd.org 2005/12/13 15:03:02
+     [serverloop.c]
+     if forced_tun_device is not set, it is -1 and not SSH_TUNID_ANY
+
 20051219
  - (dtucker) [cipher-aes.c cipher-ctr.c cipher.c configure.ac
    openbsd-compat/openssl-compat.h] Check for and work around broken AES
@@ -3471,4 +3477,4 @@
    - (djm) Trim deprecated options from INSTALL. Mention UsePAM
    - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
 
-$Id: ChangeLog,v 1.4031 2005/12/19 06:40:40 dtucker Exp $
+$Id: ChangeLog,v 1.4032 2005/12/20 05:08:42 dtucker Exp $
diff --git a/serverloop.c b/serverloop.c
index eff27d9d6..a575ce0d1 100644
--- a/serverloop.c
+++ b/serverloop.c
@@ -35,7 +35,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: serverloop.c,v 1.123 2005/12/08 18:34:11 reyk Exp $");
+RCSID("$OpenBSD: serverloop.c,v 1.124 2005/12/13 15:03:02 reyk Exp $");
 
 #include "xmalloc.h"
 #include "packet.h"
@@ -936,7 +936,7 @@ server_request_tun(void)
         }
 
         tun = packet_get_int();
-        if (forced_tun_device != SSH_TUNID_ANY) {
+        if (forced_tun_device != -1) {
                 if (tun != SSH_TUNID_ANY && forced_tun_device != tun)
                         goto done;
                 tun = forced_tun_device;