src/usr.bin/ssh/ssh.c - diff

Return to ssh.c CVS log

Up to [local] / src / usr.bin / ssh

version 1.352, 2010/09/20 04:41:47

version 1.353, 2010/10/06 06:39:28

Line 174

/* # of replies received for global requests */

static int remote_forward_confirms_received = 0;

/* pid of proxycommand child process */

pid_t proxy_command_pid = 0;

/* mux.c */

extern int muxserver_sock;

extern u_int muxclient_command;

Line 883

Line 880

if (options.control_path != NULL && muxserver_sock != -1)

unlink(options.control_path);

/* Kill ProxyCommand if it is running. */

* Send SIGHUP to proxy command if used. We don't wait() in

ssh_kill_proxy_command();

* case it hangs and instead rely on init to reap the child

if (proxy_command_pid > 1)

kill(proxy_command_pid, SIGHUP);

return exit_status;

}