summaryrefslogtreecommitdiffstats
path: root/usr.bin/ssh/readconf.c
diff options
context:
space:
mode:
authordjm <djm@openbsd.org>2017-01-30 00:34:01 +0000
committerdjm <djm@openbsd.org>2017-01-30 00:34:01 +0000
commitec4839e16a25f7462f071c685eb76399698f18a2 (patch)
treee26686154a675625aec256ae14eadd650e6adc3f /usr.bin/ssh/readconf.c
parentmisplaced braces in test; from Karsten Weiss (diff)
downloadwireguard-openbsd-ec4839e16a25f7462f071c685eb76399698f18a2.tar.xz
wireguard-openbsd-ec4839e16a25f7462f071c685eb76399698f18a2.zip
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));