summaryrefslogtreecommitdiff
path: root/auth2.c
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2012-05-18 12:16:05 +0100
committerColin Watson <cjwatson@debian.org>2012-05-18 12:16:05 +0100
commitdabbdfacc9f6995b0739772a47704186dcf34ea5 (patch)
tree0a0b306a637bc85eb719261b74884f0b9573ec41 /auth2.c
parent1e0d51b642cac9a6bfb719e6320905625aa5f943 (diff)
parentdd5ed53e20d218607260916a6b04d1c8c5b3d88f (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 'auth2.c')
-rw-r--r--auth2.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/auth2.c b/auth2.c
index 52acf4606..1b7403904 100644
--- a/auth2.c
+++ b/auth2.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: auth2.c,v 1.123 2011/03/10 02:52:57 djm Exp $ */ 1/* $OpenBSD: auth2.c,v 1.124 2011/12/07 05:44:38 djm Exp $ */
2/* 2/*
3 * Copyright (c) 2000 Markus Friedl. All rights reserved. 3 * Copyright (c) 2000 Markus Friedl. All rights reserved.
4 * 4 *
@@ -115,7 +115,7 @@ auth2_read_banner(void)
115 close(fd); 115 close(fd);
116 return (NULL); 116 return (NULL);
117 } 117 }
118 if (st.st_size > 1*1024*1024) { 118 if (st.st_size <= 0 || st.st_size > 1*1024*1024) {
119 close(fd); 119 close(fd);
120 return (NULL); 120 return (NULL);
121 } 121 }