about summary refs log tree commit diff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2015-05-30 14:55:16 -0400
committerMike Frysinger <vapier@gentoo.org>2015-07-08 03:18:27 -0400
commit808696696837b8b8fc858f2e6f8d4e40e26e1308 (patch)
tree26a94328e3622b302bbbe98948d129f632a961f9
parent61d95397de01ead73b828c6106a4a832d9681652 (diff)
downloadglibc-808696696837b8b8fc858f2e6f8d4e40e26e1308.tar.gz
glibc-808696696837b8b8fc858f2e6f8d4e40e26e1308.tar.xz
glibc-808696696837b8b8fc858f2e6f8d4e40e26e1308.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.
-rw-r--r--ChangeLog4
-rw-r--r--nscd/selinux.c1
2 files changed, 4 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index cb4476230f..3a5cfeee40 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2015-07-08  Mike Frysinger  <vapier@gentoo.org>
 
+	* nscd/selinux.c: Delete selinux/flask.h include.
+
+2015-07-08  Mike Frysinger  <vapier@gentoo.org>
+
 	[BZ #18641]
 	* pwd/pwd.h (fgetpwent): Add __nonnull markings.
 	(putpwent): Likewise.
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>