# HG changeset patch
# User Matt Johnston <matt@ucc.asn.au>
# Date 1117729318 0
# Node ID 85cc531f711e4d2a5fe1103308dd0d72917730db
# Parent  3924393e2456a0cd7f8ee3c39a1977c352f8a8ef# Parent  0d56e4b80dfb5dc593918ac88572315f30bb69ed
merge of 72b0db220b7fc6b4fb6079d6b82c843186bab5a7
     and feb4fdd2cc17783a3cd158d06be59a57382b398d

diff -r 3924393e2456 -r 85cc531f711e options.h
--- a/options.h	Fri May 27 16:37:58 2005 +0000
+++ b/options.h	Thu Jun 02 16:21:58 2005 +0000
@@ -313,14 +313,6 @@
 #define DISABLE_AGENTFWD
 #endif
 
-#ifndef ENABLE_LOCALTCPFWD
-#define DISABLE_TCPDIRECT
-#endif
-
-#ifndef ENABLE_REMOTETCPFWD
-#define DISABLE_REMOTETCPFWD
-#endif
-
 #if defined(ENABLE_CLI_REMOTETCPFWD) || defined(ENABLE_CLI_LOCALTCPFWD)
 #define ENABLE_CLI_ANYTCPFWD 
 #endif
@@ -329,7 +321,8 @@
 #define DROPBEAR_TCP_ACCEPT
 #endif
 
-#if defined(ENABLE_REMOTETCPFWD) || defined(ENABLE_LOCALTCPFWD) || \
+#if defined(ENABLE_CLI_REMOTETCPFWD) || defined(ENABLE_CLI_LOCALTCPFWD) || \
+	defined(ENABLE_SVR_REMOTETCPFWD) || defined(ENABLE_SVR_LOCALTCPFWD) || \
 	defined(ENABLE_AGENTFWD) || defined(ENABLE_X11FWD)
 #define USING_LISTENERS
 #endif