From: Rishi k. K R. <ris...@li...> - 2010-03-22 08:10:36
|
The branch, next, has been updated via c65b70531c8d383a957654ad5179cb302b405a3b (commit) from 95a376d4e50acd0c90bf749060a1974338a082a9 (commit) - Log ----------------------------------------------------------------- commit c65b70531c8d383a957654ad5179cb302b405a3b Author: Rishikesh K Rajak <ris...@li...> Date: Mon Mar 22 13:38:45 2010 +0530 Remaining patch for new file addition for commit:6e3dd83d9f575d98d76b8b3f642ad6e8793dbdfc ----------------------------------------------------------------------- Summary of changes: m4/{ltp-unshare.m4 => ltp-prctl.m4} | 10 ++++++++-- .../filecaps/{check_simple_capset.c => c.c} | 5 +---- 2 files changed, 9 insertions(+), 6 deletions(-) copy m4/{ltp-unshare.m4 => ltp-prctl.m4} (80%) copy testcases/kernel/security/filecaps/{check_simple_capset.c => c.c} (97%) diff --git a/m4/ltp-unshare.m4 b/m4/ltp-prctl.m4 similarity index 80% copy from m4/ltp-unshare.m4 copy to m4/ltp-prctl.m4 index 60f4c54..51edb08 100644 --- a/m4/ltp-unshare.m4 +++ b/m4/ltp-prctl.m4 @@ -19,7 +19,13 @@ dnl Author: Garrett Cooper <yan...@gm...> dnl dnl -dnl LTP_CHECK_SYSCALL_UNSHARE +dnl LTP_CHECK_PRCTL_SUPPORT dnl ---------------------------- dnl -AC_DEFUN([LTP_CHECK_SYSCALL_UNSHARE],[AC_CHECK_FUNCS_ONCE(unshare)]) +AC_DEFUN([LTP_CHECK_PRCTL_SUPPORT],[ +AC_CHECK_HEADERS(sys/prctl.h,[ + AC_CHECK_DECLS([PR_CAPBSET_DROP, PR_CAPBSET_READ], [],[],[dnl +#include <sys/prctl.h> +]) dnl AC_CHECK_DECLS +])] +) diff --git a/testcases/kernel/security/filecaps/check_simple_capset.c b/testcases/kernel/security/filecaps/c.c similarity index 97% copy from testcases/kernel/security/filecaps/check_simple_capset.c copy to testcases/kernel/security/filecaps/c.c index 6c7790d..ee6cf05 100644 --- a/testcases/kernel/security/filecaps/check_simple_capset.c +++ b/testcases/kernel/security/filecaps/c.c @@ -20,17 +20,14 @@ #include <stdio.h> -#include "config.h" -#if HAVE_SYS_CAPABILITY_H #include <sys/capability.h> -#endif int main() { -#ifdef HAVE_LIBCAP cap_t caps, caps2; int ret; +#ifdef HAVE_LIBCAP caps = cap_from_text("cap_setpcap+ep"); caps2 = cap_from_text("cap_setpcap+ep"); ret = cap_set_proc(caps); hooks/post-receive -- ltp |