multi-detect: fix and simplify config

instead

mappings:
  - vlan:
    vlan-id: 1
    tenant-id: 2

we'll now use:

mappings:
  - vlan-id: 1
    tenant-id: 2

For YAML it pretty much means the same thing.

Ticket: 1517

src/detect-engine.c

@@ -2099,7 +2099,6 @@ int DetectEngineMultiTenantSetup(void)
         int mapping_cnt = 0;
         if (mappings_root_node != NULL) {
             TAILQ_FOREACH(mapping_node, &mappings_root_node->head, next) {
-                if (strcmp(mapping_node->val, "vlan") == 0) {
                 ConfNode *tenant_id_node = ConfNodeLookupChild(mapping_node, "tenant-id");
                 if (tenant_id_node == NULL)
                     goto bad_mapping;
@@ -2135,10 +2134,6 @@ int DetectEngineMultiTenantSetup(void)
                 }
                 SCLogInfo("vlan %u connected to tenant-id %u", vlan_id, tenant_id);
                 mapping_cnt++;
-                } else {
-                    SCLogWarning(SC_ERR_INVALID_VALUE, "multi-detect.mappings expects a list of 'vlan's. Not %s", mapping_node->val);
-                    goto bad_mapping;
-                }
                 continue;
 
             bad_mapping:
@@ -2171,10 +2166,6 @@ int DetectEngineMultiTenantSetup(void)
 
         if (tenants_root_node != NULL) {
             TAILQ_FOREACH(tenant_node, &tenants_root_node->head, next) {
-                if (strcmp(tenant_node->val, "tenant") != 0) {
-                    SCLogWarning(SC_ERR_INVALID_VALUE, "multi-detect.tenants expects a list of 'tenant's. Not %s", tenant_node->val);
-                    goto bad_tenant;
-                }
                 ConfNode *id_node = ConfNodeLookupChild(tenant_node, "id");
                 if (id_node == NULL) {
                     goto bad_tenant;