diff options
Diffstat (limited to 'selinux')
-rw-r--r-- | selinux/chcon.c | 3 | ||||
-rw-r--r-- | selinux/getenforce.c | 2 | ||||
-rw-r--r-- | selinux/getsebool.c | 2 | ||||
-rw-r--r-- | selinux/load_policy.c | 2 | ||||
-rw-r--r-- | selinux/matchpathcon.c | 2 | ||||
-rw-r--r-- | selinux/runcon.c | 3 | ||||
-rw-r--r-- | selinux/selinuxenabled.c | 2 | ||||
-rw-r--r-- | selinux/setenforce.c | 2 |
8 files changed, 10 insertions, 8 deletions
diff --git a/selinux/chcon.c b/selinux/chcon.c index 437502c90..a8a816be0 100644 --- a/selinux/chcon.c +++ b/selinux/chcon.c | |||
@@ -5,10 +5,11 @@ | |||
5 | * | 5 | * |
6 | * Copyright (C) 2006 - 2007 KaiGai Kohei <kaigai@kaigai.gr.jp> | 6 | * Copyright (C) 2006 - 2007 KaiGai Kohei <kaigai@kaigai.gr.jp> |
7 | */ | 7 | */ |
8 | #include "busybox.h" | ||
9 | #include <getopt.h> | 8 | #include <getopt.h> |
10 | #include <selinux/context.h> | 9 | #include <selinux/context.h> |
11 | 10 | ||
11 | #include "libbb.h" | ||
12 | |||
12 | #define OPT_RECURSIVE (1<<0) /* 'R' */ | 13 | #define OPT_RECURSIVE (1<<0) /* 'R' */ |
13 | #define OPT_CHANHES (1<<1) /* 'c' */ | 14 | #define OPT_CHANHES (1<<1) /* 'c' */ |
14 | #define OPT_NODEREFERENCE (1<<2) /* 'h' */ | 15 | #define OPT_NODEREFERENCE (1<<2) /* 'h' */ |
diff --git a/selinux/getenforce.c b/selinux/getenforce.c index 865fed9f2..62b42637c 100644 --- a/selinux/getenforce.c +++ b/selinux/getenforce.c | |||
@@ -6,7 +6,7 @@ | |||
6 | * | 6 | * |
7 | */ | 7 | */ |
8 | 8 | ||
9 | #include "busybox.h" | 9 | #include "libbb.h" |
10 | 10 | ||
11 | int getenforce_main(int argc, char **argv); | 11 | int getenforce_main(int argc, char **argv); |
12 | int getenforce_main(int argc, char **argv) | 12 | int getenforce_main(int argc, char **argv) |
diff --git a/selinux/getsebool.c b/selinux/getsebool.c index 0479598fb..b059003c1 100644 --- a/selinux/getsebool.c +++ b/selinux/getsebool.c | |||
@@ -6,7 +6,7 @@ | |||
6 | * | 6 | * |
7 | */ | 7 | */ |
8 | 8 | ||
9 | #include "busybox.h" | 9 | #include "libbb.h" |
10 | 10 | ||
11 | int getsebool_main(int argc, char **argv); | 11 | int getsebool_main(int argc, char **argv); |
12 | int getsebool_main(int argc, char **argv) | 12 | int getsebool_main(int argc, char **argv) |
diff --git a/selinux/load_policy.c b/selinux/load_policy.c index 5d5d7d5a8..5d140bc96 100644 --- a/selinux/load_policy.c +++ b/selinux/load_policy.c | |||
@@ -3,7 +3,7 @@ | |||
3 | * This implementation is based on old load_policy to be small. | 3 | * This implementation is based on old load_policy to be small. |
4 | * Author: Yuichi Nakamura <ynakam@hitachisoft.jp> | 4 | * Author: Yuichi Nakamura <ynakam@hitachisoft.jp> |
5 | */ | 5 | */ |
6 | #include "busybox.h" | 6 | #include "libbb.h" |
7 | 7 | ||
8 | int load_policy_main(int argc, char **argv); | 8 | int load_policy_main(int argc, char **argv); |
9 | int load_policy_main(int argc, char **argv) | 9 | int load_policy_main(int argc, char **argv) |
diff --git a/selinux/matchpathcon.c b/selinux/matchpathcon.c index 4e33c99f1..8d681d02f 100644 --- a/selinux/matchpathcon.c +++ b/selinux/matchpathcon.c | |||
@@ -4,7 +4,7 @@ | |||
4 | * Port to busybox: KaiGai Kohei <kaigai@kaigai.gr.jp> | 4 | * Port to busybox: KaiGai Kohei <kaigai@kaigai.gr.jp> |
5 | * | 5 | * |
6 | */ | 6 | */ |
7 | #include "busybox.h" | 7 | #include "libbb.h" |
8 | 8 | ||
9 | static int print_matchpathcon(char *path, int noprint) | 9 | static int print_matchpathcon(char *path, int noprint) |
10 | { | 10 | { |
diff --git a/selinux/runcon.c b/selinux/runcon.c index 9f61fdbb6..741c7bba6 100644 --- a/selinux/runcon.c +++ b/selinux/runcon.c | |||
@@ -26,11 +26,12 @@ | |||
26 | * Port to busybox: KaiGai Kohei <kaigai@kaigai.gr.jp> | 26 | * Port to busybox: KaiGai Kohei <kaigai@kaigai.gr.jp> |
27 | * - based on coreutils-5.97 (in Fedora Core 6) | 27 | * - based on coreutils-5.97 (in Fedora Core 6) |
28 | */ | 28 | */ |
29 | #include "busybox.h" | ||
30 | #include <getopt.h> | 29 | #include <getopt.h> |
31 | #include <selinux/context.h> | 30 | #include <selinux/context.h> |
32 | #include <selinux/flask.h> | 31 | #include <selinux/flask.h> |
33 | 32 | ||
33 | #include "libbb.h" | ||
34 | |||
34 | static context_t runcon_compute_new_context(char *user, char *role, char *type, char *range, | 35 | static context_t runcon_compute_new_context(char *user, char *role, char *type, char *range, |
35 | char *command, int compute_trans) | 36 | char *command, int compute_trans) |
36 | { | 37 | { |
diff --git a/selinux/selinuxenabled.c b/selinux/selinuxenabled.c index c93ba706f..8a9c7cd02 100644 --- a/selinux/selinuxenabled.c +++ b/selinux/selinuxenabled.c | |||
@@ -5,7 +5,7 @@ | |||
5 | * Port to BusyBox Hiroshi Shinji <shiroshi@my.email.ne.jp> | 5 | * Port to BusyBox Hiroshi Shinji <shiroshi@my.email.ne.jp> |
6 | * | 6 | * |
7 | */ | 7 | */ |
8 | #include "busybox.h" | 8 | #include "libbb.h" |
9 | 9 | ||
10 | int selinuxenabled_main(int argc, char **argv); | 10 | int selinuxenabled_main(int argc, char **argv); |
11 | int selinuxenabled_main(int argc, char **argv) | 11 | int selinuxenabled_main(int argc, char **argv) |
diff --git a/selinux/setenforce.c b/selinux/setenforce.c index 9204fcc39..59b1b0fca 100644 --- a/selinux/setenforce.c +++ b/selinux/setenforce.c | |||
@@ -6,7 +6,7 @@ | |||
6 | * | 6 | * |
7 | */ | 7 | */ |
8 | 8 | ||
9 | #include "busybox.h" | 9 | #include "libbb.h" |
10 | 10 | ||
11 | /* These strings are arranged so that odd ones | 11 | /* These strings are arranged so that odd ones |
12 | * result in security_setenforce(1) being done, | 12 | * result in security_setenforce(1) being done, |