upstream commit

unbreak config parsing on reexec from previous commit

Upstream-ID: bc69932638a291770955bd05ca55a32660a613ab

diff --git a/sshd.c b/sshd.c
index 47e046e240ce8afe49a32bfa71e038b4c4d09094..0200691e83c845535531d6ef0b3079199c0d5938 100644 (file)
--- 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)) {