RepoMirrors/openssh
1
0
Fork 0
mirror of git://anongit.mindrot.org/openssh.git synced 2025-01-14 13:41:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

upstream commit

Browse Source 
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
This commit is contained in:
djm@openbsd.org 2015-11-28 06:41:03 +00:00 committed by Damien Miller
parent 9080bd0b9c
commit b1d6b3971e
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
serverloop.c
View File

@ -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> * Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * 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); free(fwd.listen_host);
if ((resp = sshbuf_new()) == NULL) if ((resp = sshbuf_new()) == NULL)
fatal("%s: sshbuf_new", __func__); 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)); fatal("%s: sshbuf_put_u32: %s", __func__, ssh_err(r));
} else if (strcmp(rtype, "cancel-tcpip-forward") == 0) { } else if (strcmp(rtype, "cancel-tcpip-forward") == 0) {
struct Forward fwd; struct Forward fwd;