summaryrefslogtreecommitdiff
path: root/usr.bin/ssh/readconf.c
diff options
context:
space:
mode:
authorDamien Miller <djm@cvs.openbsd.org>2017-01-30 00:34:02 +0000
committerDamien Miller <djm@cvs.openbsd.org>2017-01-30 00:34:02 +0000
commit9d175945a8c0ee1d45f3771c24b653744d487d2f (patch)
treee80903b2ef5662a05b72317f854bc6f4203761c9 /usr.bin/ssh/readconf.c
parentb1430bad89ce26c98d8d2c285d3bc9240476e133 (diff)
some explicit NULL tests when dumping configured forwardings;
from Karsten Weiss
Diffstat (limited to 'usr.bin/ssh/readconf.c')
-rw-r--r--usr.bin/ssh/readconf.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/usr.bin/ssh/readconf.c b/usr.bin/ssh/readconf.c
index fe4566714b2..8f3ea5b8847 100644
--- a/usr.bin/ssh/readconf.c
+++ b/usr.bin/ssh/readconf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: readconf.c,v 1.264 2017/01/06 09:27:52 djm Exp $ */
+/* $OpenBSD: readconf.c,v 1.265 2017/01/30 00:34:01 djm Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -2434,10 +2434,10 @@ dump_cfg_forwards(OpCodes code, u_int count, const struct Forward *fwds)
/* oDynamicForward */
for (i = 0; i < count; i++) {
fwd = &fwds[i];
- if (code == oDynamicForward &&
+ if (code == oDynamicForward && fwd->connect_host != NULL &&
strcmp(fwd->connect_host, "socks") != 0)
continue;
- if (code == oLocalForward &&
+ if (code == oLocalForward && fwd->connect_host != NULL &&
strcmp(fwd->connect_host, "socks") == 0)
continue;
printf("%s", lookup_opcode_name(code));