diff options
author | Colin Watson <cjwatson@debian.org> | 2012-05-18 12:16:05 +0100 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2012-05-18 12:16:05 +0100 |
commit | dabbdfacc9f6995b0739772a47704186dcf34ea5 (patch) | |
tree | 0a0b306a637bc85eb719261b74884f0b9573ec41 /authfile.c | |
parent | 1e0d51b642cac9a6bfb719e6320905625aa5f943 (diff) | |
parent | dd5ed53e20d218607260916a6b04d1c8c5b3d88f (diff) |
* New upstream release (http://www.openssh.org/txt/release-6.0).
- Fix IPQoS not being set on non-mapped v4-in-v6 addressed connections
(closes: #643312, #650512).
- Add a new privilege separation sandbox implementation for Linux's new
seccomp sandbox, automatically enabled on platforms that support it.
(Note: privilege separation sandboxing is still experimental.)
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 e5fe0b801..b0b4e1272 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 |
@@ -341,7 +341,7 @@ key_load_file(int fd, const char *filename, Buffer *blob) | |||
341 | filename == NULL ? "" : " "); | 341 | filename == NULL ? "" : " "); |
342 | return 0; | 342 | return 0; |
343 | } | 343 | } |
344 | buffer_init(blob); | 344 | buffer_clear(blob); |
345 | for (;;) { | 345 | for (;;) { |
346 | if ((len = atomicio(read, fd, buf, sizeof(buf))) == 0) { | 346 | if ((len = atomicio(read, fd, buf, sizeof(buf))) == 0) { |
347 | if (errno == EPIPE) | 347 | if (errno == EPIPE) |