diff options
| author | Colin Watson <cjwatson@debian.org> | 2012-05-17 13:04:02 +0100 |
|---|---|---|
| committer | Colin Watson <cjwatson@debian.org> | 2012-05-17 13:04:02 +0100 |
| commit | dd5ed53e20d218607260916a6b04d1c8c5b3d88f (patch) | |
| tree | c59b4dbcc610f10700945f885adf3bddc2542c26 /authfile.c | |
| parent | 8241a65bf12ac53c1b7304bba7ce739aad80b8b8 (diff) | |
| parent | b9bc38990c5eb5d99e28ca5af6d3491fd4a0060a (diff) | |
merge 6.0p1
Diffstat (limited to 'authfile.c')
| -rw-r--r-- | authfile.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/authfile.c b/authfile.c index 1d7e53cd1..7dd449690 100644 --- a/authfile.c +++ b/authfile.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: authfile.c,v 1.92 2011/06/14 22:49:18 markus Exp $ */ | 1 | /* $OpenBSD: authfile.c,v 1.93 2012/01/25 19:36:31 markus Exp $ */ |
| 2 | /* | 2 | /* |
| 3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
| 4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland | 4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland |
| @@ -340,7 +340,7 @@ key_load_file(int fd, const char *filename, Buffer *blob) | |||
| 340 | filename == NULL ? "" : " "); | 340 | filename == NULL ? "" : " "); |
| 341 | return 0; | 341 | return 0; |
| 342 | } | 342 | } |
| 343 | buffer_init(blob); | 343 | buffer_clear(blob); |
| 344 | for (;;) { | 344 | for (;;) { |
| 345 | if ((len = atomicio(read, fd, buf, sizeof(buf))) == 0) { | 345 | if ((len = atomicio(read, fd, buf, sizeof(buf))) == 0) { |
| 346 | if (errno == EPIPE) | 346 | if (errno == EPIPE) |