summaryrefslogtreecommitdiffstats
path: root/usr.bin/ssh/ssh-add.c
diff options
context:
space:
mode:
authordjm <djm@openbsd.org>2014-07-03 03:15:01 +0000
committerdjm <djm@openbsd.org>2014-07-03 03:15:01 +0000
commit92ee6295c0dcef561972108f3347bd47f1e7d639 (patch)
tree8f3224e707d14963e026666929263127f7edfc17 /usr.bin/ssh/ssh-add.c
parentOnly cleanup agent socket in the main agent process and not in any (diff)
downloadwireguard-openbsd-92ee6295c0dcef561972108f3347bd47f1e7d639.tar.xz
wireguard-openbsd-92ee6295c0dcef561972108f3347bd47f1e7d639.zip
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
Diffstat (limited to 'usr.bin/ssh/ssh-add.c')
-rw-r--r--usr.bin/ssh/ssh-add.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/usr.bin/ssh/ssh-add.c b/usr.bin/ssh/ssh-add.c
index ece9d2b20f8..9657f2c4f01 100644
--- a/usr.bin/ssh/ssh-add.c
+++ b/usr.bin/ssh/ssh-add.c
@@ -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
@@ -428,6 +428,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) {