From: Dmitry V. Levin <ldv@altlinux.org>
Date: Thu, 25 Oct 2018 13:36:54 +0000 (+0000)
Subject: tests: fix build with recent kernel headers
X-Git-Tag: v4.25~4
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6d6d5bc4807a2c09784dfa3290aa0b4128a5183b;p=strace

tests: fix build with recent kernel headers

Linux commit v4.19-rc2-5-g2ecefa0a15fd0ef88b9cd5d15ceb813008136431
changed the definition of struct keyctl_dh_params in an incompatible
way again.  Workaround this issue by using designated initializers.

* tests/keyctl.c (main): Use designated initializers for
struct keyctl_dh_params.
---

diff --git a/tests/keyctl.c b/tests/keyctl.c
index 881f24b3..e53cdc41 100644
--- a/tests/keyctl.c
+++ b/tests/keyctl.c
@@ -312,7 +312,10 @@ main(void)
 	static const char *bogus_key3_str = "-557785390";
 
 	static const struct keyctl_dh_params kcdhp_data = {
-		KEY_SPEC_GROUP_KEYRING, 1234567890, 3141592653U };
+		.private = KEY_SPEC_GROUP_KEYRING,
+		.prime = 1234567890,
+		.base = 3141592653U
+	};
 	static const char *kcdhp_str = "{private="
 #if XLAT_RAW || XLAT_VERBOSE
 		"-6"