LU-17173 gss: user keys go to user keyring

[fs/lustre-release.git] / libcfs / autoconf / lustre-libcfs.m4

diff --git a/libcfs/autoconf/lustre-libcfs.m4 b/libcfs/autoconf/lustre-libcfs.m4
index 85b4f66..ae3765b 100644 (file)
--- a/libcfs/autoconf/lustre-libcfs.m4
+++ b/libcfs/autoconf/lustre-libcfs.m4
@@ -2006,6 +2006,27 @@ AC_DEFUN([LIBCFS_KERNEL_SETSOCKOPT], [
 ]) # LIBCFS_KERNEL_SETSOCKOPT
 
 #
+# LIBCFS_USER_UID_KEYRING
+#
+# kernel 5.2 commit 0f44e4d976f9 removed uid_keyring
+# from the user_struct struct
+#
+AC_DEFUN([LIBCFS_SRC_USER_UID_KEYRING], [
+       LB2_LINUX_TEST_SRC([user_uid_keyring_exists], [
+               #include <linux/sched/user.h>
+       ],[
+               ((struct user_struct *)0)->uid_keyring = NULL;
+       ],[-Werror])
+])
+AC_DEFUN([LIBCFS_USER_UID_KEYRING], [
+       AC_MSG_CHECKING([if uid_keyring exists])
+       LB2_LINUX_TEST_RESULT([user_uid_keyring_exists], [
+               AC_DEFINE(HAVE_USER_UID_KEYRING, 1,
+                       [uid_keyring exists])
+       ])
+]) # LIBCFS_USER_UID_KEYRING
+
+#
 # LIBCFS_KEY_NEED_UNLINK
 #
 # kernel 5.8 commit 8c0637e950d68933a67f7438f779d79b049b5e5c
@@ -2469,6 +2490,7 @@ AC_DEFUN([LIBCFS_PROG_LINUX_SRC], [
        LIBCFS_SRC_GET_REQUEST_KEY_AUTH
        # 5.2
        LIBCFS_SRC_KOBJ_TYPE_DEFAULT_GROUPS
+       LIBCFS_SRC_USER_UID_KEYRING
        # 5.3
        LIBCFS_SRC_LOOKUP_USER_KEY
        LIBCFS_SRC_CACHE_DETAIL_WRITERS
@@ -2619,6 +2641,7 @@ AC_DEFUN([LIBCFS_PROG_LINUX_RESULTS], [
        LIBCFS_GET_REQUEST_KEY_AUTH
        # 5.2
        LIBCFS_KOBJ_TYPE_DEFAULT_GROUPS
+       LIBCFS_USER_UID_KEYRING
        # 5.3
        LIBCFS_LOOKUP_USER_KEY
        LIBCFS_CACHE_DETAIL_WRITERS