diff options
author | djm@openbsd.org <djm@openbsd.org> | 2015-11-28 06:41:03 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2015-11-28 17:44:33 +1100 |
commit | b1d6b3971ef256a08692efc409fc9ada719111cc (patch) | |
tree | 4da02f7c2345dfd912314537cdf81537bb0eac22 /serverloop.c | |
parent | 9080bd0b9cf10d0f13b1f642f20cb84285cb8d65 (diff) |
upstream commit
don't include port number in tcpip-forward replies for
requests that don't allocate a port; bz#2509 diagnosed by Ron Frederick ok
markus
Upstream-ID: 77efad818addb61ec638b5a2362f1554e21a970a
Diffstat (limited to 'serverloop.c')
-rw-r--r-- | serverloop.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/serverloop.c b/serverloop.c index 306ac36b..4d0c0edb 100644 --- a/serverloop.c +++ b/serverloop.c @@ -1,4 +1,4 @@ -/* $OpenBSD: serverloop.c,v 1.178 2015/02/20 22:17:21 djm Exp $ */ +/* $OpenBSD: serverloop.c,v 1.179 2015/11/28 06:41:03 djm Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -1265,7 +1265,8 @@ server_input_global_request(int type, u_int32_t seq, void *ctxt) free(fwd.listen_host); if ((resp = sshbuf_new()) == NULL) fatal("%s: sshbuf_new", __func__); - if ((r = sshbuf_put_u32(resp, allocated_listen_port)) != 0) + if (allocated_listen_port != 0 && + (r = sshbuf_put_u32(resp, allocated_listen_port)) != 0) fatal("%s: sshbuf_put_u32: %s", __func__, ssh_err(r)); } else if (strcmp(rtype, "cancel-tcpip-forward") == 0) { struct Forward fwd; |