aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenis Vlasenko <vda.linux@googlemail.com>2007-03-24 15:37:57 +0000
committerDenis Vlasenko <vda.linux@googlemail.com>2007-03-24 15:37:57 +0000
commit1fc6e56684dafddf00c3e9689a77e273f0126ea4 (patch)
tree2b084610db32345552dc1dac520bdb32db6d316a
parent5b27fbe990d868441452c474e5b14e94f8bc8335 (diff)
downloadbusybox-w32-1fc6e56684dafddf00c3e9689a77e273f0126ea4.tar.gz
busybox-w32-1fc6e56684dafddf00c3e9689a77e273f0126ea4.tar.bz2
busybox-w32-1fc6e56684dafddf00c3e9689a77e273f0126ea4.zip
SELinux: load_policy applet
-rw-r--r--include/applets.h1
-rw-r--r--include/usage.h4
-rw-r--r--selinux/Config.in7
-rw-r--r--selinux/Kbuild1
4 files changed, 13 insertions, 0 deletions
diff --git a/include/applets.h b/include/applets.h
index 3aaf011eb..3f5bf9bde 100644
--- a/include/applets.h
+++ b/include/applets.h
@@ -180,6 +180,7 @@ USE_SETARCH(APPLET_NOUSAGE(linux32, setarch, _BB_DIR_BIN, _BB_SUID_NEVER))
180USE_SETARCH(APPLET_NOUSAGE(linux64, setarch, _BB_DIR_BIN, _BB_SUID_NEVER)) 180USE_SETARCH(APPLET_NOUSAGE(linux64, setarch, _BB_DIR_BIN, _BB_SUID_NEVER))
181USE_FEATURE_INITRD(APPLET_NOUSAGE(linuxrc, init, _BB_DIR_ROOT, _BB_SUID_NEVER)) 181USE_FEATURE_INITRD(APPLET_NOUSAGE(linuxrc, init, _BB_DIR_ROOT, _BB_SUID_NEVER))
182USE_LN(APPLET(ln, _BB_DIR_BIN, _BB_SUID_NEVER)) 182USE_LN(APPLET(ln, _BB_DIR_BIN, _BB_SUID_NEVER))
183USE_LOAD_POLICY(APPLET(load_policy, _BB_DIR_USR_SBIN, _BB_SUID_NEVER))
183USE_LOADFONT(APPLET(loadfont, _BB_DIR_USR_BIN, _BB_SUID_NEVER)) 184USE_LOADFONT(APPLET(loadfont, _BB_DIR_USR_BIN, _BB_SUID_NEVER))
184USE_LOADKMAP(APPLET(loadkmap, _BB_DIR_SBIN, _BB_SUID_NEVER)) 185USE_LOADKMAP(APPLET(loadkmap, _BB_DIR_SBIN, _BB_SUID_NEVER))
185USE_LOGGER(APPLET(logger, _BB_DIR_USR_BIN, _BB_SUID_NEVER)) 186USE_LOGGER(APPLET(logger, _BB_DIR_USR_BIN, _BB_SUID_NEVER))
diff --git a/include/usage.h b/include/usage.h
index 615ee4ed7..7adc1fc78 100644
--- a/include/usage.h
+++ b/include/usage.h
@@ -1758,6 +1758,10 @@
1758 "$ ls -l /tmp/ls\n" \ 1758 "$ ls -l /tmp/ls\n" \
1759 "lrwxrwxrwx 1 root root 7 Apr 12 18:39 ls -> BusyBox*\n" 1759 "lrwxrwxrwx 1 root root 7 Apr 12 18:39 ls -> BusyBox*\n"
1760 1760
1761#define load_policy_trivial_usage \
1762 "[FILE]"
1763#define load_policy_full_usage
1764
1761#define loadfont_trivial_usage \ 1765#define loadfont_trivial_usage \
1762 "< font" 1766 "< font"
1763#define loadfont_full_usage \ 1767#define loadfont_full_usage \
diff --git a/selinux/Config.in b/selinux/Config.in
index 6c08e51b7..42bca66d6 100644
--- a/selinux/Config.in
+++ b/selinux/Config.in
@@ -34,6 +34,13 @@ config GETSEBOOL
34 help 34 help
35 Enable support to get SELinux boolean values. 35 Enable support to get SELinux boolean values.
36 36
37config LOAD_POLICY
38 bool "load_policy"
39 default n
40 depends on SELINUX
41 help
42 Enable support to load SELinux policy.
43
37config MATCHPATHCON 44config MATCHPATHCON
38 bool "matchpathcon" 45 bool "matchpathcon"
39 default n 46 default n
diff --git a/selinux/Kbuild b/selinux/Kbuild
index 398d1368d..09cae4d2d 100644
--- a/selinux/Kbuild
+++ b/selinux/Kbuild
@@ -9,6 +9,7 @@ lib-y:=
9lib-$(CONFIG_CHCON) += chcon.o 9lib-$(CONFIG_CHCON) += chcon.o
10lib-$(CONFIG_GETENFORCE) += getenforce.o 10lib-$(CONFIG_GETENFORCE) += getenforce.o
11lib-$(CONFIG_GETSEBOOL) += getsebool.o 11lib-$(CONFIG_GETSEBOOL) += getsebool.o
12lib-$(CONFIG_LOAD_POLICY) += load_policy.o
12lib-$(CONFIG_MATCHPATHCON) += matchpathcon.o 13lib-$(CONFIG_MATCHPATHCON) += matchpathcon.o
13lib-$(CONFIG_RUNCON) += runcon.o 14lib-$(CONFIG_RUNCON) += runcon.o
14lib-$(CONFIG_SELINUXENABLED) += selinuxenabled.o 15lib-$(CONFIG_SELINUXENABLED) += selinuxenabled.o