Skip to content

Commit

Permalink
Move property_context label handling to libselinux.
Browse files Browse the repository at this point in the history
Resubmission of commit: dab91bd37af6be355163ee33ca6f1b00e7dd1b51

Change-Id: Iad9517d3f81f7c091307b3e7497675e2cdc32be5
  • Loading branch information
dcashman committed Dec 10, 2014
1 parent 765f371 commit 05345bf
Showing 1 changed file with 0 additions and 20 deletions.
20 changes: 0 additions & 20 deletions init/init.c
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down

0 comments on commit 05345bf

Please sign in to comment.