From 98069027bd90d2139d54affa1367dcd3317a1c11 Mon Sep 17 00:00:00 2001 From: dcashman Date: Wed, 3 Dec 2014 12:52:59 -0800 Subject: [PATCH] Move property_context label handling to libselinux. Change-Id: I76e2ed95d4e4f8618458e63d30ae82e37d1acf7b --- init/init.c | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/init/init.c b/init/init.c index 2b829379e..7ddab80ae 100644 --- a/init/init.c +++ b/init/init.c @@ -858,26 +858,6 @@ static int bootchart_init_action(int nargs, char **args) } #endif -static const struct selinux_opt seopts_prop[] = { - { SELABEL_OPT_PATH, "/property_contexts" }, - { SELABEL_OPT_PATH, "/data/security/current/property_contexts" }, - { 0, NULL } -}; - -struct selabel_handle* selinux_android_prop_context_handle(void) -{ - int policy_index = selinux_android_use_data_policy() ? 1 : 0; - struct selabel_handle* sehandle = selabel_open(SELABEL_CTX_ANDROID_PROP, - &seopts_prop[policy_index], 1); - if (!sehandle) { - ERROR("SELinux: Could not load property_contexts: %s\n", - strerror(errno)); - return NULL; - } - INFO("SELinux: Loaded property contexts from %s\n", seopts_prop[policy_index].value); - return sehandle; -} - void selinux_init_all_handles(void) { sehandle = selinux_android_file_context_handle();