summaryrefslogtreecommitdiff
path: root/servconf.c
diff options
context:
space:
mode:
authordjm@openbsd.org <djm@openbsd.org>2023-03-03 04:34:49 +0000
committerDamien Miller <djm@mindrot.org>2023-03-03 16:12:04 +1100
commitd1c1b3272e8895a96c4f5889bd6e07a8525bd9f1 (patch)
tree8134721202a7adbcec869337cf590695c89a77b4 /servconf.c
parent8bf61e95610b48192d4e1720cc15d9004617301d (diff)
downloadopenssh-git-d1c1b3272e8895a96c4f5889bd6e07a8525bd9f1.tar.gz
upstream: actually print "channeltimeout none" in config dump mode;
spotted via Coverity CID 405022 OpenBSD-Commit-ID: b074b52bf138b75f08264e8da15880b29c7a630f
Diffstat (limited to 'servconf.c')
-rw-r--r--servconf.c14
1 files changed, 11 insertions, 3 deletions
diff --git a/servconf.c b/servconf.c
index 2e039da8..552fda75 100644
--- a/servconf.c
+++ b/servconf.c
@@ -1,5 +1,5 @@
-/* $OpenBSD: servconf.c,v 1.390 2023/01/17 09:44:48 djm Exp $ */
+/* $OpenBSD: servconf.c,v 1.391 2023/03/03 04:34:49 djm Exp $ */
/*
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
* All rights reserved
@@ -2917,8 +2917,16 @@ dump_cfg_strarray_oneline(ServerOpCodes code, u_int count, char **vals)
{
u_int i;
- if (count <= 0 && code != sAuthenticationMethods)
- return;
+ switch (code) {
+ case sAuthenticationMethods:
+ case sChannelTimeout:
+ break;
+ default:
+ if (count <= 0)
+ return;
+ break;
+ }
+
printf("%s", lookup_opcode_name(code));
for (i = 0; i < count; i++)
printf(" %s", vals[i]);