From: djm <djm@openbsd.org>
Date: Fri, 3 Mar 2023 04:34:49 +0000 (+0000)
Subject: actually print "channeltimeout none" in config dump mode;
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=1dc49121f0924975ccd134a9f2c8e16699be63ca;p=openbsd

actually print "channeltimeout none" in config dump mode;
spotted via Coverity CID 405022
---

diff --git a/usr.bin/ssh/servconf.c b/usr.bin/ssh/servconf.c
index 50cd9108dc4..2e9fdc78a77 100644
--- a/usr.bin/ssh/servconf.c
+++ b/usr.bin/ssh/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
@@ -2856,8 +2856,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]);