# HG changeset patch
# User Matt Johnston <matt@ucc.asn.au>
# Date 1092318871 0
# Node ID 02e4a7f614f83731c7443c454dc66d6b5f7a63bb
# Parent  efb5e0b335cf39501732be4783555ae4d8a39b81
Oops, forgot to call the actual code.

diff -r efb5e0b335cf -r 02e4a7f614f8 Makefile.in
--- a/Makefile.in	Thu Aug 12 13:48:42 2004 +0000
+++ b/Makefile.in	Thu Aug 12 13:54:31 2004 +0000
@@ -33,7 +33,7 @@
 
 CLISVROBJS=common-session.o packet.o common-algo.o common-kex.o \
 			common-channel.o common-chansession.o termcodes.o loginrec.o \
-			tcp-accept.o tcp-connect.o listener.o process-packet.o \
+			tcp-accept.o listener.o process-packet.o \
 			common-runopts.o
 
 KEYOBJS=dropbearkey.o gendss.o genrsa.o
diff -r efb5e0b335cf -r 02e4a7f614f8 cli-session.c
--- a/cli-session.c	Thu Aug 12 13:48:42 2004 +0000
+++ b/cli-session.c	Thu Aug 12 13:54:31 2004 +0000
@@ -179,9 +179,11 @@
 
 		case USERAUTH_SUCCESS_RCVD:
 #ifdef ENABLE_CLI_LOCALTCPFWD
-			TRACE(("recvd USERAUTH_SUCCESS_RCVD"));
 			setup_localtcp();
 #endif
+#ifdef ENABLE_CLI_REMOTETCPFWD
+			setup_remotetcp();
+#endif
 			cli_send_chansess_request();
 			TRACE(("leave cli_sessionloop: cli_send_chansess_request"));
 			cli_ses.state = SESSION_RUNNING;
diff -r efb5e0b335cf -r 02e4a7f614f8 options.h
--- a/options.h	Thu Aug 12 13:48:42 2004 +0000
+++ b/options.h	Thu Aug 12 13:54:31 2004 +0000
@@ -306,6 +306,10 @@
 #define ENABLE_CLI_ANYTCPFWD 
 #endif
 
+#if defined(ENABLE_CLI_LOCALTCPFWD) || defined(ENABLE_SVR_REMOTETCPFWD)
+#define DROPBEAR_TCP_ACCEPT
+#endif
+
 #if defined(ENABLE_REMOTETCPFWD) || defined(ENABLE_LOCALTCPFWD) || \
 	defined(ENABLE_AGENTFWD) || defined(ENABLE_X11FWD)
 #define USING_LISTENERS
diff -r efb5e0b335cf -r 02e4a7f614f8 tcp-accept.c
--- a/tcp-accept.c	Thu Aug 12 13:48:42 2004 +0000
+++ b/tcp-accept.c	Thu Aug 12 13:54:31 2004 +0000
@@ -8,8 +8,7 @@
 #include "listener.h"
 #include "runopts.h"
 
-#ifndef DISABLE_TCP_ACCEPT
-
+#ifdef DROPBEAR_TCP_ACCEPT
 
 static void cleanup_tcp(struct Listener *listener) {
 
@@ -94,4 +93,4 @@
 	return DROPBEAR_SUCCESS;
 }
 
-#endif /* DISABLE_REMOTETCPFWD */
+#endif /* DROPBEAR_TCP_ACCEPT */