DEVEL15-keyring-test-harder-20060825

FIXES 38470

don't enable keyring pags in older keyring kernels

(cherry picked from commit 4076e99d91e3644f4544386a38c908e5b793b285)

diff --git a/src/cf/linux-test4.m4 b/src/cf/linux-test4.m4
index 34dceed18dc37880cc0ecd96d79a0e930c95b22f..9c2e0dfb859f1b7a80723bb62fd41fb3f7805481 100644 (file)
--- a/src/cf/linux-test4.m4
+++ b/src/cf/linux-test4.m4
@@ -621,6 +621,9 @@ static inline _syscall2(long, keyctl, int, option, void*, arg2);],
 [#ifdef CONFIG_KEYS
 keyctl(KEYCTL_JOIN_SESSION_KEYRING, NULL);
 request_key(NULL, NULL, NULL);
+#if !defined(KEY_POS_VIEW) || !defined(KEY_POS_SEARCH)
+#error "Your linux/key.h does not contain KEY_POS_VIEW or KEY_POS_SEARCH"
+#endif
 #else
 #error rebuild your kernel with CONFIG_KEYS
 #endif],