diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-04-30 11:38:02 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-04-30 11:38:02 -0400 |
commit | fea27bc7ff43a8beb6bebe6d4fe9eb889e185d4a (patch) | |
tree | 060f6deb9eb907bff65c8118fb2cba09f79c8da0 /scripts | |
parent | 83a50840e72a5a964b4704fcdc2fbb2d771015ab (diff) | |
parent | dfbd199a7cfe3e3cd8531e1353cdbd7175bfbc5e (diff) |
Merge tag 'selinux-pr-20190429' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux
Pull selinux fix from Paul Moore:
"One small patch for the stable folks to fix a problem when building
against the latest glibc.
I'll be honest and say that I'm not really thrilled with the idea of
sending this up right now, but Greg is a little annoyed so here I
figured I would at least send this"
* tag 'selinux-pr-20190429' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux:
selinux: use kernel linux/socket.h for genheaders and mdp
Diffstat (limited to 'scripts')
-rw-r--r-- | scripts/selinux/genheaders/genheaders.c | 1 | ||||
-rw-r--r-- | scripts/selinux/mdp/mdp.c | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/scripts/selinux/genheaders/genheaders.c b/scripts/selinux/genheaders/genheaders.c index 1ceedea847dd..544ca126a8a8 100644 --- a/scripts/selinux/genheaders/genheaders.c +++ b/scripts/selinux/genheaders/genheaders.c | |||
@@ -9,7 +9,6 @@ | |||
9 | #include <string.h> | 9 | #include <string.h> |
10 | #include <errno.h> | 10 | #include <errno.h> |
11 | #include <ctype.h> | 11 | #include <ctype.h> |
12 | #include <sys/socket.h> | ||
13 | 12 | ||
14 | struct security_class_mapping { | 13 | struct security_class_mapping { |
15 | const char *name; | 14 | const char *name; |
diff --git a/scripts/selinux/mdp/mdp.c b/scripts/selinux/mdp/mdp.c index 073fe7537f6c..6d51b74bc679 100644 --- a/scripts/selinux/mdp/mdp.c +++ b/scripts/selinux/mdp/mdp.c | |||
@@ -32,7 +32,6 @@ | |||
32 | #include <stdlib.h> | 32 | #include <stdlib.h> |
33 | #include <unistd.h> | 33 | #include <unistd.h> |
34 | #include <string.h> | 34 | #include <string.h> |
35 | #include <sys/socket.h> | ||
36 | 35 | ||
37 | static void usage(char *name) | 36 | static void usage(char *name) |
38 | { | 37 | { |