afm-launch: remove unused tag field

Change-Id: I68377aa4255f4aeff4e190eb0f7a31b26c2f5259
Signed-off-by: José Bollo <jose.bollo@iot.bzh>

diff --git a/conf/afm-launch.conf b/conf/afm-launch.conf
index 3b324fe..4dd721b 100644 (file)
--- 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 (file)
--- 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 (file)
--- 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;