From: djm@openbsd.org <djm@openbsd.org>
Date: Mon, 2 May 2016 14:10:58 +0000 (+0000)
Subject: upstream commit
X-Git-Tag: V_7_3_P1~119
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=31bc01c05d9f51bee3ebe33dc57c4fafb059fb62;p=thirdparty%2Fopenssh-portable.git

upstream commit

unbreak config parsing on reexec from previous commit

Upstream-ID: bc69932638a291770955bd05ca55a32660a613ab
---

diff --git a/sshd.c b/sshd.c
index 47e046e24..0200691e8 100644
--- a/sshd.c
+++ b/sshd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sshd.c,v 1.468 2016/05/02 10:26:04 djm Exp $ */
+/* $OpenBSD: sshd.c,v 1.469 2016/05/02 14:10:58 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -1104,7 +1104,7 @@ recv_rexec_state(int fd, Buffer *conf)
 
 	cp = buffer_get_string(&m, &len);
 	if (conf != NULL)
-		buffer_append(conf, cp, len + 1);
+		buffer_append(conf, cp, len);
 	free(cp);
 
 	if (buffer_get_int(&m)) {