From: Ron Lockwood-Childs <rchilds@vctlabs.com>
Date: Mon, 16 Oct 2017 21:01:10 +0000 (-0700)
Subject: Revert "caps: define CAP_AUDIT_READ if not defined"
X-Git-Tag: 2.1~10^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5ff0de745464741142b0ccf9603eff51182d5df9;p=platform%2Fupstream%2Fnsjail.git

Revert "caps: define CAP_AUDIT_READ if not defined"

Restore compatibility with 3.x kernels by not requiring CAP_AUDIT_READ
if not defined in kernel header file

This reverts commit 7820553cb9296b5f1a3137153948db45309aa6b1.

Conflicts:
	caps.c
	contain.h
---

diff --git a/caps.c b/caps.c
index 0910830..066e77e 100644
--- a/caps.c
+++ b/caps.c
@@ -31,10 +31,6 @@
 #include "log.h"
 #include "util.h"
 
-#if !defined(CAP_AUDIT_READ)
-#define CAP_AUDIT_READ 37
-#endif /* !defined(CAP_AUDIT_READ) */
-
 static struct {
 	const int val;
 	const char* const name;
@@ -76,7 +72,9 @@ static struct {
 	NS_VALSTR_STRUCT(CAP_SYSLOG),
 	NS_VALSTR_STRUCT(CAP_WAKE_ALARM),
 	NS_VALSTR_STRUCT(CAP_BLOCK_SUSPEND),
+#if defined(CAP_AUDIT_READ)
 	NS_VALSTR_STRUCT(CAP_AUDIT_READ),
+#endif /* defined(CAP_AUDIT_READ) */
 };
 
 int capsNameToVal(const char* name)
diff --git a/kafel b/kafel
index 2ae8e11..b20d268 160000
--- a/kafel
+++ b/kafel
@@ -1 +1 @@
-Subproject commit 2ae8e116e416539da66ed7170e246668df05e43e
+Subproject commit b20d26848992cb14661f6fbccca6a82b1c2af546