summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordjm@openbsd.org <djm@openbsd.org>2016-05-02 14:10:58 +0000
committerDamien Miller <djm@mindrot.org>2016-05-03 00:14:01 +1000
commit31bc01c05d9f51bee3ebe33dc57c4fafb059fb62 (patch)
tree2dd37b3243dd3825aff6804f3453cbc244f657cd
parent67f1459efd2e85bf03d032539283fa8107218936 (diff)
upstream commit
unbreak config parsing on reexec from previous commit Upstream-ID: bc69932638a291770955bd05ca55a32660a613ab
-rw-r--r--sshd.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sshd.c b/sshd.c
index 47e046e2..0200691e 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)) {