[openssh-commits] [openssh] 01/01: upstream commit

[git+noreply at mindrot.org]

This is an automated email from the git hooks/post-receive script.

djm pushed a commit to branch master
in repository openssh.

commit 5b90709ab8704dafdb31e5651073b259d98352bc
Author: djm at openbsd.org <djm at openbsd.org>
Date:   Mon Feb 6 09:22:51 2017 +0000

    upstream commit
    
    Restore \r\n newline sequence for server ident string. The CR
    got lost in the flensing of SSHv1. Pointed out by Stef Bon
    
    Upstream-ID: 5333fd43ce5396bf5999496096fac5536e678fac
---
 sshd.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/sshd.c b/sshd.c
index 48fd64f..c2c1cc8 100644
--- a/sshd.c
+++ b/sshd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sshd.c,v 1.481 2017/02/03 02:56:00 dtucker Exp $ */
+/* $OpenBSD: sshd.c,v 1.482 2017/02/06 09:22:51 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo at cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo at cs.hut.fi>, Espoo, Finland
@@ -362,14 +362,14 @@ sshd_exchange_identification(struct ssh *ssh, int sock_in, int sock_out)
 {
 	u_int i;
 	int remote_major, remote_minor;
-	char *s, *newline = "\n";
+	char *s;
 	char buf[256];			/* Must not be larger than remote_version. */
 	char remote_version[256];	/* Must be at least as big as buf. */
 
-	xasprintf(&server_version_string, "SSH-%d.%d-%.100s%s%s%s",
+	xasprintf(&server_version_string, "SSH-%d.%d-%.100s%s%s\r\n",
 	    PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_VERSION,
 	    *options.version_addendum == '\0' ? "" : " ",
-	    options.version_addendum, newline);
+	    options.version_addendum);
 
 	/* Send our protocol version identification. */
 	if (atomicio(vwrite, sock_out, server_version_string,

-- 
To stop receiving notification emails like this one, please contact
djm at mindrot.org.