[LTP] [PATCH v2 2/2] ltp-cap.m4: uncouple licap and cap_compare

[Yang Xu]

Currently, HAVE_LIBCAP is not defined unless libcap supports
cap_compare(). The check for libcap and cap_compare() has to be
uncoupled because libcap-1 doesn't have cap_compare.

Signed-off-by: Yang Xu <xuyang2018.jy@cn.fujitsu.com>
---
 m4/ltp-cap.m4                                 | 21 ++++++++++---------
 .../security/filecaps/check_simple_capset.c   |  4 ++--
 .../security/filecaps/verify_caps_exec.c      |  6 +++---
 3 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/m4/ltp-cap.m4 b/m4/ltp-cap.m4
index 02d3cac8c..502f57006 100644
--- a/m4/ltp-cap.m4
+++ b/m4/ltp-cap.m4
@@ -1,17 +1,18 @@
 dnl SPDX-License-Identifier: GPL-2.0-or-later
 dnl Copyright (c) Cisco Systems Inc., 2009
 dnl Copyright (c) Linux Test Project, 2010
+dnl Copyright (c) 2019 FUJITSU LIMITED. All rights reserved.
 dnl Author: Ngie Cooper <yaneurabeya@gmail.com>
 
 AC_DEFUN([LTP_CHECK_CAPABILITY_SUPPORT],[
-AH_TEMPLATE(HAVE_LIBCAP,
-[Define to 1 if you have libcap-2 installed.])
-AC_CHECK_HEADERS([sys/capability.h],[capability_header_prefix="sys"])
-if test "x$capability_header_prefix" != x; then
-	AC_CHECK_LIB(cap,cap_compare,[cap_libs="-lcap"])
-fi
-if test "x$cap_libs" != x; then
-	AC_DEFINE(HAVE_LIBCAP)
-fi
-AC_SUBST(CAP_LIBS,$cap_libs)
+	AC_CHECK_LIB(cap,cap_init,[have_libcap=yes])
+	AC_CHECK_LIB(cap,cap_compare,[have_libcap_2=yes])
+	AC_CHECK_HEADERS(sys/capability.h,[have_sys_cap=yes])
+	if test "x$have_libcap" = "xyes" -a "x$have_sys_cap" = "xyes"; then
+		AC_DEFINE(HAVE_LIBCAP, 1, [Define to 1 if you have libcap and it's headers installed])
+		AC_SUBST(CAP_LIBS, "-lcap")
+	fi
+	if test "x$have_libcap_2" = "xyes" -a "x$have_sys_cap" = "xyes"; then
+		AC_DEFINE(HAVE_LIBCAP_V2, 1, [Define to 1 if you have libcap-2 and it's headers installed])
+	fi
 ])
diff --git a/testcases/kernel/security/filecaps/check_simple_capset.c b/testcases/kernel/security/filecaps/check_simple_capset.c
index 81a75babd..e9c414119 100644
--- a/testcases/kernel/security/filecaps/check_simple_capset.c
+++ b/testcases/kernel/security/filecaps/check_simple_capset.c
@@ -27,7 +27,7 @@
 
 int main(void)
 {
-#ifdef HAVE_LIBCAP
+#ifdef HAVE_LIBCAP_V2
 	cap_t caps, caps2;
 	int ret;
 
@@ -41,7 +41,7 @@ int main(void)
 	cap_free(caps2);
 	return ret;
 #else
-	printf("System doesn't support full POSIX capabilities.\n");
+	printf("System doesn't support V2 POSIX capabilities.\n");
 	return 1;
 #endif
 }
diff --git a/testcases/kernel/security/filecaps/verify_caps_exec.c b/testcases/kernel/security/filecaps/verify_caps_exec.c
index 3e6794102..a4c127fb6 100644
--- a/testcases/kernel/security/filecaps/verify_caps_exec.c
+++ b/testcases/kernel/security/filecaps/verify_caps_exec.c
@@ -62,7 +62,7 @@ static void usage(const char *me)
 #define DROP_PERMS 0
 #define KEEP_PERMS 1
 
-#ifdef HAVE_LIBCAP
+#ifdef HAVE_LIBCAP_V2
 static void print_my_caps(void)
 {
 	cap_t cap = cap_get_proc();
@@ -398,7 +398,7 @@ static int caps_actually_set_test(void)
 
 int main(int argc, char *argv[])
 {
-#ifdef HAVE_LIBCAP
+#ifdef HAVE_LIBCAP_V2
 	if (argc < 2)
 		usage(argv[0]);
 
@@ -419,7 +419,7 @@ int main(int argc, char *argv[])
 		usage(argv[0]);
 	}
 #else
-	tst_resm(TCONF, "System doesn't have POSIX capabilities support.");
+	tst_resm(TCONF, "System doesn't have POSIX  V2 capabilities support.");
 #endif
 
 	tst_exit();
-- 
2.18.1