comparison cli-main.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 c9128994a2d6
comparison
equal deleted inserted replaced
483:738313e73b1c 484:effb4a25b1ae
132 dropbear_exit("Failed to run '%s'\n", cmd); 132 dropbear_exit("Failed to run '%s'\n", cmd);
133 } 133 }
134 134
135 static void cli_proxy_cmd(int *sock_in, int *sock_out) { 135 static void cli_proxy_cmd(int *sock_in, int *sock_out) {
136 int ret; 136 int ret;
137 int errfd;
138 pid_t pid;
139 137
140 fill_passwd(cli_opts.own_user); 138 fill_passwd(cli_opts.own_user);
141 139
142 ret = spawn_command(exec_proxy_cmd, cli_opts.proxycmd, 140 ret = spawn_command(exec_proxy_cmd, cli_opts.proxycmd,
143 sock_out, sock_in, &errfd, &pid); 141 sock_out, sock_in, NULL, NULL);
144 if (ret == DROPBEAR_FAILURE) { 142 if (ret == DROPBEAR_FAILURE) {
145 dropbear_exit("Failed running proxy command"); 143 dropbear_exit("Failed running proxy command");
146 *sock_in = *sock_out = -1; 144 *sock_in = *sock_out = -1;
147 } 145 }
148 } 146 }