Mercurial > dropbear
diff cli-session.c @ 486:d59f628e7baa
propagate from branch 'au.asn.ucc.matt.dropbear.dbclient-netcat-alike' (head b02ba6628cf2095017c60d202ac630f231e6b553)
to branch 'au.asn.ucc.matt.dropbear' (head 636506b73e973b004cc058b07e6f36a25ff902f8)
| author | Matt Johnston <matt@ucc.asn.au> |
|---|---|
| date | Wed, 17 Sep 2008 14:49:12 +0000 |
| parents | e3db1f7a2e43 12d845ab7b5f |
| children | d588e3ea557a 805e557fdff7 |
line wrap: on
line diff
--- a/cli-session.c Wed Sep 17 14:35:36 2008 +0000 +++ b/cli-session.c Wed Sep 17 14:49:12 2008 +0000 @@ -197,20 +197,6 @@ TRACE(("leave cli_sessionloop: cli_auth_try")) return; - /* - case USERAUTH_SUCCESS_RCVD: - send_msg_service_request(SSH_SERVICE_CONNECTION); - cli_ses.state = SERVICE_CONN_REQ_SENT; - TRACE(("leave cli_sessionloop: sent ssh-connection service req")) - return; - - case SERVICE_CONN_ACCEPT_RCVD: - cli_send_chansess_request(); - TRACE(("leave cli_sessionloop: cli_send_chansess_request")) - cli_ses.state = SESSION_RUNNING; - return; - */ - case USERAUTH_SUCCESS_RCVD: if (cli_opts.backgrounded) { @@ -235,7 +221,13 @@ #ifdef ENABLE_CLI_REMOTETCPFWD setup_remotetcp(); #endif - if (!cli_opts.no_cmd) { + +#ifdef ENABLE_CLI_NETCAT + if (cli_opts.netcat_host) { + cli_send_netcat_request(); + } else +#endif + if (!cli_opts.no_cmd) { cli_send_chansess_request(); } TRACE(("leave cli_sessionloop: running"))