nscd: drop selinux/flask.h include

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.

(cherry picked from commit 808696696837b8b8fc858f2e6f8d4e40e26e1308)

diff --git a/ChangeLog b/ChangeLog
index 868d355d5e8681f513487751cc342fa3af2b6041..079b41166f1d66c59075575d8f8d2182f2d6fd99 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2015-07-08  Mike Frysinger  <vapier@gentoo.org>
+
+       * nscd/selinux.c: Delete selinux/flask.h include.
+
 2015-03-02  Andreas Schwab  <schwab@suse.de>
 
        * elf/Makefile ($(elf-objpfx)runtime-linker.st): Fix typo in

diff --git a/nscd/selinux.c b/nscd/selinux.c
index e433b1b18a95086b14ed8d3245336269a6d0ef2d..806763f9bd45db07b1bfb1d5b7b443c1f3ede017 100644 (file)
--- 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>