]> git.ipfire.org Git - thirdparty/openssh-portable.git/commitdiff
upstream: Fix "Allocated port" debug message
authordtucker@openbsd.org <dtucker@openbsd.org>
Mon, 20 Sep 2021 04:02:13 +0000 (04:02 +0000)
committerDarren Tucker <dtucker@dtucker.net>
Mon, 20 Sep 2021 04:31:57 +0000 (14:31 +1000)
for unix domain sockets. From peder.stray at gmail.com via github PR#272,
ok deraadt@

OpenBSD-Commit-ID: 8d5ef3fbdcdd29ebb0792b5022a4942db03f017e

ssh.c

diff --git a/ssh.c b/ssh.c
index 6c955688d2e5f3d734e8dbcfa4bc64f97989f3ff..e6fe8090991d0022791c61eb2affe529072acb40 100644 (file)
--- a/ssh.c
+++ b/ssh.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh.c,v 1.568 2021/09/15 06:56:01 djm Exp $ */
+/* $OpenBSD: ssh.c,v 1.569 2021/09/20 04:02:13 dtucker Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -1793,7 +1793,8 @@ ssh_confirm_remote_forward(struct ssh *ssh, int type, u_int32_t seq, void *ctxt)
                                rfwd->allocated_port = (int)port;
                                logit("Allocated port %u for remote "
                                    "forward to %s:%d",
-                                   rfwd->allocated_port, rfwd->connect_host,
+                                   rfwd->allocated_port, rfwd->connect_path ?
+                                   rfwd->connect_path : rfwd->connect_host,
                                    rfwd->connect_port);
                                channel_update_permission(ssh,
                                    rfwd->handle, rfwd->allocated_port);