From: dtucker@openbsd.org <dtucker@openbsd.org>
Date: Fri, 20 Nov 2020 02:14:16 +0000 (+0000)
Subject: upstream: Explicitly initialize all members of the
X-Git-Tag: V_8_5_P1~190
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3a7c46c72b6a1f643b1fc3589cd20d8320c3d9e1;p=thirdparty%2Fopenssh-portable.git

upstream: Explicitly initialize all members of the

find_by_key_ctx struct.  Initializing a single member should be enough
(the spec says the remainder should be initialized as per the static
rules) but some GCCs warn on this which prevents us testing with -Werror
on those.  ok deraadt@ djm@

OpenBSD-Commit-ID: 687126e60a27d30f02614760ef3c3ae4e8d6af28
---

diff --git a/sshconnect.c b/sshconnect.c
index 02f569c1a..1abe710c1 100644
--- a/sshconnect.c
+++ b/sshconnect.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sshconnect.c,v 1.342 2020/11/12 22:56:00 djm Exp $ */
+/* $OpenBSD: sshconnect.c,v 1.343 2020/11/20 02:14:16 dtucker Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -789,7 +789,7 @@ hostkeys_find_by_key(const char *host, const char *ip, const struct sshkey *key,
     char **system_hostfiles, u_int num_system_hostfiles,
     char ***names, u_int *nnames)
 {
-	struct find_by_key_ctx ctx = {0};
+	struct find_by_key_ctx ctx = {0, 0, 0, 0, 0};
 	u_int i;
 
 	*names = NULL;