tyler.durden/openssh-portable
1
0
Fork 0
mirror of https://github.com/PowerShell/openssh-portable.git synced 2025-07-28 16:24:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

- djm@cvs.openbsd.org 2010/04/10 00:00:16

Browse Source 
[ssh.c]
     bz#1746 - suppress spurious tty warning when using -O and stdin
     is not a tty; ok dtucker@ markus@
This commit is contained in:
Damien Miller 2010-04-16 15:52:43 +10:00
parent 544378da56
commit deb5a1423a
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -11,6 +11,10 @@
- jmc@cvs.openbsd.org 2010/03/27 14:26:55 - jmc@cvs.openbsd.org 2010/03/27 14:26:55
[ssh_config.5] [ssh_config.5]
tweak previous; ok dtucker tweak previous; ok dtucker
- djm@cvs.openbsd.org 2010/04/10 00:00:16
[ssh.c]
bz#1746 - suppress spurious tty warning when using -O and stdin
is not a tty; ok dtucker@ markus@
20100410 20100410
- (dtucker) [configure.ac] Put the check for the existence of getaddrinfo - (dtucker) [configure.ac] Put the check for the existence of getaddrinfo

4
ssh.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: ssh.c,v 1.335 2010/02/26 20:29:54 djm Exp $ */ /* $OpenBSD: ssh.c,v 1.336 2010/04/10 00:00:16 djm Exp $ */
/* /*
* Author: Tatu Ylonen <ylo@cs.hut.fi> * Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@ -620,7 +620,7 @@ main(int ac, char **av)
tty_flag = 1; tty_flag = 1;
/* Force no tty */ /* Force no tty */
if (no_tty_flag) if (no_tty_flag || muxclient_command != 0)
tty_flag = 0; tty_flag = 0;
/* Do not allocate a tty if stdin is not a tty. */ /* Do not allocate a tty if stdin is not a tty. */
if ((!isatty(fileno(stdin)) || stdin_null_flag) && !force_tty_flag) { if ((!isatty(fileno(stdin)) || stdin_null_flag) && !force_tty_flag) {