diff options
| author | Mark Salyzyn <salyzyn@google.com> | 2015-06-02 11:11:02 -0700 |
|---|---|---|
| committer | Mark Salyzyn <salyzyn@google.com> | 2015-06-02 15:26:02 -0700 |
| commit | cdb73b034d1a546afc34302896a3cdc72dbdc8e6 (patch) | |
| tree | 31bb93be3ff752ce869b82b7d34c89b84cc55788 /init/init.cpp | |
| parent | 473a50f1687e8511ff9efcf370adfa68568669ab (diff) | |
| download | system_core-cdb73b034d1a546afc34302896a3cdc72dbdc8e6.zip system_core-cdb73b034d1a546afc34302896a3cdc72dbdc8e6.tar.gz system_core-cdb73b034d1a546afc34302896a3cdc72dbdc8e6.tar.bz2 | |
init: change exec parsing to make SECLABEL optional
(cherry pick from commit 17fff893c04971b519d25d52b07f51111353cba5)
Allow SECLABEL to be - to denote default
Change-Id: I58cdc6c805dc6e50dc42b7e13e72d0eaf4864f11
Diffstat (limited to 'init/init.cpp')
| -rw-r--r-- | init/init.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/init/init.cpp b/init/init.cpp index 5185f77..85d7909 100644 --- a/init/init.cpp +++ b/init/init.cpp @@ -380,7 +380,8 @@ void service_start(struct service *svc, const char *dynamic_args) if ((svc->flags & SVC_EXEC) != 0) { INFO("SVC_EXEC pid %d (uid %d gid %d+%zu context %s) started; waiting...\n", - svc->pid, svc->uid, svc->gid, svc->nr_supp_gids, svc->seclabel); + svc->pid, svc->uid, svc->gid, svc->nr_supp_gids, + svc->seclabel ? : "default"); waiting_for_exec = true; } |