comparison cli-runopts.c @ 484:effb4a25b1ae

Don't capture stderr from spawned processes in proxycommand mode
author Matt Johnston <matt@ucc.asn.au>
date Wed, 17 Sep 2008 14:35:36 +0000
parents 738313e73b1c
children d59f628e7baa
comparison
equal deleted inserted replaced
483:738313e73b1c 484:effb4a25b1ae
65 "-R <listenport:remotehost:remoteport> Remote port forwarding\n" 65 "-R <listenport:remotehost:remoteport> Remote port forwarding\n"
66 #endif 66 #endif
67 "-W <receive_window_buffer> (default %d, larger may be faster, max 1MB)\n" 67 "-W <receive_window_buffer> (default %d, larger may be faster, max 1MB)\n"
68 "-K <keepalive> (0 is never, default %d)\n" 68 "-K <keepalive> (0 is never, default %d)\n"
69 #ifdef ENABLE_CLI_PROXYCMD 69 #ifdef ENABLE_CLI_PROXYCMD
70 "-J <proxy_program> Use program rather than tcp connection" 70 "-J <proxy_program> Use program rather than tcp connection\n"
71 #endif 71 #endif
72 #ifdef DEBUG_TRACE 72 #ifdef DEBUG_TRACE
73 "-v verbose\n" 73 "-v verbose\n"
74 #endif 74 #endif
75 ,DROPBEAR_VERSION, cli_opts.progname, 75 ,DROPBEAR_VERSION, cli_opts.progname,
295 break; 295 break;
296 } 296 }
297 } 297 }
298 } 298 }
299 299
300 #ifdef ENABLE_CLI_PROXYCMD
301 if (cli_opts.proxycmd != NULL) {
302 /* XXX something more useful */
303 cli_opts.remotehost = cli_opts.proxycmd;
304 cli_opts.remoteport = "";
305 }
306 #endif
307
308 if (cli_opts.remotehost == NULL) { 300 if (cli_opts.remotehost == NULL) {
309 printhelp(); 301 printhelp();
310 exit(EXIT_FAILURE); 302 exit(EXIT_FAILURE);
311 } 303 }
312 304