Mercurial > dropbear

changeset 207:85cc531f711e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge of 72b0db220b7fc6b4fb6079d6b82c843186bab5a7 and feb4fdd2cc17783a3cd158d06be59a57382b398d
author Matt Johnston <matt@ucc.asn.au>
date Thu, 02 Jun 2005 16:21:58 +0000
parents 3924393e2456 (current diff) 0d56e4b80dfb (diff)
children 1a52846ec11f
files
diffstat 1 files changed, 2 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- 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