nscd: drop selinux/flask.h include

Message ID 1433012245-26244-1-git-send-email-vapier@gentoo.org
State Committed
Delegated to: Mike Frysinger
Headers

Commit Message

Mike Frysinger May 30, 2015, 6:57 p.m. UTC
  Building nscd w/selinux enabled yields a warning which yields an error:
In file included from selinux.c:32:0:
/usr/include/selinux/flask.h:5:2: error:
 #warning "Please remove any #include's of this header in your source code."

I've done just that and it builds cleanly with libselinux-2.4.
---
 ChangeLog      | 4 ++++
 nscd/selinux.c | 1 -
 2 files changed, 4 insertions(+), 1 deletion(-)
  

Comments

Siddhesh Poyarekar June 3, 2015, 5:43 p.m. UTC | #1
On Sat, May 30, 2015 at 02:57:25PM -0400, Mike Frysinger wrote:
> Building nscd w/selinux enabled yields a warning which yields an error:
> In file included from selinux.c:32:0:
> /usr/include/selinux/flask.h:5:2: error:
>  #warning "Please remove any #include's of this header in your source code."
> 
> I've done just that and it builds cleanly with libselinux-2.4.

Looks good to me.

Siddhesh
  

Patch

diff --git a/ChangeLog b/ChangeLog
index 77429f7..6a0db12 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@ 
+2015-05-31  Mike Frysinger  <vapier@gentoo.org>
+
+	* nscd/selinux.c: Delete selinux/flask.h include.
+
 2015-05-29  Adhemerval Zanella  <adhemerval.zanella@linaro.org>
 
 	* sysdeps/powerpc/fpu/libm-test-ulps: Update.
diff --git a/nscd/selinux.c b/nscd/selinux.c
index e433b1b..806763f 100644
--- a/nscd/selinux.c
+++ b/nscd/selinux.c
@@ -29,7 +29,6 @@ 
 #include <unistd.h>
 #include <sys/prctl.h>
 #include <selinux/avc.h>
-#include <selinux/flask.h>
 #include <selinux/selinux.h>
 #ifdef HAVE_LIBAUDIT
 # include <libaudit.h>