From 0809e233a42d1818f3494581024e4ad1486e39be Mon Sep 17 00:00:00 2001 From: Damien Miller Date: Fri, 18 Jun 2004 22:20:57 +1000 Subject: - (djm) OpenBSD CVS Sync - djm@cvs.openbsd.org 2004/06/18 10:40:19 [ssh.c] delay signal handler setup until we have finished talking to the master. allow interrupting of setup (e.g. if master is stuck); ok markus@ --- ChangeLog | 7 ++++++- ssh.c | 10 +++++----- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index cd2fc1951..56237e3de 100644 --- a/ChangeLog +++ b/ChangeLog @@ -23,6 +23,11 @@ [multiplex.sh] Use -S for scp/sftp to force the use of the ssh being tested. ok djm@,markus@ + - (djm) OpenBSD CVS Sync + - djm@cvs.openbsd.org 2004/06/18 10:40:19 + [ssh.c] + delay signal handler setup until we have finished talking to the master. + allow interrupting of setup (e.g. if master is stuck); ok markus@ 20040617 - (dtucker) [regress/scp.sh] diff -N is not portable (but needed for some @@ -1296,4 +1301,4 @@ - (djm) Trim deprecated options from INSTALL. Mention UsePAM - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu -$Id: ChangeLog,v 1.3411 2004/06/18 06:25:35 dtucker Exp $ +$Id: ChangeLog,v 1.3412 2004/06/18 12:20:57 djm Exp $ diff --git a/ssh.c b/ssh.c index 16284f824..89b038198 100644 --- a/ssh.c +++ b/ssh.c @@ -40,7 +40,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: ssh.c,v 1.217 2004/06/17 23:56:57 djm Exp $"); +RCSID("$OpenBSD: ssh.c,v 1.218 2004/06/18 10:40:19 djm Exp $"); #include #include @@ -1256,10 +1256,6 @@ control_client(const char *path) if ((cp = getenv("TERM")) == NULL) cp = ""; - signal(SIGINT, control_client_sighandler); - signal(SIGTERM, control_client_sighandler); - signal(SIGWINCH, control_client_sigrelay); - buffer_init(&m); /* Get PID of controlee */ @@ -1302,6 +1298,10 @@ control_client(const char *path) fatal("%s: master returned error", __func__); buffer_free(&m); + signal(SIGINT, control_client_sighandler); + signal(SIGTERM, control_client_sighandler); + signal(SIGWINCH, control_client_sigrelay); + if (tty_flag) enter_raw_mode(); -- cgit v1.2.3