diff options
| author | djm <djm> | 2014-07-03 11:23:01 +0000 |
|---|---|---|
| committer | djm <djm> | 2014-07-03 11:23:01 +0000 |
| commit | 5ed9247e798d9007db01c7cc020a75379f86eb18 (patch) | |
| tree | 145ef9d2682ad1bdb1aa08b70b06579088af9d88 | |
| parent | c196d859c722a22608fe91f5b931ed3a675b4c53 (diff) | |
| download | openssh-5ed9247e798d9007db01c7cc020a75379f86eb18.tar.gz | |
- djm@cvs.openbsd.org 2014/07/03 03:15:01
[ssh-add.c]
make stdout line-buffered; saves partial output getting lost when
ssh-add fatal()s part-way through (e.g. when listing keys from an
agent that supports key types that ssh-add doesn't);
bz#2234, reported by Phil Pennock
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | ssh-add.c | 4 |
2 files changed, 9 insertions, 1 deletions
@@ -14,6 +14,12 @@ subprocesses it may have started (e.g. forked askpass). Fixes agent sockets being zapped when askpass processes fatal(); bz#2236 patch from Dmitry V. Levin + - djm@cvs.openbsd.org 2014/07/03 03:15:01 + [ssh-add.c] + make stdout line-buffered; saves partial output getting lost when + ssh-add fatal()s part-way through (e.g. when listing keys from an + agent that supports key types that ssh-add doesn't); + bz#2234, reported by Phil Pennock 20140702 - OpenBSD CVS Sync @@ -1,4 +1,4 @@ -/* $OpenBSD: ssh-add.c,v 1.111 2014/06/27 18:50:39 markus Exp $ */ +/* $OpenBSD: ssh-add.c,v 1.112 2014/07/03 03:15:01 djm Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -437,6 +437,8 @@ main(int argc, char **argv) OpenSSL_add_all_algorithms(); + setlinebuf(stdout); + /* At first, get a connection to the authentication agent. */ ac = ssh_get_authentication_connection(); if (ac == NULL) { |