diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | clientloop.c | 4 |
2 files changed, 7 insertions, 4 deletions
@@ -32,7 +32,10 @@ - djm@cvs.openbsd.org 2004/06/14 01:44:39 [channels.c clientloop.c misc.c misc.h packet.c ssh-agent.c ssh-keyscan.c] [sshd.c] - set_nonblock() instead of fcntl(...,O_NONBLOCK); "looks sane" deraadt@ + set_nonblock() instead of fnctl(...,O_NONBLOCK); "looks sane" deraadt@ + - djm@cvs.openbsd.org 2004/06/15 05:45:04 + [clientloop.c] + missed one unset_nonblock; spotted by Tim Rice - (djm) Fix Makefile.in for connection sharing changes - (djm) [ssh.c] Use separate var for address length @@ -1219,4 +1222,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.3386 2004/06/15 04:25:33 tim Exp $ +$Id: ChangeLog,v 1.3387 2004/06/15 05:47:51 djm Exp $ diff --git a/clientloop.c b/clientloop.c index eada5603..6b849a91 100644 --- a/clientloop.c +++ b/clientloop.c @@ -59,7 +59,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: clientloop.c,v 1.124 2004/06/14 01:44:38 djm Exp $"); +RCSID("$OpenBSD: clientloop.c,v 1.125 2004/06/15 05:45:04 djm Exp $"); #include "ssh.h" #include "ssh1.h" @@ -156,7 +156,7 @@ static void leave_non_blocking(void) { if (in_non_blocking_mode) { - (void) fcntl(fileno(stdin), F_SETFL, 0); + unset_nonblock(fileno(stdin)); in_non_blocking_mode = 0; } } |