summaryrefslogtreecommitdiffhomepage
path: root/options.h
diff options
context:
space:
mode:
authorMatt Johnston <matt@ucc.asn.au>2005-06-02 16:21:58 +0000
committerMatt Johnston <matt@ucc.asn.au>2005-06-02 16:21:58 +0000
commitd92ca4d9d11d3beb8268c5186f45f276dd26e354 (patch)
tree6c59309632d34a5e17b306d5ace63298e9f52a31 /options.h
parent3d580258052a7c1a117e91782483a95ad8771ff9 (diff)
parent83f6c8cddb2a3efd6e99cb2ddc3d1fb4e1de1338 (diff)
merge of 72b0db220b7fc6b4fb6079d6b82c843186bab5a7
and feb4fdd2cc17783a3cd158d06be59a57382b398d --HG-- extra : convert_revision : afb17b22815dff550c33fc158fcf0f6233b6d330
Diffstat (limited to 'options.h')
-rw-r--r--options.h11
1 files changed, 2 insertions, 9 deletions
diff --git a/options.h b/options.h
index 8fc1109..d75ee09 100644
--- a/options.h
+++ b/options.h
@@ -313,14 +313,6 @@ etc) slower (perhaps by 50%). Recommended for most small systems. */
#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 @@ etc) slower (perhaps by 50%). Recommended for most small systems. */
#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