Add Eparis patch for handling of default transition labeling

This commit is contained in:
Dan Walsh 2011-12-15 16:18:28 -05:00
parent b413b6e9e9
commit f15ff0d1b0
1 changed files with 30 additions and 2 deletions

View File

@ -152,10 +152,38 @@ index ee9675b..01d3231 100644
hashtab_map(cladatum->permissions.table, permission_copy_callback,
state);
diff --git a/libsepol/src/policydb.c b/libsepol/src/policydb.c
index 136b450..fbefac0 100644
index 136b450..3f0008b 100644
--- a/libsepol/src/policydb.c
+++ b/libsepol/src/policydb.c
@@ -2064,6 +2064,18 @@ static int class_read(policydb_t * p, hashtab_t h, struct policy_file *fp)
@@ -228,6 +228,13 @@ static struct policydb_compat_info policydb_compat[] = {
.target_platform = SEPOL_TARGET_SELINUX,
},
{
+ .type = POLICY_BASE,
+ .version = MOD_POLICYDB_VERSION_NEW_OBJECT_DEFAULTS,
+ .sym_num = SYM_NUM,
+ .ocon_num = OCON_NODE6 + 1,
+ .target_platform = SEPOL_TARGET_SELINUX,
+ },
+ {
.type = POLICY_MOD,
.version = MOD_POLICYDB_VERSION_BASE,
.sym_num = SYM_NUM,
@@ -304,6 +311,13 @@ static struct policydb_compat_info policydb_compat[] = {
.ocon_num = 0,
.target_platform = SEPOL_TARGET_SELINUX,
},
+ {
+ .type = POLICY_MOD,
+ .version = MOD_POLICYDB_VERSION_NEW_OBJECT_DEFAULTS,
+ .sym_num = SYM_NUM,
+ .ocon_num = 0,
+ .target_platform = SEPOL_TARGET_SELINUX,
+ },
};
#if 0
@@ -2064,6 +2078,18 @@ static int class_read(policydb_t * p, hashtab_t h, struct policy_file *fp)
goto bad;
}