diff options
author | dcashman <dcashman@google.com> | 2014-12-03 12:52:59 -0800 |
---|---|---|
committer | dcashman <dcashman@google.com> | 2014-12-10 13:21:17 -0800 |
commit | 05345bfdb08ea196eb061af11307758d62fc6234 (patch) | |
tree | 5265adf7530dd7fa7d50f53a91d0e11188a03a24 /init | |
parent | 765f371cf40c67ccca3033b05aa052de0145f999 (diff) | |
download | system_core-05345bfdb08ea196eb061af11307758d62fc6234.zip system_core-05345bfdb08ea196eb061af11307758d62fc6234.tar.gz system_core-05345bfdb08ea196eb061af11307758d62fc6234.tar.bz2 |
Move property_context label handling to libselinux.
Resubmission of commit: dab91bd37af6be355163ee33ca6f1b00e7dd1b51
Change-Id: Iad9517d3f81f7c091307b3e7497675e2cdc32be5
Diffstat (limited to 'init')
-rw-r--r-- | init/init.c | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/init/init.c b/init/init.c index 2b82937..7ddab80 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(); |