diff options
| author |   José Bollo <jose.bollo@iot.bzh> | 2016-03-15 10:55:21 +0100 |
|---|---|---|
| committer | José Bollo <jose.bollo@iot.bzh> | 2016-03-15 10:55:40 +0100 |
| commit | fc453a43f14a50a2b4dc1f332649ce4bc13af1fa (patch) | |
| tree | da0cabdf62dbd0a7e74b5a842c94e6798530c29f | |
| parent | f4f91abe09bd0d3a4bc9bc06b073f1acbd374786 (diff) | |
afm-launch: remove unused tag field
Change-Id: I68377aa4255f4aeff4e190eb0f7a31b26c2f5259
Signed-off-by: José Bollo <jose.bollo@iot.bzh>
| -rw-r--r-- | conf/afm-launch.conf | 1 | ||||
| -rw-r--r-- | src/afm-launch.c | 6 | ||||
| -rw-r--r-- | src/afm-launch.h | 1 |
3 files changed, 2 insertions, 6 deletions
diff --git a/conf/afm-launch.conf b/conf/afm-launch.conf index 3b324fe..4dd721b 100644 --- a/conf/afm-launch.conf +++ b/conf/afm-launch.conf @@ -12,7 +12,6 @@ # %R readyfd # %r rootdir # %S secret -# %t tag (smack label) # %W width #----------------- diff --git a/src/afm-launch.c b/src/afm-launch.c index 49172f6..612d102 100644 --- a/src/afm-launch.c +++ b/src/afm-launch.c @@ -391,7 +391,6 @@ static int read_configuration_file(const char *filepath) %r rootdir desc->path %R readyfd params->readyfd %S secret params->secret -%t tag (smack label) desc->tag %W width desc->width */ @@ -465,7 +464,6 @@ static union arguments instantiate_arguments( break; case 'r': v = desc->path; break; case 'S': v = params->secret; break; - case 't': v = desc->tag; break; case 'W': if(!data) sprintf(width, "%d", desc->width); @@ -590,7 +588,7 @@ static pid_t launch( } /* enter security mode */ - rc = secmgr_prepare_exec(desc->tag); + rc = secmgr_prepare_exec(desc->appid); if (rc < 0) { ERROR("call to secmgr_prepare_exec failed: %m"); _exit(1); @@ -729,7 +727,7 @@ int afm_launch(struct afm_launch_desc *desc, pid_t children[2], char **uri) } /* prepare paths */ - rc = snprintf(datadir, sizeof datadir, "%s/%s", desc->home, desc->tag); + rc = snprintf(datadir, sizeof datadir, "%s/%s", desc->home, desc->appid); if (rc < 0 || rc >= sizeof datadir) { ERROR("overflow for datadir"); errno = EINVAL; diff --git a/src/afm-launch.h b/src/afm-launch.h index b246559..552dd18 100644 --- a/src/afm-launch.h +++ b/src/afm-launch.h @@ -18,7 +18,6 @@ struct afm_launch_desc { const char *path; - const char *tag; const char *appid; const char *content; const char *type; |