merge of '0d7a9127af37d6e74efc5ec031a7001ce63d334d'

and 'e35cd321b6d4fab6ad854827249f610da3bb6878'

--HG--
extra : convert_revision : a0fef159e70c5d1b24d10764066290362965e879
This commit is contained in:
Matt Johnston 2009-08-25 11:11:35 +00:00
commit 0b50010436

View File

@ -381,19 +381,19 @@ static int cli_initchansess(struct Channel *channel) {
#ifdef ENABLE_CLI_NETCAT
void cli_send_netcat_request() {
const unsigned char* source_host = "127.0.0.1";
const int source_port = 22;
const struct ChanType cli_chan_netcat = {
const struct ChanType cli_chan_netcat = {
0, /* sepfds */
"direct-tcpip",
cli_init_stdpipe_sess, /* inithandler */
NULL,
NULL,
cli_closechansess
};
};
void cli_send_netcat_request() {
const unsigned char* source_host = "127.0.0.1";
const int source_port = 22;
cli_opts.wantpty = 0;