merge 6.0p1

1 files changed, 2 insertions, 2 deletions

diff --git a/auth2.c b/auth2.c
index f73ac183f..4313e9f26 100644
--- a/auth2.c
+++ b/auth2.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: auth2.c,v 1.123 2011/03/10 02:52:57 djm Exp $ */
+/* $OpenBSD: auth2.c,v 1.124 2011/12/07 05:44:38 djm Exp $ */
 /*
  * Copyright (c) 2000 Markus Friedl.  All rights reserved.
  *
@@ -115,7 +115,7 @@ auth2_read_banner(void)
                 close(fd);
                 return (NULL);
         }
-        if (st.st_size > 1*1024*1024) {
+        if (st.st_size <= 0 || st.st_size > 1*1024*1024) {
                 close(fd);
                 return (NULL);
         }