svn commit: trunk/busybox: include selinux

vda at busybox.net vda at busybox.net
Wed Sep 26 18:01:33 UTC 2007


Author: vda
Date: 2007-09-26 11:01:32 -0700 (Wed, 26 Sep 2007)
New Revision: 20043

Log:
load_policy: update (Yuichi Nakamura <ynakam at hitachisoft.jp>)



Modified:
   trunk/busybox/include/usage.h
   trunk/busybox/selinux/load_policy.c


Changeset:
Modified: trunk/busybox/include/usage.h
===================================================================
--- trunk/busybox/include/usage.h	2007-09-26 17:55:55 UTC (rev 20042)
+++ trunk/busybox/include/usage.h	2007-09-26 18:01:32 UTC (rev 20043)
@@ -1813,8 +1813,8 @@
        "$ ls -l /tmp/ls\n" \
        "lrwxrwxrwx    1 root     root            7 Apr 12 18:39 ls -> BusyBox*\n"
 
-#define load_policy_trivial_usage \
-       "[FILE]"
+#define load_policy_trivial_usage
+
 #define load_policy_full_usage
 
 #define loadfont_trivial_usage \

Modified: trunk/busybox/selinux/load_policy.c
===================================================================
--- trunk/busybox/selinux/load_policy.c	2007-09-26 17:55:55 UTC (rev 20042)
+++ trunk/busybox/selinux/load_policy.c	2007-09-26 18:01:32 UTC (rev 20043)
@@ -1,6 +1,5 @@
 /*
  * load_policy
- * This implementation is based on old load_policy to be small.
  * Author: Yuichi Nakamura <ynakam at hitachisoft.jp>
  */
 #include "libbb.h"
@@ -8,22 +7,14 @@
 int load_policy_main(int argc, char **argv);
 int load_policy_main(int argc, char **argv)
 {
-	int fd;
-	struct stat st;
-	void *data;
-	if (argc != 2) {
+	int rc;
+
+	if (argc != 1) {
 		bb_show_usage();
 	}
 
-	fd = xopen(argv[1], O_RDONLY);
-	if (fstat(fd, &st) < 0) {
-		bb_perror_msg_and_die("can't fstat");
-	}
-	data = mmap(NULL, st.st_size, PROT_READ, MAP_SHARED, fd, 0);
-	if (data == MAP_FAILED) {
-		bb_perror_msg_and_die("can't mmap");
-	}
-	if (security_load_policy(data, st.st_size) < 0) {
+	rc = selinux_mkload_policy(1);
+	if (rc < 0) {
 		bb_perror_msg_and_die("can't load policy");
 	}
 




More information about the busybox-cvs mailing list