From e70e67066409fc0e09d6bc6081a5dec2bf8c677b Mon Sep 17 00:00:00 2001 From: Chris PeBenito <cpebenito@tresys.com> Date: Mon, 28 Mar 2016 13:57:41 -0400 Subject: [PATCH] libqpol: fix merge error (duplicate code a few lines up) --- libqpol/policy_extend.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/libqpol/policy_extend.c b/libqpol/policy_extend.c index 9f58513..d135af8 100644 --- a/libqpol/policy_extend.c +++ b/libqpol/policy_extend.c @@ -214,9 +214,6 @@ static int qpol_policy_build_attrs_from_map(qpol_policy_t * policy) continue; } - if (db->type_val_to_struct[i]->flavor == TYPE_TYPE) - continue; - /* first create a new type_datum_t for the attribute, * with the attribute's type_list consisting of types * with this attribute */