Fix bug in cipso written rules

The label (either short or long) was followed by a null character.
It is now followed by a space.

Note that the format for cipso2 smackfs is "%s?%4d%4d..."
where ? stands for any invalid label character.

Signed-off-by: José Bollo <jose.bollo@open.eurogiciel.org>

diff --git a/libsmack/libsmack.c b/libsmack/libsmack.c
index bc84fc4..005c913 100644 (file)
--- a/libsmack/libsmack.c
+++ b/libsmack/libsmack.c
@@ -385,9 +385,8 @@ int smack_cipso_apply(struct smack_cipso *cipso)
 
        memset(buf,0,CIPSO_MAX_SIZE);
        for (m = cipso->first; m != NULL; m = m->next) {
-               snprintf(buf, SMACK_LABEL_LEN + 1, use_long ? "%s" : "%-23s",
-                        m->label);
-               offset = strlen(buf) + 1;
+               offset = (int)snprintf(buf, SMACK_LABEL_LEN + 1, 
+                    use_long ? "%s " : "%-23s ", m->label);
 
                sprintf(&buf[offset], CIPSO_NUM_LEN_STR, m->level);
                offset += NUM_LEN;