about summary refs log tree commit diff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2015-05-30 14:55:16 -0400
committerAurelien Jarno <aurelien@aurel32.net>2015-11-22 19:31:14 +0100
commit26f36461f66ac62bf6d3f1ef7a1439ab3ed67cf6 (patch)
tree1e7be60d2c071b2672aa2000cb09b0d798e18511
parente04da210f7cd564c46a8db0e15a0c6e726f3977e (diff)
downloadglibc-26f36461f66ac62bf6d3f1ef7a1439ab3ed67cf6.tar.gz
glibc-26f36461f66ac62bf6d3f1ef7a1439ab3ed67cf6.tar.xz
glibc-26f36461f66ac62bf6d3f1ef7a1439ab3ed67cf6.zip
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)
-rw-r--r--ChangeLog4
-rw-r--r--nscd/selinux.c1
2 files changed, 4 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 868d355d5e..079b41166f 100644
--- 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 e433b1b18a..806763f9bd 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>