tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- (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@
This commit is contained in:
Damien Miller 2004-06-18 22:20:57 +10:00
parent 6288dc14fc
commit 0809e233a4
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -23,6 +23,11 @@
[multiplex.sh] [multiplex.sh]
Use -S for scp/sftp to force the use of the ssh being tested. Use -S for scp/sftp to force the use of the ssh being tested.
ok djm@,markus@ 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 20040617
- (dtucker) [regress/scp.sh] diff -N is not portable (but needed for some - (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) Trim deprecated options from INSTALL. Mention UsePAM
- (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu - (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 $

10
ssh.c
View File

@ -40,7 +40,7 @@
*/ */
#include "includes.h" #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 <openssl/evp.h> #include <openssl/evp.h>
#include <openssl/err.h> #include <openssl/err.h>
@ -1256,10 +1256,6 @@ control_client(const char *path)
if ((cp = getenv("TERM")) == NULL) if ((cp = getenv("TERM")) == NULL)
cp = ""; cp = "";
signal(SIGINT, control_client_sighandler);
signal(SIGTERM, control_client_sighandler);
signal(SIGWINCH, control_client_sigrelay);
buffer_init(&m); buffer_init(&m);
/* Get PID of controlee */ /* Get PID of controlee */
@ -1302,6 +1298,10 @@ control_client(const char *path)
fatal("%s: master returned error", __func__); fatal("%s: master returned error", __func__);
buffer_free(&m); buffer_free(&m);
signal(SIGINT, control_client_sighandler);
signal(SIGTERM, control_client_sighandler);
signal(SIGWINCH, control_client_sigrelay);
if (tty_flag) if (tty_flag)
enter_raw_mode(); enter_raw_mode();