Merge "Clarify SELinux service error message" am: 54a28300b7

am: 706a898cd0

Change-Id: I3ab507e09016b94efb1440a4ad77a03918d361a5
This commit is contained in:
Nick Kralevich 2017-08-25 23:18:46 +00:00 committed by android-build-merger
commit 787b5038f4

View file

@ -82,7 +82,11 @@ static Result<std::string> ComputeContextFromExecutable(std::string& service_nam
free(new_con);
}
if (rc == 0 && computed_context == mycon.get()) {
return Error() << "Service does not have an SELinux domain defined";
return Error() << "File " << service_path << "(labeled \"" << filecon.get()
<< "\") has incorrect label or no domain transition from " << mycon.get()
<< " to another SELinux domain defined. Have you configured your "
"service correctly? https://source.android.com/security/selinux/"
"device-policy#label_new_services_and_address_denials";
}
if (rc < 0) {
return Error() << "Could not get process context";