From 578f0d08a962ad306f8b0b9239b9dc546ec92d7c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Mr=C3=A1z?= <tmraz@fedoraproject.org>
Date: Thu, 31 Jul 2008 09:22:18 +0000
Subject: [PATCH] - fixed zero length banner problem (#457326)

---
 openssh-5.1p1-bannerlen.patch | 14 ++++++++++++++
 openssh.spec                  |  7 ++++++-
 2 files changed, 20 insertions(+), 1 deletion(-)
 create mode 100644 openssh-5.1p1-bannerlen.patch

diff --git a/openssh-5.1p1-bannerlen.patch b/openssh-5.1p1-bannerlen.patch
new file mode 100644
index 0000000..e453b39
--- /dev/null
+++ b/openssh-5.1p1-bannerlen.patch
@@ -0,0 +1,14 @@
+diff -up openssh-5.1p1/sshconnect2.c.bannerlen openssh-5.1p1/sshconnect2.c
+--- openssh-5.1p1/sshconnect2.c.bannerlen	2008-07-23 19:18:15.000000000 +0200
++++ openssh-5.1p1/sshconnect2.c	2008-07-31 11:16:51.000000000 +0200
+@@ -387,8 +387,9 @@ input_userauth_banner(int type, u_int32_
+ 	if (options.log_level >= SYSLOG_LEVEL_INFO) {
+ 		if (len > 65536)
+ 			len = 65536;
+-		msg = xmalloc(len * 4); /* max expansion from strnvis() */
++		msg = xmalloc(len * 4 + 1); /* max expansion from strnvis() */
+ 		strnvis(msg, raw, len * 4, VIS_SAFE|VIS_OCTAL);
++		msg[len*4] = '\0';
+ 		fprintf(stderr, "%s", msg);
+ 		xfree(msg);
+ 	}
diff --git a/openssh.spec b/openssh.spec
index f2f7b0c..bca7686 100644
--- a/openssh.spec
+++ b/openssh.spec
@@ -63,7 +63,7 @@
 Summary: The OpenSSH implementation of SSH protocol versions 1 and 2
 Name: openssh
 Version: 5.1p1
-Release: 1%{?dist}%{?rescue_rel}
+Release: 2%{?dist}%{?rescue_rel}
 URL: http://www.openssh.com/portable.html
 #Source0: ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-%{version}.tar.gz
 #Source1: ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-%{version}.tar.gz.asc
@@ -96,6 +96,7 @@ Patch51: openssh-5.1p1-nss-keys.patch
 Patch54: openssh-5.1p1-gssapi-role.patch
 Patch55: openssh-5.1p1-cloexec.patch
 Patch62: openssh-5.1p1-scp-manpage.patch
+Patch63: openssh-5.1p1-bannerlen.patch
 
 License: BSD
 Group: Applications/Internet
@@ -227,6 +228,7 @@ an X11 passphrase dialog for OpenSSH.
 %patch54 -p1 -b .gssapi-role
 %patch55 -p1 -b .cloexec
 %patch62 -p1 -b .manpage
+%patch63 -p1 -b .bannerlen
 
 autoreconf
 
@@ -478,6 +480,9 @@ fi
 %endif
 
 %changelog
+* Thu Jul 31 2008 Tomas Mraz <tmraz@redhat.com> - 5.1p1-2
+- fixed zero length banner problem (#457326)
+
 * Wed Jul 23 2008 Tomas Mraz <tmraz@redhat.com> - 5.1p1-1
 - upgrade to new upstream release
 - fixed a problem with public key authentication and explicitely