diff options
author | djm@openbsd.org <djm@openbsd.org> | 2017-09-12 07:32:04 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2017-09-12 17:37:03 +1000 |
commit | 9145a73ce2ba30c82bbf91d7205bfd112529449f (patch) | |
tree | 7d102c78a819f376b7bb4bcf8e389798b70f9c34 | |
parent | 9f53229c2ac97dbc6f5a03657de08a1150a9ac7e (diff) |
upstream commit
fix tun/tap forwarding case in previous
Upstream-ID: 43ebe37a930320e24bca6900dccc39857840bc53
-rw-r--r-- | channels.c | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -1,4 +1,4 @@ -/* $OpenBSD: channels.c,v 1.368 2017/09/12 06:35:31 djm Exp $ */ +/* $OpenBSD: channels.c,v 1.369 2017/09/12 07:32:04 djm Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -1836,6 +1836,7 @@ channel_handle_wfd(struct ssh *ssh, Channel *c, if ((r = sshbuf_get_string(c->output, &data, &dlen)) != 0) fatal("%s: channel %d: get datagram: %s", __func__, c->self, ssh_err(r)); + buf = data; } else { buf = data = sshbuf_mutable_ptr(c->output); dlen = sshbuf_len(c->output); |