merge of 72b0db220b7fc6b4fb6079d6b82c843186bab5a7

and feb4fdd2cc17783a3cd158d06be59a57382b398d

--HG--
extra : convert_revision : afb17b22815dff550c33fc158fcf0f6233b6d330
This commit is contained in:
Matt Johnston 2005-06-02 16:21:58 +00:00
commit d92ca4d9d1

View File

@ -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