diff --git libsepol-2.5/Android.mk libsepol-2.5/Android.mk

index a43b343..21c1af8 100644

--- libsepol-2.5/Android.mk

+++ libsepol-2.5/Android.mk

@@ -68,10 +68,6 @@ common_cflags := \

 	-Wshadow -Wmissing-noreturn \

 	-Wmissing-format-attribute

-ifeq ($(HOST_OS), darwin)

-common_cflags += -DDARWIN

-endif

-

 common_includes := \

 	$(LOCAL_PATH)/include/ \

 	$(LOCAL_PATH)/src/ \

diff --git libsepol-2.5/ChangeLog libsepol-2.5/ChangeLog

index ace3d54..c7cc464 100644

--- libsepol-2.5/ChangeLog

+++ libsepol-2.5/ChangeLog

@@ -1,3 +1,25 @@

+	* Fix memory leak in expand.c, from William Roberts.

+	* Fix invalid read when policy file is corrupt, from William Roberts.

+	* Fix possible use of uninitialized variables, from William Roberts.

+	* Warn instead of fail if permission is not resolved, from James Carter.

+	* Ignore object_r when adding userrole mappings to policydb, from Steve Lawrence.

+	* Add missing return to sepol_node_query(), from Petr Lautrbach.

+	* Correctly detect unknown classes in sepol_string_to_security_class, from Joshua Brindle.

+	* Sort object files for deterministic linking order, from Laurent Bigonville.

+	* Fix neverallowxperm checking on attributes, from Jeff Vander Stoep.

+	* Remove libsepol.map when cleaning, from Nicolas Iooss.

+	* Add high-level language line marking support to CIL, from James Carter.

+	* Change logic of bounds checking to match change in kernel, from James Carter.

+	* Fix multiple spelling errors, from Laurent Bigonville.

+	* Only apply bounds checking to source types in rules, from Stephen Smalley.

+	* Fix CIL and not add an attribute as a type in the attr_type_map, from James Carter

+	* Build policy on systems not supporting DCCP protocol, from Richard Haines.

+	* Fix extended permissions neverallow checking, from Jeff Vander Stoep.

+	* Fix CIL neverallow and bounds checking, from James Carter

+	* Android.mk: Add -D_GNU_SOURCE to common_cflags, from Nick Kralevich.

+	* Add support for portcon dccp protocol, from Richard Haines

+	* Fix bug in CIL when resetting classes, from Steve Lawrence

+

 2.5 2016-02-23

 	* Fix unused variable annotations, from Nicolas Iooss.

 	* Fix uninitialized variable in CIL, from Nicolas Iooss.

diff --git libsepol-2.5/cil/src/cil.c libsepol-2.5/cil/src/cil.c

index afdc240..929ab19 100644

--- libsepol-2.5/cil/src/cil.c

+++ libsepol-2.5/cil/src/cil.c

@@ -108,6 +108,7 @@ static void cil_init_keys(void)

 	CIL_KEY_STAR = cil_strpool_add("*");

 	CIL_KEY_UDP = cil_strpool_add("udp");

 	CIL_KEY_TCP = cil_strpool_add("tcp");

+	CIL_KEY_DCCP = cil_strpool_add("dccp");

 	CIL_KEY_AUDITALLOW = cil_strpool_add("auditallow");

 	CIL_KEY_TUNABLEIF = cil_strpool_add("tunableif");

 	CIL_KEY_ALLOW = cil_strpool_add("allow");

@@ -232,6 +233,9 @@ static void cil_init_keys(void)

 	CIL_KEY_PERMISSIONX = cil_strpool_add("permissionx");

 	CIL_KEY_IOCTL = cil_strpool_add("ioctl");

 	CIL_KEY_UNORDERED = cil_strpool_add("unordered");

+	CIL_KEY_SRC_INFO = cil_strpool_add("<src_info>");

+	CIL_KEY_SRC_CIL = cil_strpool_add("<src_cil>");

+	CIL_KEY_SRC_HLL = cil_strpool_add("<src_hll>");

 }

 void cil_db_init(struct cil_db **db)

@@ -756,6 +760,9 @@ void cil_destroy_data(void **data, enum cil_flavor flavor)

 	case CIL_MLS:

 		cil_destroy_mls(*data);

 		break;

+	case CIL_SRC_INFO:

+		cil_destroy_src_info(*data);

+		break;

 	case CIL_OP:

 	case CIL_CONS_OPERAND:

 		break;

@@ -763,8 +770,8 @@ void cil_destroy_data(void **data, enum cil_flavor flavor)

 		cil_log(CIL_INFO, "Unknown data flavor: %d\n", flavor);

 		break;

 	}

-	

-	*data = NULL;		

+

+	*data = NULL;

 }

 int cil_flavor_to_symtab_index(enum cil_flavor flavor, enum cil_sym_index *sym_index)

@@ -1108,6 +1115,8 @@ const char * cil_node_to_string(struct cil_tree_node *node)

 		return CIL_KEY_HANDLEUNKNOWN;

 	case CIL_MLS:

 		return CIL_KEY_MLS;

+	case CIL_SRC_INFO:

+		return CIL_KEY_SRC_INFO;

 	case CIL_ALL:

 		return CIL_KEY_ALL;

 	case CIL_RANGE:

@@ -1755,8 +1764,7 @@ int cil_get_symtab(struct cil_tree_node *ast_node, symtab_t **symtab, enum cil_s

 	return SEPOL_OK;

 exit:

-	cil_log(CIL_ERR, "Failed to get symtab from node at line %d of %s\n",

-			ast_node->line, ast_node->path);

+	cil_tree_log(ast_node, CIL_ERR, "Failed to get symtab from node");

 	return SEPOL_ERR;	

 }

@@ -2553,3 +2561,10 @@ void cil_mls_init(struct cil_mls **mls)

 	*mls = cil_malloc(sizeof(**mls));

 	(*mls)->value = 0;

 }

+

+void cil_src_info_init(struct cil_src_info **info)

+{

+	*info = cil_malloc(sizeof(**info));

+	(*info)->is_cil = 0;

+	(*info)->path = NULL;

+}

diff --git libsepol-2.5/cil/src/cil_binary.c libsepol-2.5/cil/src/cil_binary.c

index f749e53..46fea4b 100644

--- libsepol-2.5/cil/src/cil_binary.c

+++ libsepol-2.5/cil/src/cil_binary.c

@@ -31,6 +31,9 @@

 #include <stdio.h>

 #include <assert.h>

 #include <netinet/in.h>

+#ifndef IPPROTO_DCCP

+#define IPPROTO_DCCP 33

+#endif

 #include <sepol/policydb/policydb.h>

 #include <sepol/policydb/polcaps.h>

@@ -606,9 +609,11 @@ int __cil_typeattr_bitmap_init(policydb_t *pdb)

 			rc = SEPOL_ERR;

 			goto exit;

 		}

-		if (ebitmap_set_bit(&pdb->attr_type_map[i], i, 1)) {

-			rc = SEPOL_ERR;

-			goto exit;

+		if (pdb->type_val_to_struct[i] && pdb->type_val_to_struct[i]->flavor != TYPE_ATTRIB) {

+			if (ebitmap_set_bit(&pdb->attr_type_map[i], i, 1)) {

+				rc = SEPOL_ERR;

+				goto exit;

+			}

 		}

 	}

@@ -749,6 +754,12 @@ int cil_userrole_to_policydb(policydb_t *pdb, const struct cil_db *db, struct ci

 				goto exit;

 			}

+			if (sepol_role->s.value == 1) {

+				// role is object_r, ignore it since it is implicitly associated

+				// with all users

+				continue;

+			}

+

 			if (ebitmap_set_bit(&sepol_user->roles.roles, sepol_role->s.value - 1, 1)) {

 				cil_log(CIL_INFO, "Failed to set role bit for user\n");

 				rc = SEPOL_ERR;

@@ -1770,13 +1781,12 @@ int __cil_cond_to_policydb_helper(struct cil_tree_node *node, __attribute__((unu

 		cil_typetrans = (struct cil_nametypetransition*)node->data;

 		if (DATUM(cil_typetrans->name)->fqn != CIL_KEY_STAR) {

 			cil_log(CIL_ERR, "typetransition with file name not allowed within a booleanif block.\n");

-			cil_log(CIL_ERR,"Invalid typetransition statement at line %d of %s\n", 

-			node->line, node->path);

+			cil_tree_log(node, CIL_ERR,"Invalid typetransition statement");

 			goto exit;

 		}

 		rc = __cil_typetransition_to_avtab(pdb, db, cil_typetrans, cond_node, cond_flavor, filename_trans_table);

 		if (rc != SEPOL_OK) {

-			cil_log(CIL_ERR, "Failed to insert type transition into avtab at line %d of %s\n", node->line, node->path);

+			cil_tree_log(node, CIL_ERR, "Failed to insert type transition into avtab");

 			goto exit;

 		}

 		break;

@@ -1784,7 +1794,7 @@ int __cil_cond_to_policydb_helper(struct cil_tree_node *node, __attribute__((unu

 		cil_type_rule = node->data;

 		rc = __cil_type_rule_to_avtab(pdb, db, cil_type_rule, cond_node, cond_flavor);

 		if (rc != SEPOL_OK) {

-			cil_log(CIL_ERR, "Failed to insert typerule into avtab at line %d of %s\n", node->line, node->path);

+			cil_tree_log(node, CIL_ERR, "Failed to insert typerule into avtab");

 			goto exit;

 		}

 		break;

@@ -1792,7 +1802,7 @@ int __cil_cond_to_policydb_helper(struct cil_tree_node *node, __attribute__((unu

 		cil_avrule = node->data;

 		rc = __cil_avrule_to_avtab(pdb, db, cil_avrule, cond_node, cond_flavor);

 		if (rc != SEPOL_OK) {

-			cil_log(CIL_ERR, "Failed to insert avrule into avtab at line %d of %s\n", node->line, node->path);

+			cil_tree_log(node, CIL_ERR, "Failed to insert avrule into avtab");

 			goto exit;

 		}

 		break;

@@ -1800,8 +1810,7 @@ int __cil_cond_to_policydb_helper(struct cil_tree_node *node, __attribute__((unu

 	case CIL_TUNABLEIF:

 		break;

 	default:

-		cil_log(CIL_ERR, "Invalid statement within booleanif at line %d of %s\n", 

-			node->line, node->path);

+		cil_tree_log(node, CIL_ERR, "Invalid statement within booleanif");

 		goto exit;

 	}

@@ -2060,14 +2069,13 @@ int cil_booleanif_to_policydb(policydb_t *pdb, const struct cil_db *db, struct c

 	tmp_cond = cond_node_create(pdb, NULL);

 	if (tmp_cond == NULL) {

 		rc = SEPOL_ERR;

-		cil_log(CIL_INFO, "Failed to create sepol conditional node at line %d of %s\n", 

-			node->line, node->path);

+		cil_tree_log(node, CIL_INFO, "Failed to create sepol conditional node");

 		goto exit;

 	}

 	rc = __cil_cond_expr_to_sepol_expr(pdb, cil_boolif->datum_expr, &tmp_cond->expr);

 	if (rc != SEPOL_OK) {

-		cil_log(CIL_INFO, "Failed to convert CIL conditional expression to sepol expression at line %d of %s\n", node->line, node->path);

+		cil_tree_log(node, CIL_INFO, "Failed to convert CIL conditional expression to sepol expression");

 		goto exit;

 	}

@@ -2123,7 +2131,7 @@ int cil_booleanif_to_policydb(policydb_t *pdb, const struct cil_db *db, struct c

 		bool_args.cond_flavor = CIL_CONDTRUE;

 		rc = cil_tree_walk(true_node, __cil_cond_to_policydb_helper, NULL, NULL, &bool_args);

 		if (rc != SEPOL_OK) {

-			cil_log(CIL_ERR, "Failure while walking true conditional block at line %d of %s\n", true_node->line, true_node->path);

+			cil_tree_log(true_node, CIL_ERR, "Failure while walking true conditional block");

 			goto exit;

 		}

 	}

@@ -2132,7 +2140,7 @@ int cil_booleanif_to_policydb(policydb_t *pdb, const struct cil_db *db, struct c

 		bool_args.cond_flavor = CIL_CONDFALSE;

 		rc = cil_tree_walk(false_node, __cil_cond_to_policydb_helper, NULL, NULL, &bool_args);

 		if (rc != SEPOL_OK) {

-			cil_log(CIL_ERR, "Failure while walking false conditional block at line %d of %s\n", false_node->line, false_node->path);

+			cil_tree_log(false_node, CIL_ERR, "Failure while walking false conditional block");

 			goto exit;

 		}

 	}

@@ -3035,6 +3043,9 @@ int cil_portcon_to_policydb(policydb_t *pdb, struct cil_sort *portcons)

 		case CIL_PROTOCOL_TCP:

 			new_ocon->u.port.protocol = IPPROTO_TCP;

 			break;

+		case CIL_PROTOCOL_DCCP:

+			new_ocon->u.port.protocol = IPPROTO_DCCP;

+			break;

 		default:

 			/* should not get here */

 			rc = SEPOL_ERR;

@@ -3583,7 +3594,7 @@ int __cil_node_to_policydb(struct cil_tree_node *node, void *extra_args)

 exit:

 	if (rc != SEPOL_OK) {

-		cil_log(CIL_ERR, "Binary policy creation failed at line %d of %s\n", node->line, node->path);

+		cil_tree_log(node, CIL_ERR, "Binary policy creation failed");

 	}

 	return rc;

 }

@@ -4227,6 +4238,9 @@ exit:

 static avrule_t *__cil_init_sepol_avrule(uint32_t kind, struct cil_tree_node *node)

 {

 	avrule_t *avrule;

+	struct cil_tree_node *source_node;

+	char *source_path;

+	int is_cil;

 	avrule = cil_malloc(sizeof(avrule_t));

 	avrule->specified = kind;

@@ -4235,8 +4249,17 @@ static avrule_t *__cil_init_sepol_avrule(uint32_t kind, struct cil_tree_node *no

 	__cil_init_sepol_type_set(&avrule->ttypes);

 	avrule->perms = NULL;

 	avrule->line = node->line;

-	avrule->source_filename = node->path;

+

+	avrule->source_filename = NULL;

 	avrule->source_line = node->line;

+	source_node = cil_tree_get_next_path(node, &source_path, &is_cil);

+	if (source_node) {

+		avrule->source_filename = source_path;

+		if (!is_cil) {

+			avrule->source_line = node->hll_line;

+		}

+	}

+

 	avrule->next = NULL;

 	return avrule;

 }

@@ -4263,10 +4286,8 @@ static void __cil_print_parents(const char *pad, struct cil_tree_node *n)

 	__cil_print_parents(pad, n->parent);

-	if (!n->path) {

-		cil_log(CIL_ERR,"%s%s\n", pad, cil_node_to_string(n));

-	} else {

-		cil_log(CIL_ERR,"%s%s at line %d of %s\n", pad, cil_node_to_string(n), n->line, n->path);

+	if (n->flavor != CIL_SRC_INFO) {

+		cil_tree_log(n, CIL_ERR,"%s%s", pad, cil_node_to_string(n));

 	}

 }

@@ -4357,7 +4378,7 @@ static int __cil_print_neverallow_failure(const struct cil_db *db, struct cil_tr

 		allow_str = CIL_KEY_ALLOWX;

 		avrule_flavor = CIL_AVRULEX;

 	}

-	cil_log(CIL_ERR, "%s check failed at line %d of %s\n", neverallow_str, node->line, node->path);

+	cil_tree_log(node, CIL_ERR, "%s check failed", neverallow_str);

 	__cil_print_rule("  ", neverallow_str, cil_rule);

 	cil_list_init(&matching, CIL_NODE);

 	rc = cil_find_matching_avrule_in_ast(db->ast->root, avrule_flavor, &target, matching, CIL_FALSE);

@@ -4380,10 +4401,9 @@ exit:

 	return rc;

 }

-static int cil_check_neverallow(const struct cil_db *db, policydb_t *pdb, struct cil_tree_node *node)

+static int cil_check_neverallow(const struct cil_db *db, policydb_t *pdb, struct cil_tree_node *node, int *violation)

 {

-	int rc = SEPOL_ERR;

-	int ret = CIL_FALSE;

+	int rc = SEPOL_OK;

 	struct cil_avrule *cil_rule = node->data;

 	struct cil_symtab_datum *tgt = cil_rule->tgt;

 	uint32_t kind;

@@ -4422,11 +4442,11 @@ static int cil_check_neverallow(const struct cil_db *db, policydb_t *pdb, struct

 		rc = check_assertion(pdb, rule);

 		if (rc == CIL_TRUE) {

+			*violation = CIL_TRUE;

 			rc = __cil_print_neverallow_failure(db, node);

 			if (rc != SEPOL_OK) {

 				goto exit;

 			}

-			ret = CIL_TRUE;

 		}

 	} else {

@@ -4444,12 +4464,11 @@ static int cil_check_neverallow(const struct cil_db *db, policydb_t *pdb, struct

 			rule->xperms = item->data;

 			rc = check_assertion(pdb, rule);

 			if (rc == CIL_TRUE) {

+				*violation = CIL_TRUE;

 				rc = __cil_print_neverallow_failure(db, node);

 				if (rc != SEPOL_OK) {

 					goto exit;

 				}

-				ret = CIL_TRUE;

-				goto exit;

 			}

 		}

 	}

@@ -4466,34 +4485,23 @@ exit:

 	rule->xperms = NULL;

 	__cil_destroy_sepol_avrules(rule);

-	if (rc) {

-		return rc;

-	} else {

-		return ret;

-	}

+	return rc;

 }

-static int cil_check_neverallows(const struct cil_db *db, policydb_t *pdb, struct cil_list *neverallows)

+static int cil_check_neverallows(const struct cil_db *db, policydb_t *pdb, struct cil_list *neverallows, int *violation)

 {

 	int rc = SEPOL_OK;

-	int ret = CIL_FALSE;

 	struct cil_list_item *item;

 	cil_list_for_each(item, neverallows) {

-		rc = cil_check_neverallow(db, pdb, item->data);

-		if (rc < 0) {

+		rc = cil_check_neverallow(db, pdb, item->data, violation);

+		if (rc != SEPOL_OK) {

 			goto exit;

-		} else if (rc > 0) {

-			ret = CIL_TRUE;

 		}

 	}

 exit:

-	if (rc || ret) {

-		return SEPOL_ERR;

-	} else {

-		return SEPOL_OK;

-	}

+	return rc;

 }

 static struct cil_list *cil_classperms_from_sepol(policydb_t *pdb, uint16_t class, uint32_t data, struct cil_class *class_value_to_cil[], struct cil_perm **perm_value_to_cil[])

@@ -4548,7 +4556,7 @@ exit:

 	return rc;

 }

-static int cil_check_type_bounds(const struct cil_db *db, policydb_t *pdb, void *type_value_to_cil, struct cil_class *class_value_to_cil[], struct cil_perm **perm_value_to_cil[])

+static int cil_check_type_bounds(const struct cil_db *db, policydb_t *pdb, void *type_value_to_cil, struct cil_class *class_value_to_cil[], struct cil_perm **perm_value_to_cil[], int *violation)

 {

 	int rc = SEPOL_OK;

 	int i;

@@ -4574,6 +4582,9 @@ static int cil_check_type_bounds(const struct cil_db *db, policydb_t *pdb, void

 		if (bad) {

 			avtab_ptr_t cur;

 			struct cil_avrule target;

+			struct cil_tree_node *n1 = NULL;

+

+			*violation = CIL_TRUE;

                         target.is_extended = 0;

 			target.rule_kind = CIL_AVRULE_ALLOWED;

@@ -4585,7 +4596,6 @@ static int cil_check_type_bounds(const struct cil_db *db, policydb_t *pdb, void

 			for (cur = bad; cur; cur = cur->next) {

 				struct cil_list_item *i2;

 				struct cil_list *matching;

-				struct cil_tree_node *n;

 				rc = cil_avrule_from_sepol(pdb, cur, &target, type_value_to_cil, class_value_to_cil, perm_value_to_cil);

 				if (rc != SEPOL_OK) {

@@ -4594,7 +4604,7 @@ static int cil_check_type_bounds(const struct cil_db *db, policydb_t *pdb, void

 				}

 				__cil_print_rule("  ", "allow", &target);

 				cil_list_init(&matching, CIL_NODE);

-				rc = cil_find_matching_avrule_in_ast(db->ast->root, CIL_AVRULE, &target, matching, CIL_FALSE);

+				rc = cil_find_matching_avrule_in_ast(db->ast->root, CIL_AVRULE, &target, matching, CIL_TRUE);

 				if (rc) {

 					cil_log(CIL_ERR, "Error occurred while checking type bounds\n");

 					cil_list_destroy(&matching, CIL_FALSE);

@@ -4602,14 +4612,17 @@ static int cil_check_type_bounds(const struct cil_db *db, policydb_t *pdb, void

 					bounds_destroy_bad(bad);

 					goto exit;

 				}

-

 				cil_list_for_each(i2, matching) {

-					__cil_print_parents("    ", (struct cil_tree_node *)i2->data);

+					struct cil_tree_node *n2 = i2->data;

+					struct cil_avrule *r2 = n2->data;

+					if (n1 == n2) {

+						cil_log(CIL_ERR, "    <See previous>\n");

+					} else {

+						n1 = n2;

+						__cil_print_parents("    ", n2);

+						__cil_print_rule("      ", "allow", r2);

+					}

 				}

-				i2 = matching->tail;

-				n = i2->data;

-				__cil_print_rule("      ", "allow", n->data);

-				cil_log(CIL_ERR,"\n");

 				cil_list_destroy(&matching, CIL_FALSE);

 				cil_list_destroy(&target.perms.classperms, CIL_TRUE);

 			}

@@ -4753,20 +4766,32 @@ int cil_binary_create_allocated_pdb(const struct cil_db *db, sepol_policydb_t *p

 	__cil_set_conditional_state_and_flags(pdb);

 	if (db->disable_neverallow != CIL_TRUE) {

+		int violation = CIL_FALSE;

 		cil_log(CIL_INFO, "Checking Neverallows\n");

-		rc = cil_check_neverallows(db, pdb, neverallows);

+		rc = cil_check_neverallows(db, pdb, neverallows, &violation);

 		if (rc != SEPOL_OK) goto exit;

 		cil_log(CIL_INFO, "Checking User Bounds\n");

-		bounds_check_users(NULL, pdb);

+		rc = bounds_check_users(NULL, pdb);

+		if (rc) {

+			violation = CIL_TRUE;

+		}

 		cil_log(CIL_INFO, "Checking Role Bounds\n");

-		bounds_check_roles(NULL, pdb);

+		rc = bounds_check_roles(NULL, pdb);

+		if (rc) {

+			violation = CIL_TRUE;

+		}

 		cil_log(CIL_INFO, "Checking Type Bounds\n");

-		rc = cil_check_type_bounds(db, pdb, type_value_to_cil, class_value_to_cil, perm_value_to_cil);

+		rc = cil_check_type_bounds(db, pdb, type_value_to_cil, class_value_to_cil, perm_value_to_cil, &violation);

 		if (rc != SEPOL_OK) goto exit;

+		if (violation == CIL_TRUE) {

+			rc = SEPOL_ERR;

+			goto exit;

+		}

+

 	}

 	rc = SEPOL_OK;

diff --git libsepol-2.5/cil/src/cil_build_ast.c libsepol-2.5/cil/src/cil_build_ast.c

index 1135e06..1505873 100644

--- libsepol-2.5/cil/src/cil_build_ast.c

+++ libsepol-2.5/cil/src/cil_build_ast.c

@@ -108,8 +108,7 @@ int cil_gen_node(__attribute__((unused)) struct cil_db *db, struct cil_tree_node

 			if (cil_symtab_get_datum(symtab, key, &datum) == SEPOL_OK) {

 				if (sflavor == CIL_SYM_BLOCKS) {

 					struct cil_tree_node *node = datum->nodes->head->data;

-					cil_log(CIL_ERR, "Previous declaration at line %d of %s\n",

-						node->line, node->path);

+					cil_tree_log(node, CIL_ERR, "Previous declaration");

 				}

 			}

 			goto exit;

@@ -186,8 +185,7 @@ int cil_gen_block(struct cil_db *db, struct cil_tree_node *parse_current, struct

 	return SEPOL_OK;

 exit:

-	cil_log(CIL_ERR, "Bad block declaration at line %d of %s\n", 

-		parse_current->line, parse_current->path);

+	cil_tree_log(parse_current, CIL_ERR, "Bad block declaration");

 	cil_destroy_block(block);

 	cil_clear_node(ast_node);

 	return rc;

@@ -236,8 +234,7 @@ int cil_gen_blockinherit(struct cil_db *db, struct cil_tree_node *parse_current,

 	return SEPOL_OK;

 exit:

-	cil_log(CIL_ERR, "Bad blockinherit declaration at line %d of %s\n", 

-		parse_current->line, parse_current->path);

+	cil_tree_log(parse_current, CIL_ERR, "Bad blockinherit declaration");

 	cil_destroy_blockinherit(inherit);

 	return rc;

 }

@@ -281,8 +278,7 @@ int cil_gen_blockabstract(struct cil_db *db, struct cil_tree_node *parse_current

 	return SEPOL_OK;

 exit:

-	cil_log(CIL_ERR, "Bad blockabstract declaration at line %d of %s\n", 

-		parse_current->line, parse_current->path);

+	cil_tree_log(parse_current, CIL_ERR, "Bad blockabstract declaration");

 	cil_destroy_blockabstract(abstract);

 	return rc;

 }

@@ -326,8 +322,7 @@ int cil_gen_in(struct cil_db *db, struct cil_tree_node *parse_current, struct ci

 	return SEPOL_OK;

 exit:

-	cil_log(CIL_ERR, "Bad in statement at line %d of %s\n", 

-		parse_current->line, parse_current->path);

+	cil_tree_log(parse_current, CIL_ERR, "Bad in statement");

 	cil_destroy_in(in);

 	return rc;

 }

@@ -387,8 +382,7 @@ int cil_gen_class(struct cil_db *db, struct cil_tree_node *parse_current, struct

 	return SEPOL_OK;

 exit:

-	cil_log(CIL_ERR, "Bad class declaration at line %d of %s\n", 

-		parse_current->line, parse_current->path);

+	cil_tree_log(parse_current, CIL_ERR, "Bad class declaration");

 	cil_destroy_class(class);

 	cil_clear_node(ast_node);

 	return rc;

@@ -456,8 +450,7 @@ int cil_gen_classorder(struct cil_db *db, struct cil_tree_node *parse_current, s

 	return SEPOL_OK;

 exit:

-	cil_log(CIL_ERR, "Bad classorder declaration at line %d of %s\n", 

-		parse_current->line, parse_current->path);

+	cil_tree_log(parse_current, CIL_ERR, "Bad classorder declaration");

 	cil_destroy_classorder(classorder);

 	return rc;

 }

@@ -527,7 +520,7 @@ int cil_gen_perm_nodes(struct cil_db *db, struct cil_tree_node *current_perm, st

 		cil_tree_node_init(&new_ast);

 		new_ast->parent = ast_node;

 		new_ast->line = current_perm->line;

-		new_ast->path = current_perm->path;

+		new_ast->hll_line = current_perm->hll_line;

 		rc = cil_gen_perm(db, current_perm, new_ast, flavor, num_perms);

 		if (rc != SEPOL_OK) {

@@ -738,8 +731,7 @@ int cil_gen_classpermission(struct cil_db *db, struct cil_tree_node *parse_curre

 	return SEPOL_OK;

 exit:

-	cil_log(CIL_ERR, "Bad classpermission declaration at line %d of %s\n", 

-		parse_current->line, parse_current->path);

+	cil_tree_log(parse_current, CIL_ERR, "Bad classpermission declaration");

 	cil_destroy_classpermission(cp);

 	cil_clear_node(ast_node);

 	return rc;

@@ -800,8 +792,7 @@ int cil_gen_classpermissionset(struct cil_db *db, struct cil_tree_node *parse_cu

 	return SEPOL_OK;

 exit:

-	cil_log(CIL_ERR, "Bad classpermissionset at line %d of %s\n", 

-		parse_current->line, parse_current->path);

+	cil_tree_log(parse_current, CIL_ERR, "Bad classpermissionset");

 	cil_destroy_classpermissionset(cps);

 	return rc;

 }

@@ -852,8 +843,7 @@ int cil_gen_map_class(struct cil_db *db, struct cil_tree_node *parse_current, st

 	return SEPOL_OK;

 exit:

-	cil_log(CIL_ERR, "Bad map class declaration at line %d of %s\n", 

-		parse_current->line, parse_current->path);

+	cil_tree_log(parse_current, CIL_ERR, "Bad map class declaration");

 	cil_destroy_class(map);

 	cil_clear_node(ast_node);

 	return rc;

@@ -897,8 +887,7 @@ int cil_gen_classmapping(struct cil_db *db, struct cil_tree_node *parse_current,

 	return SEPOL_OK;

 exit:

-	cil_log(CIL_ERR, "Bad classmapping declaration at line %d of %s\n", 

-		parse_current->line, parse_current->path);

+	cil_tree_log(parse_current, CIL_ERR, "Bad classmapping declaration");

 	cil_destroy_classmapping(mapping);

 	return rc;

 }

@@ -954,8 +943,7 @@ int cil_gen_common(struct cil_db *db, struct cil_tree_node *parse_current, struc

 	return SEPOL_OK;

 exit:

-	cil_log(CIL_ERR, "Bad common declaration at line %d of %s\n", 

-		parse_current->line, parse_current->path);

+	cil_tree_log(parse_current, CIL_ERR, "Bad common declaration");

 	cil_destroy_class(common);

 	cil_clear_node(ast_node);

 	return rc;

@@ -994,8 +982,7 @@ int cil_gen_classcommon(struct cil_db *db, struct cil_tree_node *parse_current,

 	return SEPOL_OK;

 exit:

-	cil_log(CIL_ERR, "Bad classcommon declaration at line %d of %s\n", 

-		parse_current->line, parse_current->path);

+	cil_tree_log(parse_current, CIL_ERR, "Bad classcommon declaration");

 	cil_destroy_classcommon(clscom);

 	return rc;

@@ -1043,8 +1030,7 @@ int cil_gen_sid(struct cil_db *db, struct cil_tree_node *parse_current, struct c

 	return SEPOL_OK;

 exit:

-	cil_log(CIL_ERR, "Bad sid declaration at line %d of %s\n", 

-		parse_current->line, parse_current->path);

+	cil_tree_log(parse_current, CIL_ERR, "Bad sid declaration");

 	cil_destroy_sid(sid);

 	cil_clear_node(ast_node);

 	return rc;

@@ -1102,8 +1088,7 @@ int cil_gen_sidcontext(struct cil_db *db, struct cil_tree_node *parse_current, s

 	return SEPOL_OK;

 exit:

-	cil_log(CIL_ERR, "Bad sidcontext declaration at line %d of %s\n", 

-		parse_current->line, parse_current->path);

+	cil_tree_log(parse_current, CIL_ERR, "Bad sidcontext declaration");

 	cil_destroy_sidcontext(sidcon);

 	return rc;

 }

@@ -1163,8 +1148,7 @@ int cil_gen_sidorder(struct cil_db *db, struct cil_tree_node *parse_current, str

 	return SEPOL_OK;

 exit:

-	cil_log(CIL_ERR, "Bad sidorder declaration at line %d of %s\n", 

-		parse_current->line, parse_current->path);

+	cil_tree_log(parse_current, CIL_ERR, "Bad sidorder declaration");

 	cil_destroy_sidorder(sidorder);

 	return rc;

 }

@@ -1215,8 +1199,7 @@ int cil_gen_user(struct cil_db *db, struct cil_tree_node *parse_current, struct

 	return SEPOL_OK;

 exit:

-	cil_log(CIL_ERR, "Bad user declaration at line %d of %s\n", 

-		parse_current->line, parse_current->path);

+	cil_tree_log(parse_current, CIL_ERR, "Bad user declaration");

 	cil_destroy_user(user);

 	cil_clear_node(ast_node);

 	return rc;

@@ -1265,8 +1248,7 @@ int cil_gen_userattribute(struct cil_db *db, struct cil_tree_node *parse_current

 	return SEPOL_OK;

 exit:

-	cil_log(CIL_ERR, "Bad userattribute declaration at line %d of %s\n",

-		parse_current->line, parse_current->path);

+	cil_tree_log(parse_current, CIL_ERR, "Bad userattribute declaration");

 	cil_destroy_userattribute(attr);

 	cil_clear_node(ast_node);

 	return rc;

@@ -1336,8 +1318,7 @@ int cil_gen_userattributeset(struct cil_db *db, struct cil_tree_node *parse_curr

 	return SEPOL_OK;

 exit:

-	cil_log(CIL_ERR, "Bad userattributeset declaration at line %d of %s\n",

-		parse_current->line, parse_current->path);

+	cil_tree_log(parse_current, CIL_ERR, "Bad userattributeset declaration");

 	cil_destroy_userattributeset(attrset);

 	return rc;

@@ -1397,8 +1378,7 @@ int cil_gen_userlevel(struct cil_db *db, struct cil_tree_node *parse_current, st

 	return SEPOL_OK;

 exit:

-	cil_log(CIL_ERR, "Bad userlevel declaration at line %d of %s\n", 

-		parse_current->line, parse_current->path);

+	cil_tree_log(parse_current, CIL_ERR, "Bad userlevel declaration");

 	cil_destroy_userlevel(usrlvl);

 	return rc;

 }

@@ -1458,8 +1438,7 @@ int cil_gen_userrange(struct cil_db *db, struct cil_tree_node *parse_current, st

 	return SEPOL_OK;

 exit:

-	cil_log(CIL_ERR, "Bad userrange declaration at line %d of %s\n", 

-		parse_current->line, parse_current->path);

+	cil_tree_log(parse_current, CIL_ERR, "Bad userrange declaration");

 	cil_destroy_userrange(userrange);

 	return rc;

 }

@@ -1508,8 +1487,7 @@ int cil_gen_userprefix(struct cil_db *db, struct cil_tree_node *parse_current, s

 	return SEPOL_OK;

 exit:

-	cil_log(CIL_ERR, "Bad userprefix declaration at line %d of %s\n", 

-		parse_current->line, parse_current->path);

+	cil_tree_log(parse_current, CIL_ERR, "Bad userprefix declaration");

 	cil_destroy_userprefix(userprefix);

 	return rc;

 }