From f15ff0d1b0c1d55f37a8d5d44fc219b0798d3660 Mon Sep 17 00:00:00 2001 From: Dan Walsh Date: Dec 15 2011 21:18:28 +0000 Subject: Add Eparis patch for handling of default transition labeling --- diff --git a/libsepol-rhat.patch b/libsepol-rhat.patch index 6ce947b..fc8ab46 100644 --- a/libsepol-rhat.patch +++ b/libsepol-rhat.patch @@ -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; }