Revision: 2901
http://selinux.svn.sourceforge.net/selinux/?rev=2901&view=rev
Author: ssmalley
Date: 2008-06-10 06:06:52 -0700 (Tue, 10 Jun 2008)
Log Message:
-----------
applied r2886:2887 from trunk
Modified Paths:
--------------
branches/stable/1_0/libsepol/src/expand.c
Modified: branches/stable/1_0/libsepol/src/expand.c
===================================================================
--- branches/stable/1_0/libsepol/src/expand.c 2008-06-10 13:05:20 UTC (rev 2900)
+++ branches/stable/1_0/libsepol/src/expand.c 2008-06-10 13:06:52 UTC (rev 2901)
@@ -527,9 +527,6 @@
role_datum_t *role = (role_datum_t *) datum;
expand_state_t *state = (expand_state_t *) data;
- if (!(&role->dominates.node))
- return 0;
-
if (map_ebitmap(&role->dominates, &mapped_roles, state->rolemap))
return -1;
@@ -602,11 +599,6 @@
}
}
- if (!(&new_role->dominates.node)) {
- ebitmap_init(&new_role->dominates);
- }
-
-
/* The dominates bitmap is going to be wrong for the moment,
* we'll come back later and remap them, after we are sure all
* the roles have been added */
@@ -625,10 +617,6 @@
return -1;
}
- if (!(&new_role->types.types.node)) {
- ebitmap_init(&new_role->types.types);
- }
-
if (ebitmap_union(&new_role->types.types, &tmp_union_types)) {
ERR(state->handle, "Out of memory!");
ebitmap_destroy(&tmp_union_types);
@@ -803,10 +791,6 @@
return -1;
}
- if (!(&new_user->roles.roles.node)) {
- ebitmap_init(&new_user->roles.roles);
- }
-
if (ebitmap_union(&new_user->roles.roles, &tmp_union)) {
ERR(state->handle, "Out of memory!");
ebitmap_destroy(&tmp_union);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
