diff options
| author | Colin Cross <ccross@android.com> | 2013-08-23 18:40:12 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-08-23 18:40:12 -0700 |
| commit | b69f863455261a656da02343e8b9d55110ecd45f (patch) | |
| tree | 2d074ee5930053d8950cb16fdb4cd01fa85a1bbf /init/init.c | |
| parent | 30caffc025aff450ebb354ee693174cc1732732b (diff) | |
| parent | 0cbaed4211b514dd2aaa4d28f8936ba58e83c6a5 (diff) | |
| download | system_core-b69f863455261a656da02343e8b9d55110ecd45f.zip system_core-b69f863455261a656da02343e8b9d55110ecd45f.tar.gz system_core-b69f863455261a656da02343e8b9d55110ecd45f.tar.bz2 | |
am 0cbaed42: am a8ba1f2f: Merge "Add support for socket security context specification."
* commit '0cbaed4211b514dd2aaa4d28f8936ba58e83c6a5':
Add support for socket security context specification.
Diffstat (limited to 'init/init.c')
| -rw-r--r-- | init/init.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/init/init.c b/init/init.c index 94a2011..feac8ad 100644 --- a/init/init.c +++ b/init/init.c @@ -250,14 +250,12 @@ void service_start(struct service *svc, const char *dynamic_args) for (ei = svc->envvars; ei; ei = ei->next) add_environment(ei->name, ei->value); - setsockcreatecon(scon); - for (si = svc->sockets; si; si = si->next) { int socket_type = ( !strcmp(si->type, "stream") ? SOCK_STREAM : (!strcmp(si->type, "dgram") ? SOCK_DGRAM : SOCK_SEQPACKET)); int s = create_socket(si->name, socket_type, - si->perm, si->uid, si->gid); + si->perm, si->uid, si->gid, si->socketcon ?: scon); if (s >= 0) { publish_socket(si->name, s); } @@ -265,7 +263,6 @@ void service_start(struct service *svc, const char *dynamic_args) freecon(scon); scon = NULL; - setsockcreatecon(NULL); if (svc->ioprio_class != IoSchedClass_NONE) { if (android_set_ioprio(getpid(), svc->ioprio_class, svc->ioprio_pri)) { |